mojo/converters/input_events -> ui/events/mojo

R=sky@chromium.org
BUG=

Review-Url: https://codereview.chromium.org/2014003002
Cr-Commit-Position: refs/heads/master@{#396182}

ash/mus/BUILD.gn

@@ -42,7 +42,6 @@ source_set("lib") {
     "//mash/shelf/public/interfaces",
     "//mash/wm/public/interfaces",
     "//mojo/common:common_base",
-    "//mojo/converters/input_events",
     "//services/catalog/public/cpp",
     "//services/shell/public/cpp",
     "//services/tracing/public/cpp",
@@ -52,6 +51,7 @@ source_set("lib") {
     "//ui/aura",
     "//ui/events",
     "//ui/events/devices",
+    "//ui/events/mojo",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gfx/geometry/mojo",

components/mus/public/cpp/BUILD.gn

@@ -57,13 +57,13 @@ source_set("cpp") {
     "//gpu/command_buffer/client:gles2_implementation",
     "//gpu/command_buffer/client:gles2_interface",
     "//gpu/command_buffer/common",
-    "//mojo/converters/input_events",
     "//mojo/converters/surfaces",
     "//mojo/public/cpp/bindings:bindings",
     "//mojo/public/cpp/system",
     "//services/shell/public/cpp",
     "//services/shell/public/interfaces",
     "//ui/events",
+    "//ui/events/mojo",
     "//ui/gfx/geometry",
     "//ui/gfx/geometry/mojo",
     "//ui/gfx/geometry/mojo:interfaces",

components/mus/public/cpp/lib/window_tree_client_impl.cc

@@ -22,9 +22,9 @@
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/cpp/window_tree_connection_observer.h"
 #include "components/mus/public/cpp/window_tree_delegate.h"
-#include "mojo/converters/input_events/input_events_type_converters.h"
 #include "services/shell/public/cpp/connector.h"
 #include "ui/events/event.h"
+#include "ui/events/mojo/input_events_type_converters.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/mojo/geometry_type_converters.h"
 #include "ui/gfx/geometry/size.h"

components/mus/public/cpp/tests/BUILD.gn

@@ -65,12 +65,12 @@ test("mus_public_unittests") {
     "//components/mus/common:mus_common",
     "//components/mus/public/cpp",
     "//mojo/common:common_base",
-    "//mojo/converters/input_events",
     "//mojo/edk/system",
     "//mojo/public/cpp/system",
     "//services/shell/public/cpp",
     "//testing/gtest",
     "//ui/events",
+    "//ui/events/mojo",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
     "//ui/gfx/geometry/mojo",

components/mus/public/cpp/tests/window_tree_client_impl_private.cc

@@ -6,7 +6,7 @@
 
 #include "components/mus/public/cpp/lib/window_tree_client_impl.h"
 #include "components/mus/public/cpp/window.h"
-#include "mojo/converters/input_events/input_events_type_converters.h"
+#include "ui/events/mojo/input_events_type_converters.h"
 #include "ui/gfx/geometry/mojo/geometry_type_converters.h"
 
 namespace mus {

components/mus/public/cpp/tests/window_tree_client_impl_unittest.cc

@@ -21,10 +21,10 @@
 #include "components/mus/public/cpp/window_tracker.h"
 #include "components/mus/public/cpp/window_tree_delegate.h"
 #include "mojo/common/common_type_converters.h"
-#include "mojo/converters/input_events/input_events_type_converters.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
+#include "ui/events/mojo/input_events_type_converters.h"
 #include "ui/gfx/geometry/mojo/geometry_type_converters.h"
 #include "ui/gfx/geometry/rect.h"
 

components/mus/ws/BUILD.gn

@@ -100,7 +100,6 @@ source_set("lib") {
     "//components/mus/surfaces",
     "//mojo/common:common_base",
     "//mojo/converters/ime",
-    "//mojo/converters/input_events",
     "//mojo/converters/surfaces",
     "//mojo/public/cpp/bindings:callback",
     "//services/shell/public/cpp",
@@ -109,6 +108,7 @@ source_set("lib") {
     "//ui/base",
     "//ui/display",
     "//ui/events",
+    "//ui/events/mojo",
     "//ui/events/platform",
     "//ui/gfx",
     "//ui/gfx/geometry",
@@ -211,7 +211,6 @@ test("mus_ws_unittests") {
     "//components/mus/public/cpp/tests:test_support",
     "//components/mus/public/interfaces",
     "//components/mus/surfaces",
-    "//mojo/converters/input_events",
     "//mojo/converters/transform",
     "//mojo/public/cpp/bindings:bindings",
     "//services/shell/public/cpp:shell_test_support",
@@ -221,6 +220,7 @@ test("mus_ws_unittests") {
     "//testing/gtest",
     "//third_party/mesa:osmesa",
     "//ui/events",
+    "//ui/events/mojo",
     "//ui/gfx",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",

components/mus/ws/event_dispatcher.cc

@@ -14,8 +14,8 @@
 #include "components/mus/ws/server_window_delegate.h"
 #include "components/mus/ws/window_coordinate_conversions.h"
 #include "components/mus/ws/window_finder.h"
-#include "mojo/converters/input_events/input_events_type_converters.h"
 #include "ui/events/event_utils.h"
+#include "ui/events/mojo/input_events_type_converters.h"
 #include "ui/gfx/geometry/mojo/geometry_type_converters.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/point_conversions.h"

components/mus/ws/event_matcher.cc

@@ -4,7 +4,7 @@
 
 #include "components/mus/ws/event_matcher.h"
 
-#include "mojo/converters/input_events/input_events_type_converters.h"
+#include "ui/events/mojo/input_events_type_converters.h"
 #include "ui/gfx/geometry/mojo/geometry_type_converters.h"
 
 namespace mus {

components/mus/ws/platform_display.cc

@@ -22,8 +22,6 @@
 #include "components/mus/ws/server_window_surface.h"
 #include "components/mus/ws/server_window_surface_manager.h"
 #include "components/mus/ws/window_coordinate_conversions.h"
-#include "mojo/converters/input_events/input_events_type_converters.h"
-#include "mojo/converters/input_events/mojo_extended_key_event_data.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_utils.h"
 #include "mojo/converters/transform/transform_type_converters.h"
@@ -34,6 +32,8 @@
 #include "ui/display/display.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
+#include "ui/events/mojo/input_events_type_converters.h"
+#include "ui/events/mojo/mojo_extended_key_event_data.h"
 #include "ui/gfx/geometry/mojo/geometry_type_converters.h"
 #include "ui/platform_window/platform_ime_controller.h"
 #include "ui/platform_window/platform_window.h"

components/mus/ws/window_server.cc

@@ -22,9 +22,9 @@
 #include "components/mus/ws/window_server_delegate.h"
 #include "components/mus/ws/window_tree.h"
 #include "components/mus/ws/window_tree_binding.h"
-#include "mojo/converters/input_events/input_events_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "services/shell/public/cpp/connection.h"
+#include "ui/events/mojo/input_events_type_converters.h"
 #include "ui/gfx/geometry/mojo/geometry_type_converters.h"
 #include "ui/gfx/geometry/size_conversions.h"
 

components/mus/ws/window_tree.cc

@@ -26,8 +26,8 @@
 #include "components/mus/ws/window_server.h"
 #include "components/mus/ws/window_tree_binding.h"
 #include "mojo/converters/ime/ime_type_converters.h"
-#include "mojo/converters/input_events/input_events_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
+#include "ui/events/mojo/input_events_type_converters.h"
 #include "ui/gfx/geometry/mojo/geometry_type_converters.h"
 #include "ui/platform_window/text_input_state.h"
 

content/renderer/mus/BUILD.gn

@@ -26,12 +26,12 @@ source_set("mus") {
     "//content/public/common:common_sources",
     "//mojo/common",
     "//mojo/converters/blink",
-    "//mojo/converters/input_events",
     "//mojo/converters/surfaces",
     "//services/shell/public/cpp",
     "//third_party/WebKit/public:blink",
     "//ui/events:events",
     "//ui/events:events_base",
+    "//ui/events/mojo",
     "//ui/gfx/geometry/mojo",
   ]
 }

content/renderer/mus/compositor_mus_connection.cc

@@ -9,8 +9,8 @@
 #include "content/renderer/input/input_handler_manager.h"
 #include "content/renderer/mus/render_widget_mus_connection.h"
 #include "mojo/converters/blink/blink_input_events_type_converters.h"
-#include "mojo/converters/input_events/input_events_type_converters.h"
 #include "ui/events/latency_info.h"
+#include "ui/events/mojo/input_events_type_converters.h"
 
 using mus::mojom::EventResult;
 

mash/wm/BUILD.gn

@@ -90,12 +90,12 @@ source_set("lib") {
     "//mash/wm/public/interfaces",
     "//mash/wm/resources",
     "//mojo/common:common_base",
-    "//mojo/converters/input_events",
     "//services/shell/public/cpp",
     "//services/tracing/public/cpp",
     "//skia",
     "//ui/aura",
     "//ui/events",
+    "//ui/events/mojo",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gfx/geometry/mojo",
@@ -184,7 +184,6 @@ source_set("unittests") {
     "//components/mus/public/cpp/tests:unittest_support",
     "//components/mus/public/interfaces",
     "//mash/wm/public/interfaces",
-    "//mojo/converters/input_events",
     "//mojo/edk/system",
     "//mojo/public/cpp/system",
     "//services/shell/public/cpp:shell_test_support",
@@ -193,6 +192,7 @@ source_set("unittests") {
     "//ui/base",
     "//ui/display",
     "//ui/events",
+    "//ui/events/mojo",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
     "//ui/gfx/geometry/mojo",

mash/wm/frame/non_client_frame_view_mash.cc

@@ -16,9 +16,9 @@
 #include "mash/wm/frame/default_header_painter.h"
 #include "mash/wm/frame/frame_border_hit_test_controller.h"
 #include "mash/wm/frame/header_painter.h"
-#include "mojo/converters/input_events/input_events_type_converters.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/paint_recorder.h"
+#include "ui/events/mojo/input_events_type_converters.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_conversions.h"

mash/wm/window_manager_application.cc

@@ -18,11 +18,11 @@
 #include "mash/wm/root_windows_observer.h"
 #include "mash/wm/shelf_layout_impl.h"
 #include "mash/wm/user_window_controller_impl.h"
-#include "mojo/converters/input_events/input_events_type_converters.h"
 #include "services/shell/public/cpp/connection.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/tracing/public/cpp/tracing_impl.h"
 #include "ui/events/event.h"
+#include "ui/events/mojo/input_events_type_converters.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/screen_mus.h"
 

mojo/converters/input_events/BUILD.gn → ui/events/mojo/BUILD.gn

@@ -3,7 +3,8 @@
 # found in the LICENSE file.
 
 # GYP version: mojo/mojo_converters.gypi:mojo_input_events_lib
-component("input_events") {
+component("mojo") {
+  output_name = "input_events"
   sources = [
     "input_events_type_converters.cc",
     "mojo_extended_key_event_data.cc",

mojo/converters/input_events/input_events_type_converters.cc → ui/events/mojo/input_events_type_converters.cc

@@ -1,8 +1,8 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2016 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.
 
-#include "mojo/converters/input_events/input_events_type_converters.h"
+#include "ui/events/mojo/input_events_type_converters.h"
 
 #include <stdint.h>
 
@@ -14,10 +14,10 @@
 #endif
 
 #include "components/mus/public/interfaces/input_events.mojom.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/events/mojo/mojo_extended_key_event_data.h"
 #include "ui/gfx/geometry/mojo/geometry_type_converters.h"
 
 namespace mojo {

mojo/converters/input_events/input_events_type_converters.h → ui/events/mojo/input_events_type_converters.h

@@ -1,15 +1,15 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2016 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.
 
-#ifndef MOJO_CONVERTERS_INPUT_EVENTS_INPUT_EVENTS_TYPE_CONVERTERS_H_
-#define MOJO_CONVERTERS_INPUT_EVENTS_INPUT_EVENTS_TYPE_CONVERTERS_H_
+#ifndef UI_EVENTS_MOJO_INPUT_EVENTS_TYPE_CONVERTERS_H_
+#define UI_EVENTS_MOJO_INPUT_EVENTS_TYPE_CONVERTERS_H_
 
 #include <memory>
 
 #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/events/mojo/mojo_input_events_export.h"
 
 namespace mojo {
 
@@ -46,4 +46,4 @@ struct MOJO_INPUT_EVENTS_EXPORT
 
 }  // namespace mojo
 
-#endif  // MOJO_CONVERTERS_INPUT_EVENTS_INPUT_EVENTS_TYPE_CONVERTERS_H_
+#endif  // UI_EVENTS_MOJO_INPUT_EVENTS_TYPE_CONVERTERS_H_

mojo/converters/input_events/mojo_extended_key_event_data.cc → ui/events/mojo/mojo_extended_key_event_data.cc

@@ -1,10 +1,10 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2016 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.
 
 #include <stdint.h>
 
-#include "mojo/converters/input_events/mojo_extended_key_event_data.h"
+#include "ui/events/mojo/mojo_extended_key_event_data.h"
 
 namespace mojo {
 

mojo/converters/input_events/mojo_extended_key_event_data.h → ui/events/mojo/mojo_extended_key_event_data.h

@@ -1,16 +1,17 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2016 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.
 
-#ifndef MOJO_CONVERTERS_INPUT_EVENTS_MOJO_EXTENDED_KEY_EVENT_DATA_H_
-#define MOJO_CONVERTERS_INPUT_EVENTS_MOJO_EXTENDED_KEY_EVENT_DATA_H_
+#ifndef UI_EVENTS_MOJO_MOJO_EXTENDED_KEY_EVENT_DATA_H_
+#define UI_EVENTS_MOJO_MOJO_EXTENDED_KEY_EVENT_DATA_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
-#include "mojo/converters/input_events/mojo_input_events_export.h"
 #include "ui/events/event.h"
+#include "ui/events/mojo/mojo_input_events_export.h"
 
+// TODO(beng): should be ui namespace
 namespace mojo {
 
 // A structure to store all mojo specific data on a KeyEvent.
@@ -39,4 +40,4 @@ class MOJO_INPUT_EVENTS_EXPORT MojoExtendedKeyEventData
 
 }  // namespace mojo
 
-#endif  // MOJO_CONVERTERS_INPUT_EVENTS_MOJO_EXTENDED_KEY_EVENT_DATA_H_
+#endif  // UI_EVENTS_MOJO_MOJO_EXTENDED_KEY_EVENT_DATA_H_

mojo/converters/input_events/mojo_input_events_export.h → ui/events/mojo/mojo_input_events_export.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_CONVERTERS_INPUT_EVENTS_MOJO_INPUT_EVENTS_EXPORT_H_
-#define MOJO_CONVERTERS_INPUT_EVENTS_MOJO_INPUT_EVENTS_EXPORT_H_
+#ifndef UI_EVENTS_MOJO_MOJO_INPUT_EVENTS_EXPORT_H_
+#define UI_EVENTS_MOJO_MOJO_INPUT_EVENTS_EXPORT_H_
 
 #if defined(COMPONENT_BUILD)
 
@@ -29,4 +29,4 @@
 #define MOJO_INPUT_EVENTS_EXPORT
 #endif
 
-#endif  // MOJO_CONVERTERS_INPUT_EVENTS_MOJO_INPUT_EVENTS_EXPORT_H_
+#endif  // UI_EVENTS_MOJO_MOJO_INPUT_EVENTS_EXPORT_H_

ui/views/mus/BUILD.gn

@@ -59,7 +59,6 @@ component("mus") {
     "//components/mus/public/cpp",
     "//components/mus/public/interfaces",
     "//mojo/converters/ime",
-    "//mojo/converters/input_events",
     "//mojo/converters/surfaces",
     "//mojo/public/c/system:for_component",
     "//mojo/public/cpp/bindings",
@@ -74,6 +73,7 @@ component("mus") {
     "//ui/events",
     "//ui/events:events_base",
     "//ui/events/devices",
+    "//ui/events/mojo",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gfx/geometry/mojo",

ui/views/mus/platform_window_mus.cc

@@ -9,8 +9,8 @@
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window_property.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
-#include "mojo/converters/input_events/input_events_type_converters.h"
 #include "ui/base/view_prop.h"
+#include "ui/events/mojo/input_events_type_converters.h"
 #include "ui/platform_window/platform_window_delegate.h"
 #include "ui/views/mus/window_manager_connection.h"