Rename traits and mojo directory in //ui/base/ime

This CL renames mojo to mojom and *_struct_traits.* to *_mojom_traits.* in //ui/base/ime. *_struct_traits.* => *_mojom_traits.* ui/base/ime/mojo => ui/base/ime/mojom Bug: 806965 Change-Id: Id06c81ffdded6a7cfcdc3602325ef78dc9891b35 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715479 Commit-Queue: Miyoung Shin <[email protected]> Reviewed-by: Sadrul Chowdhury <[email protected]> Reviewed-by: Kinuko Yasuda <[email protected]> Reviewed-by: Ken Rockot <[email protected]> Cr-Commit-Position: refs/heads/master@{#681621}
Thompson-NO3 · Jul 27, 2019 · b18c476 · b18c476
1 parent faa0e21
commit b18c476
Show file tree

Hide file tree

Showing 25 changed files with 34 additions and 34 deletions.
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
@@ -520,7 +520,7 @@ mojom("mojo_bindings") {
     "//skia/public/interfaces",
     "//third_party/blink/public/mojom:mojom_core",
     "//third_party/blink/public/mojom:web_feature_mojo_bindings",
-    "//ui/base/ime/mojo",
+    "//ui/base/ime/mojom",
     "//ui/base/mojom",
     "//ui/events/mojom",
     "//ui/gfx/geometry/mojom",

diff --git a/content/common/input/input_handler.mojom b/content/common/input/input_handler.mojom
@@ -9,7 +9,7 @@ import "content/common/native_types.mojom";
 import "mojo/public/mojom/base/string16.mojom";
 import "mojo/public/mojom/base/time.mojom";
 import "third_party/blink/public/mojom/selection_menu/selection_menu_behavior.mojom";
-import "ui/base/ime/mojo/ime_types.mojom";
+import "ui/base/ime/mojom/ime_types.mojom";
 import "ui/events/mojom/event.mojom";
 import "ui/events/mojom/event_constants.mojom";
 import "ui/gfx/geometry/mojom/geometry.mojom";

diff --git a/content/common/render_widget_host_ns_view.mojom b/content/common/render_widget_host_ns_view.mojom
@@ -7,7 +7,7 @@ module remote_cocoa.mojom;
 import "content/common/native_types.mojom";
 import "content/common/input/input_handler.mojom";
 import "mojo/public/mojom/base/string16.mojom";
-import "ui/base/ime/mojo/ime_types.mojom";
+import "ui/base/ime/mojom/ime_types.mojom";
 import "ui/display/mojom/display.mojom";
 import "ui/events/mojom/event.mojom";
 import "ui/gfx/geometry/mojom/geometry.mojom";

diff --git a/mojo/public/tools/bindings/chromium_bindings_configuration.gni b/mojo/public/tools/bindings/chromium_bindings_configuration.gni
@@ -50,7 +50,7 @@ _typemap_imports = [
   "//third_party/blink/public/public_typemaps.gni",
   "//ui/accessibility/mojom/typemaps.gni",
   "//ui/base/accelerators/mojom/typemaps.gni",
-  "//ui/base/ime/mojo/typemaps.gni",
+  "//ui/base/ime/mojom/typemaps.gni",
   "//ui/base/mojom/typemaps.gni",
   "//ui/display/mojom/typemaps.gni",
   "//ui/events/mojom/typemaps.gni",

diff --git a/third_party/blink/public/BUILD.gn b/third_party/blink/public/BUILD.gn
@@ -540,7 +540,7 @@ source_set("blink_headers") {
     "//third_party/blink/public/common",
     "//ui/accessibility:ax_enums_mojo",
     "//ui/base/ime:text_input_types",
-    "//ui/base/ime/mojo",
+    "//ui/base/ime/mojom",
     "//url",
   ]
 

diff --git a/third_party/blink/public/mojom/BUILD.gn b/third_party/blink/public/mojom/BUILD.gn
@@ -168,7 +168,7 @@ mojom("mojom_platform") {
     "//services/viz/public/interfaces",
     "//skia/public/interfaces",
     "//third_party/blink/public/mojom/usb",
-    "//ui/base/ime/mojo",
+    "//ui/base/ime/mojom",
     "//ui/gfx/geometry/mojom",
     "//ui/gfx/mojo",
     "//url/mojom:url_mojom_gurl",

diff --git a/third_party/blink/public/mojom/choosers/date_time_chooser.mojom b/third_party/blink/public/mojom/choosers/date_time_chooser.mojom
@@ -5,7 +5,7 @@
 module blink.mojom;
 
 import "mojo/public/mojom/base/string16.mojom";
-import "ui/base/ime/mojo/ime_types.mojom";
+import "ui/base/ime/mojom/ime_types.mojom";
 
 struct DateTimeSuggestion {
   // The date/time value represented as a double.

diff --git a/third_party/blink/public/web/DEPS b/third_party/blink/public/web/DEPS
@@ -30,7 +30,7 @@ include_rules = [
     "+third_party/blink/public/platform",
     "+third_party/blink/public/web",
     "+ui/accessibility/ax_enums.mojom-shared.h",
-    "+ui/base/ime/mojo/ime_types.mojom-shared.h",
+    "+ui/base/ime/mojom/ime_types.mojom-shared.h",
 
     # Allowed only inside INSIDE_BLINK
     "+third_party/blink/renderer/core",

diff --git a/third_party/blink/public/web/web_ime_text_span.h b/third_party/blink/public/web/web_ime_text_span.h
@@ -35,7 +35,7 @@
 #include <vector>
 
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/base/ime/mojo/ime_types.mojom-shared.h"
+#include "ui/base/ime/mojom/ime_types.mojom-shared.h"
 
 namespace blink {
 

diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn
@@ -117,7 +117,7 @@ source_set("prerequisites") {
     "//third_party/ots",
     "//third_party/snappy",
     "//third_party/zlib",
-    "//ui/base/ime/mojo",
+    "//ui/base/ime/mojom",
     "//ui/events:dom_keycode_converter",
     "//ui/gfx/geometry",
     "//ui/native_theme",

diff --git a/third_party/blink/renderer/core/DEPS b/third_party/blink/renderer/core/DEPS
@@ -75,7 +75,7 @@ include_rules = [
     "+third_party/blink/renderer/core",
     "-third_party/blink/renderer/modules",
     "+third_party/skia/include",
-    "+ui/base/ime/mojo/ime_types.mojom-blink.h",
+    "+ui/base/ime/mojom/ime_types.mojom-blink.h",
     "+ui/gfx/geometry",
     "+ui/gfx/skia_util.h",
     "-web",

diff --git a/third_party/blink/renderer/core/editing/ime/ime_text_span.h b/third_party/blink/renderer/core/editing/ime/ime_text_span.h
@@ -31,7 +31,7 @@
 #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
 #include "third_party/blink/renderer/platform/wtf/vector.h"
-#include "ui/base/ime/mojo/ime_types.mojom-blink.h"
+#include "ui/base/ime/mojom/ime_types.mojom-blink.h"
 
 namespace blink {
 

diff --git a/third_party/blink/renderer/core/editing/markers/styleable_marker.h b/third_party/blink/renderer/core/editing/markers/styleable_marker.h
@@ -7,7 +7,7 @@
 
 #include "third_party/blink/renderer/core/editing/markers/document_marker.h"
 #include "third_party/blink/renderer/platform/wtf/casting.h"
-#include "ui/base/ime/mojo/ime_types.mojom-blink.h"
+#include "ui/base/ime/mojom/ime_types.mojom-blink.h"
 
 namespace blink {
 

diff --git a/third_party/blink/renderer/core/html/forms/external_date_time_chooser.cc b/third_party/blink/renderer/core/html/forms/external_date_time_chooser.cc
@@ -33,7 +33,7 @@
 #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
 #include "third_party/blink/renderer/platform/wtf/functional.h"
 #include "third_party/blink/renderer/platform/wtf/text/atomic_string.h"
-#include "ui/base/ime/mojo/ime_types.mojom-blink.h"
+#include "ui/base/ime/mojom/ime_types.mojom-blink.h"
 
 namespace blink {
 

diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
@@ -937,7 +937,7 @@ test("ui_base_unittests") {
       "ime/candidate_window_unittest.cc",
       "ime/composition_text_unittest.cc",
       "ime/input_method_base_unittest.cc",
-      "ime/mojo/ime_struct_traits_unittest.cc",
+      "ime/mojom/ime_mojom_traits_unittest.cc",
     ]
     if (is_win) {
       sources += [
@@ -991,7 +991,7 @@ test("ui_base_unittests") {
   if (build_ime) {
     deps += [
       "//ui/base/ime",
-      "//ui/base/ime/mojo:test_interfaces",
+      "//ui/base/ime/mojom:test_interfaces",
     ]
   }
 

diff --git a/ui/base/ime/BUILD.gn b/ui/base/ime/BUILD.gn
@@ -91,7 +91,7 @@ jumbo_component("ime") {
     "//base:i18n",
     "//skia",
     "//third_party/icu",
-    "//ui/base/ime/mojo",
+    "//ui/base/ime/mojom",
     "//ui/events",
     "//ui/events:dom_keycode_converter",
     "//ui/events:events",

diff --git a/ui/base/ime/mojo/BUILD.gn → ui/base/ime/mojom/BUILD.gn b/ui/base/ime/mojo/BUILD.gn → ui/base/ime/mojom/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("//mojo/public/tools/bindings/mojom.gni")
 
-mojom("mojo") {
+mojom("mojom") {
   sources = [
     "ime_types.mojom",
   ]
@@ -16,10 +16,10 @@ mojom("mojo") {
 
 mojom("test_interfaces") {
   sources = [
-    "ime_struct_traits_test.mojom",
+    "ime_mojom_traits_test.mojom",
   ]
 
   public_deps = [
-    ":mojo",
+    ":mojom",
   ]
 }
diff --git a/ui/base/ime/mojo/OWNERS → ui/base/ime/mojom/OWNERS b/ui/base/ime/mojo/OWNERS → ui/base/ime/mojom/OWNERS
@@ -1,5 +1,5 @@
-per-file *_struct_traits*.*=set noparent
-per-file *_struct_traits*.*=file://ipc/SECURITY_OWNERS
+per-file *_mojom_traits*.*=set noparent
+per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS
 
 per-file *.mojom=set noparent
 per-file *.mojom=file://ipc/SECURITY_OWNERS

diff --git a/...ase/ime/mojo/ime_struct_traits_test.mojom → ...ase/ime/mojom/ime_mojom_traits_test.mojom b/...ase/ime/mojo/ime_struct_traits_test.mojom → ...ase/ime/mojom/ime_mojom_traits_test.mojom
@@ -4,7 +4,7 @@
 
 module ui.mojom;
 
-import "ui/base/ime/mojo/ime_types.mojom";
+import "ui/base/ime/mojom/ime_types.mojom";
 
 interface IMEStructTraitsTest {
   [Sync]

diff --git a/...se/ime/mojo/ime_struct_traits_unittest.cc → ...se/ime/mojom/ime_mojom_traits_unittest.cc b/...se/ime/mojo/ime_struct_traits_unittest.cc → ...se/ime/mojom/ime_mojom_traits_unittest.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/base/ime/mojo/ime_types_struct_traits.h"
+#include "ui/base/ime/mojom/ime_types_mojom_traits.h"
 
 #include <utility>
 
 #include "base/stl_util.h"
 #include "base/test/scoped_task_environment.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/ime/mojo/ime_struct_traits_test.mojom.h"
+#include "ui/base/ime/mojom/ime_mojom_traits_test.mojom.h"
 
 namespace ui {
 

diff --git a/ui/base/ime/mojo/ime_types.mojom → ui/base/ime/mojom/ime_types.mojom b/ui/base/ime/mojo/ime_types.mojom → ui/base/ime/mojom/ime_types.mojom
diff --git a/ui/base/ime/mojo/ime_types.typemap → ui/base/ime/mojom/ime_types.typemap b/ui/base/ime/mojo/ime_types.typemap → ui/base/ime/mojom/ime_types.typemap
@@ -2,14 +2,14 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-mojom = "//ui/base/ime/mojo/ime_types.mojom"
+mojom = "//ui/base/ime/mojom/ime_types.mojom"
 public_headers = [
   "//ui/base/ime/ime_text_span.h",
   "//ui/base/ime/text_input_type.h",
 ]
-traits_headers = [ "//ui/base/ime/mojo/ime_types_struct_traits.h" ]
+traits_headers = [ "//ui/base/ime/mojom/ime_types_mojom_traits.h" ]
 sources = [
-  "//ui/base/ime/mojo/ime_types_struct_traits.cc",
+  "//ui/base/ime/mojom/ime_types_mojom_traits.cc",
 ]
 public_deps = [
   "//ui/base/ime:ime_types",

diff --git a/ui/base/ime/mojo/ime_types_struct_traits.cc → ui/base/ime/mojom/ime_types_mojom_traits.cc b/ui/base/ime/mojo/ime_types_struct_traits.cc → ui/base/ime/mojom/ime_types_mojom_traits.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/base/ime/mojo/ime_types_struct_traits.h"
+#include "ui/base/ime/mojom/ime_types_mojom_traits.h"
 
 namespace mojo {
 

diff --git a/ui/base/ime/mojo/ime_types_struct_traits.h → ui/base/ime/mojom/ime_types_mojom_traits.h b/ui/base/ime/mojo/ime_types_struct_traits.h → ui/base/ime/mojom/ime_types_mojom_traits.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_BASE_IME_MOJO_IME_TYPES_STRUCT_TRAITS_H_
-#define UI_BASE_IME_MOJO_IME_TYPES_STRUCT_TRAITS_H_
+#ifndef UI_BASE_IME_MOJOM_IME_TYPES_MOJOM_TRAITS_H_
+#define UI_BASE_IME_MOJOM_IME_TYPES_MOJOM_TRAITS_H_
 
 #include <vector>
 
 #include "ui/base/ime/ime_text_span.h"
-#include "ui/base/ime/mojo/ime_types.mojom.h"
+#include "ui/base/ime/mojom/ime_types.mojom.h"
 #include "ui/base/ime/text_input_type.h"
 
 namespace mojo {
@@ -65,4 +65,4 @@ struct EnumTraits<ui::mojom::ImeTextSpanThickness, ui::ImeTextSpan::Thickness> {
 
 }  // namespace mojo
 
-#endif  // UI_BASE_IME_MOJO_IME_TYPES_STRUCT_TRAITS_H_
+#endif  // UI_BASE_IME_MOJOM_IME_TYPES_MOJOM_TRAITS_H_
diff --git a/ui/base/ime/mojo/typemaps.gni → ui/base/ime/mojom/typemaps.gni b/ui/base/ime/mojo/typemaps.gni → ui/base/ime/mojom/typemaps.gni
@@ -2,4 +2,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-typemaps = [ "//ui/base/ime/mojo/ime_types.typemap" ]
+typemaps = [ "//ui/base/ime/mojom/ime_types.typemap" ]