diff options
| author | sadrul <sadrul@chromium.org> | 2015-10-28 18:39:16 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-29 01:40:02 +0000 |
| commit | 46e2c77b5abc443e488b40e45ea648a29395e43a (patch) | |
| tree | 15bf4f9e9f1e1410c558b49a01a851ee41887546 /mojo/converters | |
| parent | 6598addaf1cfa4ef9bdf38d5baf0582b0f89686b (diff) | |
| download | chromium_src-46e2c77b5abc443e488b40e45ea648a29395e43a.zip chromium_src-46e2c77b5abc443e488b40e45ea648a29395e43a.tar.gz chromium_src-46e2c77b5abc443e488b40e45ea648a29395e43a.tar.bz2 | |
mus: Move mojo events into mus.
BUG=548376
Review URL: https://codereview.chromium.org/1409833010
Cr-Commit-Position: refs/heads/master@{#356728}
Diffstat (limited to 'mojo/converters')
4 files changed, 4 insertions, 4 deletions
diff --git a/mojo/converters/input_events/BUILD.gn b/mojo/converters/input_events/BUILD.gn index af91f8f..66a5293 100644 --- a/mojo/converters/input_events/BUILD.gn +++ b/mojo/converters/input_events/BUILD.gn @@ -15,13 +15,13 @@ component("input_events") { deps = [ "//base", + "//components/mus/public/interfaces", "//mojo/converters/geometry", "//mojo/environment:chromium", "//third_party/mojo/src/mojo/public/c/system:for_component", "//ui/events", "//ui/events:dom_keycode_converter", "//ui/gfx/geometry", - "//ui/mojo/events:interfaces", "//ui/mojo/geometry:interfaces", ] } diff --git a/mojo/converters/input_events/DEPS b/mojo/converters/input_events/DEPS index 81a00b0..95ec829 100644 --- a/mojo/converters/input_events/DEPS +++ b/mojo/converters/input_events/DEPS @@ -1,4 +1,4 @@ include_rules = [ + "+components/mus/public/interfaces", "+ui/events", - "+ui/mojo/events", ] diff --git a/mojo/converters/input_events/input_events_type_converters.cc b/mojo/converters/input_events/input_events_type_converters.cc index 5e5bbc4..bfd5f4e 100644 --- a/mojo/converters/input_events/input_events_type_converters.cc +++ b/mojo/converters/input_events/input_events_type_converters.cc @@ -9,12 +9,12 @@ #include <X11/Xlib.h> #endif +#include "components/mus/public/interfaces/input_events.mojom.h" #include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/input_events/mojo_extended_key_event_data.h" #include "ui/events/event_utils.h" #include "ui/events/keycodes/dom/keycode_converter.h" #include "ui/events/keycodes/keyboard_codes.h" -#include "ui/mojo/events/input_events.mojom.h" namespace mojo { namespace { diff --git a/mojo/converters/input_events/input_events_type_converters.h b/mojo/converters/input_events/input_events_type_converters.h index 0a2e153..145de41 100644 --- a/mojo/converters/input_events/input_events_type_converters.h +++ b/mojo/converters/input_events/input_events_type_converters.h @@ -6,9 +6,9 @@ #define MOJO_CONVERTERS_INPUT_EVENTS_INPUT_EVENTS_TYPE_CONVERTERS_H_ #include "base/memory/scoped_ptr.h" +#include "components/mus/public/interfaces/input_events.mojom.h" #include "mojo/converters/input_events/mojo_input_events_export.h" #include "ui/events/event.h" -#include "ui/mojo/events/input_events.mojom.h" namespace mojo { |