Rename ui/events/keycodes/dom[34]/ into .../dom/

The names dom3 and dom4 reflect obsolete documentation and no longer
denote anything useful.

R=wez
TBR=jam

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

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

12 files changed, 13 insertions, 13 deletions

diff --git a/remoting/client/DEPS b/remoting/client/DEPS
index 3eed1d8..81ac475 100644
--- a/remoting/client/DEPS
+++ b/remoting/client/DEPS
@@ -2,7 +2,7 @@ include_rules = [
   "+ppapi",
   "+jingle/glue",
   "+net",
-  "+ui/events/keycodes/dom4",
+  "+ui/events/keycodes/dom",
 
   "+remoting/codec",
   "+remoting/protocol",
diff --git a/remoting/client/plugin/BUILD.gn b/remoting/client/plugin/BUILD.gn
index 9fb1fe7..c0a21f9 100644
--- a/remoting/client/plugin/BUILD.gn
+++ b/remoting/client/plugin/BUILD.gn
@@ -37,7 +37,7 @@ source_set("plugin") {
     "//remoting/codec",
     "//remoting/protocol",
     "//third_party/webrtc/modules/desktop_capture",
-    "//ui/events:dom4_keycode_converter",
+    "//ui/events:dom_keycode_converter",
   ]
 }
 
diff --git a/remoting/client/plugin/pepper_input_handler.cc b/remoting/client/plugin/pepper_input_handler.cc
index e4bbac2..fda6a02 100644
--- a/remoting/client/plugin/pepper_input_handler.cc
+++ b/remoting/client/plugin/pepper_input_handler.cc
@@ -15,7 +15,7 @@
 #include "remoting/proto/event.pb.h"
 #include "remoting/protocol/input_event_tracker.h"
 #include "remoting/protocol/input_stub.h"
