mus: Move mojo events into mus.

BUG=548376

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

Cr-Commit-Position: refs/heads/master@{#356728}

32 files changed, 35 insertions, 60 deletions

diff --git a/components/html_viewer/BUILD.gn b/components/html_viewer/BUILD.gn
index cb70985..894d6b3 100644
--- a/components/html_viewer/BUILD.gn
+++ b/components/html_viewer/BUILD.gn
@@ -191,7 +191,6 @@ source_set("lib") {
     "//third_party/WebKit/public:image_resources",
     "//third_party/WebKit/public:resources",
     "//ui/base:base",
-    "//ui/mojo/events:interfaces",
     "//ui/events",
     "//ui/events:gesture_detection",
     "//ui/events/blink",
diff --git a/components/html_viewer/blink_input_events_type_converters.cc b/components/html_viewer/blink_input_events_type_converters.cc
index 070ad8b..e81b44a 100644
--- a/components/html_viewer/blink_input_events_type_converters.cc
+++ b/components/html_viewer/blink_input_events_type_converters.cc
@@ -6,9 +6,9 @@
 
 #include "base/logging.h"
 #include "base/time/time.h"
+#include "components/mus/public/interfaces/input_event_constants.mojom.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/events/event.h"
-#include "ui/mojo/events/input_event_constants.mojom.h"
 
 namespace mojo {
 namespace {
diff --git a/components/html_viewer/blink_input_events_type_converters.h b/components/html_viewer/blink_input_events_type_converters.h
index 26247b3..77834b7 100644
--- a/components/html_viewer/blink_input_events_type_converters.h
+++ b/components/html_viewer/blink_input_events_type_converters.h
@@ -6,7 +6,7 @@
 #define COMPONENTS_HTML_VIEWER_BLINK_INPUT_EVENTS_TYPE_CONVERTERS_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "ui/mojo/events/input_events.mojom.h"
+#include "components/mus/public/interfaces/input_events.mojom.h"
 
 namespace blink {
 class WebInputEvent;
diff --git a/components/html_viewer/touch_handler.cc b/components/html_viewer/touch_handler.cc
index 48e20c9..553fd74 100644
--- a/components/html_viewer/touch_handler.cc
+++ b/components/html_viewer/touch_handler.cc
@@ -4,13 +4,13 @@
 
 #include "components/html_viewer/touch_handler.h"
 
+#include "components/mus/public/interfaces/input_events.mojom.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebWidget.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/events/blink/blink_event_util.h"
 #include "ui/events/gesture_detection/gesture_provider_config_helper.h"
 #include "ui/events/gesture_detection/motion_event_generic.h"
-#include "ui/mojo/events/input_events.mojom.h"
 
 namespace html_viewer {
 namespace {
diff --git a/components/mus/example/views_examples/BUILD.gn b/components/mus/example/views_examples/BUILD.gn
index 7cf005b..7c5b4aa 100644
--- a/components/mus/example/views_examples/BUILD.gn
+++ b/components/mus/example/views_examples/BUILD.gn
@@ -26,7 +26,6 @@ mojo_native_application("views_examples") {
     "//third_party/mojo/src/mojo/public/cpp/bindings",
     "//ui/gfx",
     "//ui/gfx/geometry",
-    "//ui/mojo/events:interfaces",
     "//ui/views",
     "//ui/views/examples:views_examples_lib",
     "//ui/views/mus",
diff --git a/components/mus/example/window_type_launcher/BUILD.gn b/components/mus/example/window_type_launcher/BUILD.gn
index f3b5eda..776419e 100644
--- a/components/mus/example/window_type_launcher/BUILD.gn
+++ b/components/mus/example/window_type_launcher/BUILD.gn
@@ -28,7 +28,6 @@ mojo_native_application("window_type_launcher") {
     "//ui/aura",
     "//ui/gfx",
     "//ui/gfx/geometry",
-    "//ui/mojo/events:interfaces",
     "//ui/views",
     "//ui/views/mus",
   ]
diff --git a/components/mus/example/wm/BUILD.gn b/components/mus/example/wm/BUILD.gn
index b3dea950..8a72690 100644
--- a/components/mus/example/wm/BUILD.gn
+++ b/components/mus/example/wm/BUILD.gn
@@ -43,7 +43,6 @@ mojo_native_application("example_wm") {
     "//mojo/application/public/cpp",
     "//mojo/common:common_base",
     "//mojo/converters/geometry",
-    "//ui/mojo/events:interfaces",
   ]
 
   data_deps = [
diff --git a/components/mus/example/wm/move_loop.cc b/components/mus/example/wm/move_loop.cc
index 7271837..efdf242 100644
--- a/components/mus/example/wm/move_loop.cc
+++ b/components/mus/example/wm/move_loop.cc
@@ -6,9 +6,9 @@
 
 #include "base/auto_reset.h"
 #include "components/mus/public/cpp/window.h"
+#include "components/mus/public/interfaces/input_event_constants.mojom.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/mojo/events/input_event_constants.mojom.h"
 
 namespace {
 
diff --git a/components/mus/example/wm/move_loop.h b/components/mus/example/wm/move_loop.h
index 9cce42c..9eeec18 100644
--- a/components/mus/example/wm/move_loop.h
+++ b/components/mus/example/wm/move_loop.h
@@ -8,9 +8,9 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/mus/public/cpp/window_observer.h"
+#include "components/mus/public/interfaces/input_events.mojom.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/mojo/events/input_events.mojom.h"
 
 // MoveLoop is responsible for moving/resizing windows.
 class MoveLoop : public mus::WindowObserver {
diff --git a/components/mus/example/wm/window_manager_impl.cc b/components/mus/example/wm/window_manager_impl.cc
index 0896f07..7807624 100644
--- a/components/mus/example/wm/window_manager_impl.cc
+++ b/components/mus/example/wm/window_manager_impl.cc
@@ -13,8 +13,8 @@
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_property.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
+#include "components/mus/public/interfaces/input_events.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
-#include "ui/mojo/events/input_events.mojom.h"
 
 namespace {
 
diff --git a/components/mus/public/cpp/BUILD.gn b/components/mus/public/cpp/BUILD.gn
index 07150de..f4deb64 100644
--- a/components/mus/public/cpp/BUILD.gn
+++ b/components/mus/public/cpp/BUILD.gn
@@ -58,7 +58,6 @@ mojo_sdk_source_set("cpp") {
     "//third_party/mojo/src/mojo/public/cpp/environment",
     "//third_party/mojo/src/mojo/public/cpp/system",
     "//ui/gfx/geometry",
-    "//ui/mojo/events:interfaces",
     "//ui/mojo/geometry:interfaces",
   ]
 
diff --git a/components/mus/public/cpp/event_matcher.h b/components/mus/public/cpp/event_matcher.h
index 0e3bc0d..6f7c441 100644
--- a/components/mus/public/cpp/event_matcher.h
+++ b/components/mus/public/cpp/event_matcher.h
@@ -5,9 +5,9 @@
 #ifndef COMPONENTS_MUS_PUBLIC_CPP_EVENT_MATCHER_H_
 #define COMPONENTS_MUS_PUBLIC_CPP_EVENT_MATCHER_H_
 
-#include "ui/mojo/events/input_event_constants.mojom.h"
-#include "ui/mojo/events/input_event_matcher.mojom.h"
-#include "ui/mojo/events/input_key_codes.mojom.h"
+#include "components/mus/public/interfaces/input_event_constants.mojom.h"
+#include "components/mus/public/interfaces/input_event_matcher.mojom.h"
+#include "components/mus/public/interfaces/input_key_codes.mojom.h"
 
 namespace mus {
 
diff --git a/components/mus/public/cpp/window_observer.h b/components/mus/public/cpp/window_observer.h
index 4b4dbe7..ed5c2bf 100644
--- a/components/mus/public/cpp/window_observer.h
+++ b/components/mus/public/cpp/window_observer.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "components/mus/public/cpp/window.h"
-#include "ui/mojo/events/input_events.mojom.h"
+#include "components/mus/public/interfaces/input_events.mojom.h"
 
 namespace mus {
 
diff --git a/components/mus/public/interfaces/BUILD.gn b/components/mus/public/interfaces/BUILD.gn
index 11b069b..f124870 100644
--- a/components/mus/public/interfaces/BUILD.gn
+++ b/components/mus/public/interfaces/BUILD.gn
@@ -10,6 +10,10 @@ mojom("interfaces") {
     "compositor_frame.mojom",
     "gpu.mojom",
     "gpu_capabilities.mojom",
+    "input_event_constants.mojom",
+    "input_event_matcher.mojom",
+    "input_events.mojom",
+    "input_key_codes.mojom",
     "mus_constants.mojom",
     "quads.mojom",
     "surface_id.mojom",
@@ -25,7 +29,6 @@ mojom("interfaces") {
   ]
 
   deps = [
-    "//ui/mojo/events:interfaces",
     "//ui/mojo/ime:interfaces",
     "//ui/mojo/geometry:interfaces",
   ]
diff --git a/ui/mojo/events/input_event_constants.mojom b/components/mus/public/interfaces/input_event_constants.mojom
index 9b22e98..9b22e98 100644
--- a/ui/mojo/events/input_event_constants.mojom
+++ b/components/mus/public/interfaces/input_event_constants.mojom
diff --git a/ui/mojo/events/input_event_matcher.mojom b/components/mus/public/interfaces/input_event_matcher.mojom
index 08676d0c..5e5c212 100644
--- a/ui/mojo/events/input_event_matcher.mojom
+++ b/components/mus/public/interfaces/input_event_matcher.mojom
@@ -4,8 +4,8 @@
 
 module mojo;
 
-import "ui/mojo/events/input_event_constants.mojom";
-import "ui/mojo/events/input_key_codes.mojom";
+import "components/mus/public/interfaces/input_event_constants.mojom";
+import "components/mus/public/interfaces/input_key_codes.mojom";
 import "ui/mojo/geometry/geometry.mojom";
 
 struct KeyEventMatcher {
diff --git a/ui/mojo/events/input_events.mojom b/components/mus/public/interfaces/input_events.mojom
index 43b55e5..2ca3f6c 100644
--- a/ui/mojo/events/input_events.mojom
+++ b/components/mus/public/interfaces/input_events.mojom
@@ -4,8 +4,8 @@
 
 module mojo;
 
-import "ui/mojo/events/input_event_constants.mojom";
-import "ui/mojo/events/input_key_codes.mojom";
+import "components/mus/public/interfaces/input_event_constants.mojom";
+import "components/mus/public/interfaces/input_key_codes.mojom";
 import "ui/mojo/geometry/geometry.mojom";
 
 struct KeyData {
diff --git a/ui/mojo/events/input_key_codes.mojom b/components/mus/public/interfaces/input_key_codes.mojom
index 695f5bd..695f5bd 100644
--- a/ui/mojo/events/input_key_codes.mojom
+++ b/components/mus/public/interfaces/input_key_codes.mojom
diff --git a/components/mus/public/interfaces/window_tree.mojom b/components/mus/public/interfaces/window_tree.mojom
index ec10c18..69033fb 100644
--- a/components/mus/public/interfaces/window_tree.mojom
+++ b/components/mus/public/interfaces/window_tree.mojom
@@ -5,12 +5,12 @@
 module mus.mojom;
 
 import "components/mus/public/interfaces/compositor_frame.mojom";
+import "components/mus/public/interfaces/input_events.mojom";
 import "components/mus/public/interfaces/mus_constants.mojom";
 import "components/mus/public/interfaces/surface_id.mojom";
 import "components/mus/public/interfaces/window_manager_constants.mojom";
-import "ui/mojo/events/input_events.mojom";
-import "ui/mojo/ime/text_input_state.mojom";
 import "ui/mojo/geometry/geometry.mojom";
+import "ui/mojo/ime/text_input_state.mojom";
 
 struct ViewportMetrics {
   mojo.Size size_in_pixels;
diff --git a/components/mus/public/interfaces/window_tree_host.mojom b/components/mus/public/interfaces/window_tree_host.mojom
index 7c6c249..1ade81c 100644
--- a/components/mus/public/interfaces/window_tree_host.mojom
+++ b/components/mus/public/interfaces/window_tree_host.mojom
@@ -4,12 +4,12 @@
 
 module mus.mojom;
 
+import "components/mus/public/interfaces/input_event_constants.mojom";
+import "components/mus/public/interfaces/input_event_matcher.mojom";
+import "components/mus/public/interfaces/input_events.mojom";
+import "components/mus/public/interfaces/input_key_codes.mojom";
 import "components/mus/public/interfaces/window_manager.mojom";
 import "components/mus/public/interfaces/window_tree.mojom";
-import "ui/mojo/events/input_event_constants.mojom";
-import "ui/mojo/events/input_event_matcher.mojom";
-import "ui/mojo/events/input_events.mojom";
-import "ui/mojo/events/input_key_codes.mojom";
 import "ui/mojo/geometry/geometry.mojom";
 
 // WindowTreeHost encapsulates a unique underlying platform window, with a tree
diff --git a/components/mus/ws/BUILD.gn b/components/mus/ws/BUILD.gn
index 97fc81f..4d1f519 100644
--- a/components/mus/ws/BUILD.gn
+++ b/components/mus/ws/BUILD.gn
@@ -73,7 +73,6 @@ source_set("lib") {
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gl:gl",
-    "//ui/mojo/events:interfaces",
     "//ui/mojo/geometry:interfaces",
     "//ui/platform_window:platform_impls",
     "//ui/platform_window:platform_window",
@@ -137,7 +136,6 @@ test("window_manager_unittests") {
     "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
     "//third_party/mojo/src/mojo/public/cpp/bindings:bindings",
     "//ui/mojo/geometry:interfaces",
-    "//ui/mojo/events:interfaces",
     "//testing/gtest",
     "//ui/events",
     "//ui/gfx",
diff --git a/components/mus/ws/event_dispatcher.h b/components/mus/ws/event_dispatcher.h
index c24fac4..078488c 100644
--- a/components/mus/ws/event_dispatcher.h
+++ b/components/mus/ws/event_dispatcher.h
@@ -9,11 +9,11 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/surfaces/surface_id.h"
+#include "components/mus/public/interfaces/input_event_constants.mojom.h"
+#include "components/mus/public/interfaces/input_event_matcher.mojom.h"
+#include "components/mus/public/interfaces/input_events.mojom.h"
+#include "components/mus/public/interfaces/input_key_codes.mojom.h"
 #include "ui/gfx/geometry/rect_f.h"
-#include "ui/mojo/events/input_event_constants.mojom.h"
-#include "ui/mojo/events/input_event_matcher.mojom.h"
-#include "ui/mojo/events/input_events.mojom.h"
-#include "ui/mojo/events/input_key_codes.mojom.h"
 
 namespace mus {
 namespace ws {
diff --git a/components/mus/ws/event_dispatcher_delegate.h b/components/mus/ws/event_dispatcher_delegate.h
index 0938ddf6..a82c2c9 100644
--- a/components/mus/ws/event_dispatcher_delegate.h
+++ b/components/mus/ws/event_dispatcher_delegate.h
@@ -5,7 +5,7 @@
 #ifndef COMPONENTS_MUS_WS_EVENT_DISPATCHER_DELEGATE_H_
 #define COMPONENTS_MUS_WS_EVENT_DISPATCHER_DELEGATE_H_
 
-#include "ui/mojo/events/input_events.mojom.h"
+#include "components/mus/public/interfaces/input_events.mojom.h"
 
 namespace mus {
 namespace ws {
diff --git a/components/pdf_viewer/pdf_viewer.cc b/components/pdf_viewer/pdf_viewer.cc
index fd58f31..18e6cc8 100644
--- a/components/pdf_viewer/pdf_viewer.cc
+++ b/components/pdf_viewer/pdf_viewer.cc
@@ -15,6 +15,8 @@
 #include "components/mus/public/cpp/window_tree_delegate.h"
 #include "components/mus/public/interfaces/compositor_frame.mojom.h"
 #include "components/mus/public/interfaces/gpu.mojom.h"
+#include "components/mus/public/interfaces/input_events.mojom.h"
+#include "components/mus/public/interfaces/input_key_codes.mojom.h"
 #include "components/mus/public/interfaces/surface_id.mojom.h"
 #include "components/web_view/public/interfaces/frame.mojom.h"
 #include "gpu/GLES2/gl2chromium.h"
@@ -39,8 +41,6 @@
 #include "third_party/pdfium/public/fpdf_ext.h"
 #include "third_party/pdfium/public/fpdfview.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/mojo/events/input_events.mojom.h"
-#include "ui/mojo/events/input_key_codes.mojom.h"
 #include "ui/mojo/geometry/geometry.mojom.h"
 #include "ui/mojo/geometry/geometry_util.h"
 #include "v8/include/v8.h"
diff --git a/mandoline/ui/desktop_ui/BUILD.gn b/mandoline/ui/desktop_ui/BUILD.gn
index b06a669..8c0a83c 100644
--- a/mandoline/ui/desktop_ui/BUILD.gn
+++ b/mandoline/ui/desktop_ui/BUILD.gn
@@ -48,7 +48,6 @@ source_set("lib") {
     "//third_party/mojo/src/mojo/public/cpp/bindings",
     "//ui/gfx",
     "//ui/gfx/geometry",
-    "//ui/mojo/events:interfaces",
     "//ui/views",
     "//ui/views/mus",
     "//url",
diff --git a/mandoline/ui/desktop_ui/public/interfaces/BUILD.gn b/mandoline/ui/desktop_ui/public/interfaces/BUILD.gn
index d781578..4bb47d8 100644
--- a/mandoline/ui/desktop_ui/public/interfaces/BUILD.gn
+++ b/mandoline/ui/desktop_ui/public/interfaces/BUILD.gn
@@ -17,6 +17,5 @@ mojom("interfaces") {
     "//components/mus/public/interfaces",
     "//mojo/application/public/interfaces",
     "//mojo/services/network/public/interfaces",
-    "//ui/mojo/events:interfaces",
   ]
 }
diff --git a/mandoline/ui/omnibox/BUILD.gn b/mandoline/ui/omnibox/BUILD.gn
index cacce4b..b8bbe1a 100644
--- a/mandoline/ui/omnibox/BUILD.gn
+++ b/mandoline/ui/omnibox/BUILD.gn
@@ -35,7 +35,6 @@ source_set("lib") {
     "//skia",
     "//third_party/mojo/src/mojo/public/cpp/bindings",
     "//ui/gfx/geometry",
-    "//ui/mojo/events:interfaces",
     "//ui/views",
     "//ui/views/mus",
   ]
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 {
 
diff --git a/ui/mojo/events/BUILD.gn b/ui/mojo/events/BUILD.gn
deleted file mode 100644
index eda7307..0000000
--- a/ui/mojo/events/BUILD.gn
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
-
-mojom("interfaces") {
-  sources = [
-    "input_event_constants.mojom",
-    "input_event_matcher.mojom",
-    "input_events.mojom",
-    "input_key_codes.mojom",
-  ]
-
-  deps = [
-    "//ui/mojo/geometry:interfaces",
-  ]
-}