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

This CL renames mojo to mojom and *_struct_traits.* to
*_mojom_traits.* in //ui/base/accelerators.

*_struct_traits.* => *_mojom_traits.*
ui/base/accelerators/mojo => ui/base/accelerators/mojom

Bug: 806965
Change-Id: Ife7875554bdd656e1a9588a941ae61894f95aba8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715783Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Miyoung Shin <myid.shin@igalia.com>
Cr-Commit-Position: refs/heads/master@{#681167}

components/remote_cocoa/common/BUILD.gn

@@ -19,7 +19,7 @@ mojom("mojo") {
 
   public_deps = [
     "//mojo/public/mojom/base",
-    "//ui/base/accelerators/mojo:interfaces",
+    "//ui/base/accelerators/mojom",
     "//ui/base/mojom",
     "//ui/display/mojom",
     "//ui/events/mojo:interfaces",

components/remote_cocoa/common/native_widget_ns_window_host.mojom

@@ -5,7 +5,7 @@
 module remote_cocoa.mojom;
 
 import "mojo/public/mojom/base/string16.mojom";
-import "ui/base/accelerators/mojo/accelerator.mojom";
+import "ui/base/accelerators/mojom/accelerator.mojom";
 import "ui/base/mojom/ui_base_types.mojom";
 import "ui/base/mojom/window_open_disposition.mojom";
 import "ui/display/mojom/display.mojom";

mojo/public/tools/bindings/chromium_bindings_configuration.gni

@@ -49,7 +49,7 @@ _typemap_imports = [
   "//third_party/blink/common/typemaps.gni",
   "//third_party/blink/public/public_typemaps.gni",
   "//ui/accessibility/mojom/typemaps.gni",
-  "//ui/base/accelerators/mojo/typemaps.gni",
+  "//ui/base/accelerators/mojom/typemaps.gni",
   "//ui/base/ime/mojo/typemaps.gni",
   "//ui/base/mojom/typemaps.gni",
   "//ui/display/mojom/typemaps.gni",

ui/base/BUILD.gn

@@ -999,7 +999,7 @@ test("ui_base_unittests") {
     deps += [ "//ui/resources:ui_test_pak_bundle_data" ]
   } else {
     deps += [
-      "//ui/base/accelerators/mojo:unittests",
+      "//ui/base/accelerators/mojom:unittests",
       "//ui/base/mojom:unittests",
     ]
   }

ui/base/accelerators/mojo/BUILD.gn → ui/base/accelerators/mojom/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//mojo/public/tools/bindings/mojom.gni")
 
-mojom("interfaces") {
+mojom("mojom") {
   sources = [
     "accelerator.mojom",
   ]
@@ -14,12 +14,12 @@ mojom("interfaces") {
   ]
 }
 
-source_set("struct_traits") {
+source_set("mojom_traits") {
   sources = [
-    "accelerator_struct_traits.h",
+    "accelerator_mojom_traits.h",
   ]
   public_deps = [
-    ":interfaces_shared_cpp_sources",
+    ":mojom_shared_cpp_sources",
     "//mojo/public/mojom/base",
     "//ui/base",
     "//ui/events",
@@ -29,11 +29,11 @@ source_set("struct_traits") {
 source_set("unittests") {
   testonly = true
   sources = [
-    "accelerator_struct_traits_unittest.cc",
+    "accelerator_mojom_traits_unittest.cc",
   ]
   deps = [
-    ":interfaces",
-    ":struct_traits",
+    ":mojom",
+    ":mojom_traits",
     "//testing/gtest",
     "//ui/base",
     "//ui/events",

ui/base/accelerators/mojo/OWNERS → ui/base/accelerators/mojom/OWNERS

@@ -4,5 +4,5 @@ per-file *.mojom=file://ipc/SECURITY_OWNERS
 per-file *.typemap=set noparent
 per-file *.typemap=file://ipc/SECURITY_OWNERS
 
-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

ui/base/accelerators/mojo/accelerator.typemap → ui/base/accelerators/mojom/accelerator.typemap

@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-mojom = "//ui/base/accelerators/mojo/accelerator.mojom"
+mojom = "//ui/base/accelerators/mojom/accelerator.mojom"
 public_headers = [ "//ui/base/accelerators/accelerator.h" ]
-traits_headers = [ "//ui/base/accelerators/mojo/accelerator_struct_traits.h" ]
+traits_headers = [ "//ui/base/accelerators/mojom/accelerator_mojom_traits.h" ]
 deps = [
-  "//ui/base/accelerators/mojo:struct_traits",
+  "//ui/base/accelerators/mojom:mojom_traits",
 ]
 type_mappings = [
   "ui.mojom.Accelerator=ui::Accelerator",

ui/base/accelerators/mojo/accelerator_struct_traits.h → ui/base/accelerators/mojom/accelerator_mojom_traits.h

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_BASE_ACCELERATORS_MOJO_ACCELERATOR_STRUCT_TRAITS_H_
-#define UI_BASE_ACCELERATORS_MOJO_ACCELERATOR_STRUCT_TRAITS_H_
+#ifndef UI_BASE_ACCELERATORS_MOJOM_ACCELERATOR_MOJOM_TRAITS_H_
+#define UI_BASE_ACCELERATORS_MOJOM_ACCELERATOR_MOJOM_TRAITS_H_
 
 #include "mojo/public/cpp/base/time_mojom_traits.h"
 #include "ui/base/accelerators/accelerator.h"
-#include "ui/base/accelerators/mojo/accelerator.mojom-shared.h"
+#include "ui/base/accelerators/mojom/accelerator.mojom-shared.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 namespace mojo {
@@ -68,4 +68,4 @@ struct StructTraits<ui::mojom::AcceleratorDataView, ui::Accelerator> {
 
 }  // namespace mojo
 
-#endif  // UI_BASE_ACCELERATORS_MOJO_ACCELERATOR_STRUCT_TRAITS_H_
+#endif  // UI_BASE_ACCELERATORS_MOJOM_ACCELERATOR_MOJOM_TRAITS_H_

ui/base/accelerators/mojo/accelerator_struct_traits_unittest.cc → ui/base/accelerators/mojom/accelerator_mojom_traits_unittest.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/base/accelerators/mojo/accelerator_struct_traits.h"
+#include "ui/base/accelerators/mojom/accelerator_mojom_traits.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/accelerators/accelerator.h"
-#include "ui/base/accelerators/mojo/accelerator.mojom.h"
+#include "ui/base/accelerators/mojom/accelerator.mojom.h"
 #include "ui/events/event_constants.h"
 
 namespace ui {

ui/base/accelerators/mojo/typemaps.gni → ui/base/accelerators/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/accelerators/mojo/accelerator.typemap" ]
+typemaps = [ "//ui/base/accelerators/mojom/accelerator.typemap" ]