-#include "ui/events/keycodes/dom4/keycode_converter.h"
+#include "ui/events/keycodes/dom/keycode_converter.h"
 
 namespace remoting {
 
diff --git a/remoting/host/BUILD.gn b/remoting/host/BUILD.gn
index 114f849..bbaefbc 100644
--- a/remoting/host/BUILD.gn
+++ b/remoting/host/BUILD.gn
@@ -49,7 +49,7 @@ if (is_mac) {  # TODO(GYP) Mac build of remoting host.
       "//remoting/protocol",
       "//remoting/resources",
       "//ui/events/platform",
-      "//ui/events:dom4_keycode_converter",
+      "//ui/events:dom_keycode_converter",
     ]
 
     if (enable_configuration_policy) {
diff --git a/remoting/host/input_injector_chromeos.cc b/remoting/host/input_injector_chromeos.cc
index 6e8e5fd..f4bb049 100644
--- a/remoting/host/input_injector_chromeos.cc
+++ b/remoting/host/input_injector_chromeos.cc
@@ -12,8 +12,8 @@
 #include "remoting/host/chromeos/point_transformer.h"
 #include "remoting/host/clipboard.h"
 #include "remoting/proto/internal.pb.h"
-#include "ui/events/keycodes/dom3/dom_code.h"
-#include "ui/events/keycodes/dom4/keycode_converter.h"
+#include "ui/events/keycodes/dom/dom_code.h"
+#include "ui/events/keycodes/dom/keycode_converter.h"
 #include "ui/ozone/public/input_controller.h"
 #include "ui/ozone/public/ozone_platform.h"
 #include "ui/ozone/public/system_input_injector.h"
diff --git a/remoting/host/input_injector_mac.cc b/remoting/host/input_injector_mac.cc
index fe6411b..b4885e3 100644
--- a/remoting/host/input_injector_mac.cc
+++ b/remoting/host/input_injector_mac.cc
@@ -21,7 +21,7 @@
 #include "remoting/protocol/message_decoder.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
 #include "third_party/webrtc/modules/desktop_capture/mac/desktop_configuration.h"
-#include "ui/events/keycodes/dom4/keycode_converter.h"
+#include "ui/events/keycodes/dom/keycode_converter.h"
 
 namespace remoting {
 
diff --git a/remoting/host/input_injector_win.cc b/remoting/host/input_injector_win.cc
index 58f694e..ed328d3 100644
--- a/remoting/host/input_injector_win.cc
+++ b/remoting/host/input_injector_win.cc
@@ -17,7 +17,7 @@
 #include "remoting/host/clipboard.h"
 #include "remoting/host/touch_injector_win.h"
 #include "remoting/proto/event.pb.h"
-#include "ui/events/keycodes/dom4/keycode_converter.h"
+#include "ui/events/keycodes/dom/keycode_converter.h"
 
 namespace remoting {
 
diff --git a/remoting/host/input_injector_x11.cc b/remoting/host/input_injector_x11.cc
index 8fc725b..e212cdd 100644
--- a/remoting/host/input_injector_x11.cc
+++ b/remoting/host/input_injector_x11.cc
@@ -25,7 +25,7 @@
 #include "remoting/host/linux/unicode_to_keysym.h"
 #include "remoting/proto/internal.pb.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
-#include "ui/events/keycodes/dom4/keycode_converter.h"
+#include "ui/events/keycodes/dom/keycode_converter.h"
 
 namespace remoting {
 
diff --git a/remoting/protocol/input_event_tracker.cc b/remoting/protocol/input_event_tracker.cc
index aca346b..53a816e 100644
--- a/remoting/protocol/input_event_tracker.cc
+++ b/remoting/protocol/input_event_tracker.cc
@@ -71,7 +71,7 @@ void InputEventTracker::ReleaseAllIfModifiersStuck(bool alt_expected,
                                                    bool ctrl_expected,
                                                    bool meta_expected,
                                                    bool shift_expected) {
-  // See src/ui/events/keycodes/dom4/keycode_converter_data.h for these values.
+  // See src/ui/events/keycodes/dom/keycode_converter_data.h for these values.
   bool alt_down =
       pressed_keys_.find(0x0700e2) != pressed_keys_.end() ||  // Left
       pressed_keys_.find(0x0700e6) != pressed_keys_.end();    // Right
diff --git a/remoting/remoting_client.gypi b/remoting/remoting_client.gypi
index 8a9c05d..e82139c 100644
--- a/remoting/remoting_client.gypi
+++ b/remoting/remoting_client.gypi
@@ -17,7 +17,7 @@
         '../ppapi/ppapi.gyp:ppapi_cpp_objects',
         '../ppapi/ppapi.gyp:ppapi_internal_module',
         '../third_party/webrtc/modules/modules.gyp:desktop_capture',
-        '../ui/events/events.gyp:dom4_keycode_converter',
+        '../ui/events/events.gyp:dom_keycode_converter',
         'remoting_base',
         'remoting_client',
         'remoting_protocol',
diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi
index b356167..79374ed 100644
--- a/remoting/remoting_host.gypi
+++ b/remoting/remoting_host.gypi
@@ -45,7 +45,7 @@
             '../crypto/crypto.gyp:crypto',
             '../google_apis/google_apis.gyp:google_apis',
             '../ipc/ipc.gyp:ipc',
-            '../ui/events/events.gyp:dom4_keycode_converter',
+            '../ui/events/events.gyp:dom_keycode_converter',
           ],
           'defines': [
             'HOST_BUNDLE_NAME="<(host_bundle_name)"',
diff --git a/remoting/remoting_nacl.gyp b/remoting/remoting_nacl.gyp
index b66a742..1e29858 100644
--- a/remoting/remoting_nacl.gyp
+++ b/remoting/remoting_nacl.gyp
@@ -113,7 +113,7 @@
         'remoting_webrtc_nacl',
       ],
       'sources': [
-        '../ui/events/keycodes/dom4/keycode_converter.cc',
+        '../ui/events/keycodes/dom/keycode_converter.cc',
         '<@(remoting_base_sources)',
         '<@(remoting_codec_sources)',
         '<@(remoting_client_plugin_sources)',