Skip to content

Commit

Permalink
Revert of IPC::ParamTraits for ui::Event (towards ui::Events over moj…
Browse files Browse the repository at this point in the history
…o IPC) (patchset chromium#18 id:340001 of https://codereview.chromium.org/1695783002/ )

Reason for revert:
Breaks compile: https://build.chromium.org/p/chromium.win/builders/Win%20x64%20GN%20%28dbg%29/builds/19183

Original issue's description:
> Implements and tests IPC::ParamTraits for ui::Event (towards ui::Events over mojo IPC). Support for (scoped) pointers for abstract ui::Event objects implemented using ui::ScopedEvent, and trusting ui::EventType information to instantiate the correct concrete type.
>
> BUG=584687
>
> Committed: https://crrev.com/482ddfefe2602f440146eebf4b56e8e040fb81fa
> Cr-Commit-Position: refs/heads/master@{#378821}
>
> Committed: https://crrev.com/74b231ad33ec44bc2662fef2831a3cd90e1f3834
> Cr-Commit-Position: refs/heads/master@{#379094}

TBR=rockot@chromium.org,sadrul@chromium.org,kenrb@chromium.org,tsepez@chromium.org,jam@chromium.org,sky@chromium.org,fsamuel@chromium.org,markdittmer@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=584687

Review URL: https://codereview.chromium.org/1765693002

Cr-Commit-Position: refs/heads/master@{#379123}
  • Loading branch information
dimich authored and Commit bot committed Mar 3, 2016
1 parent 67b71ea commit 6b7bd07
Show file tree
Hide file tree
Showing 23 changed files with 38 additions and 1,132 deletions.
2 changes: 1 addition & 1 deletion ash/mus/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ source_set("lib") {
"//ash",
"//cc",
"//cc/surfaces",
"//components/mus/common:mus_common",
"//components/mus/common",
"//components/mus/public/cpp",
"//components/mus/public/interfaces",
"//components/user_manager",
Expand Down
8 changes: 4 additions & 4 deletions components/mus/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,14 @@ source_set("lib") {
"mus_app.h",
]

public_deps = [
"//components/mus/common:mus_common",
]
deps = [
":resources_100",
":resources_200",
":resources_strings",
"//base",
"//cc",
"//cc/surfaces",
"//components/mus/common",
"//components/mus/gles2",
"//components/mus/public/interfaces",
"//components/mus/surfaces",
Expand All @@ -105,7 +103,9 @@ source_set("lib") {

if (use_x11) {
public_configs = [ "//build/config/linux:x11" ]
public_deps += [ "//ui/events/platform/x11" ]
public_deps = [
"//ui/events/platform/x11",
]
}

if (use_ozone) {
Expand Down
2 changes: 1 addition & 1 deletion components/mus/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include_rules = [
"+cc",
"+components/resource_provider",
"+components/gpu",
"+ipc",
"+mojo/shell",
"+mojo/common",
"+mojo/converters",
"+mojo/public",
Expand Down
35 changes: 1 addition & 34 deletions components/mus/common/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,16 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

import("//testing/test.gni")

component("mus_common") {
source_set("common") {
sources = [
"args.cc",
"args.h",
"event_param_traits.cc",
"event_param_traits.h",
"event_param_traits_macros.h",
"mus_common_export.h",
"transient_window_utils.h",
"types.h",
"util.h",
"window_tracker.h",
]

defines = [ "MUS_IPC_IMPLEMENTATION" ]

deps = [
"//components/mus/public/interfaces",
"//ipc:ipc",
"//mojo/public/c/system:for_component",
"//ui/events:events",
"//ui/gfx/ipc",
]
}

test("mus_common_unittests") {
sources = [
"event_param_traits_unittest.cc",
]
public_deps = [
":mus_common",
]
deps = [
"//base",
"//base/test:run_all_unittests",
"//base/test:test_config",
"//ipc:ipc",
"//mojo/edk/test:test_support",
"//testing/gtest",
"//ui/events:events",
"//ui/gfx:test_support",
"//ui/gfx/ipc",
]
}
3 changes: 1 addition & 2 deletions components/mus/common/args.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@
// found in the LICENSE file.

#include "components/mus/common/args.h"
#include "components/mus/common/mus_common_export.h"

namespace mus {

// Initializes X11 in threaded mode, and sets the |override_redirect| flag when
// creating X11 windows.
const char MUS_COMMON_EXPORT kUseX11TestConfig[] = "use-x11-test-config";
const char kUseX11TestConfig[] = "use-x11-test-config";

} // namespace mus
277 changes: 0 additions & 277 deletions components/mus/common/event_param_traits.cc

This file was deleted.

Loading

0 comments on commit 6b7bd07

Please sign in to comment.