Use standard DOM code definitions instead of custom.

remoting/host/input_injector_x11.cc

 // Copyright (c) 2012 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 "remoting/host/input_injector.h"
 
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XTest.h>
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
 #undef Status  // Xlib.h #defines this, which breaks protobuf headers.
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversion_utils.h"
 #include "remoting/base/logging.h"
 #if defined(OS_CHROMEOS)
 #include "remoting/host/chromeos/point_transformer.h"
 #endif
 #include "remoting/host/clipboard.h"
 #include "remoting/host/linux/unicode_to_keysym.h"
 #include "remoting/proto/internal.pb.h"
-#include "remoting/protocol/usb_key_codes.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
+#include "ui/events/keycodes/dom/dom_code.h"
 #include "ui/events/keycodes/dom/keycode_converter.h"
 
 namespace remoting {
 
 namespace {
 
 using protocol::ClipboardEvent;
 using protocol::KeyEvent;
 using protocol::TextEvent;
 using protocol::MouseEvent;
@@ skipping 42 matching lines @@
   for (std::vector<uint32_t>::iterator it = keysyms.begin();
        it != keysyms.end(); ++it) {
     if (FindKeycodeForKeySym(display, *it, keycode, modifiers)) {
       return true;
     }
   }
 
   return false;
 }
 
-bool IsModifierKey(int usb_keycode) {
-  return usb_keycode == kUsbLeftControl ||
-         usb_keycode == kUsbLeftShift ||
-         usb_keycode == kUsbLeftAlt ||
-         usb_keycode == kUsbLeftOs ||
-         usb_keycode == kUsbRightControl ||
-         usb_keycode == kUsbRightShift ||
-         usb_keycode == kUsbRightAlt ||
-         usb_keycode == kUsbRightOs;
+bool IsModifierKey(ui::DomCode dom_code) {
+  return dom_code == ui::DomCode::CONTROL_LEFT ||
+         dom_code == ui::DomCode::SHIFT_LEFT ||
+         dom_code == ui::DomCode::ALT_LEFT ||
+         dom_code == ui::DomCode::OS_LEFT ||
+         dom_code == ui::DomCode::CONTROL_RIGHT ||
+         dom_code == ui::DomCode::SHIFT_RIGHT ||
+         dom_code == ui::DomCode::ALT_RIGHT ||
+         dom_code == ui::DomCode::OS_RIGHT;
 }
 
 // Pixel-to-wheel-ticks conversion ratio used by GTK.
 // From third_party/WebKit/Source/web/gtk/WebInputEventFactory.cpp .
 const float kWheelTicksPerPixel = 3.0f / 160.0f;
 
 // A class to generate events on X11.
 class InputInjectorX11 : public InputInjector {
  public:
   explicit InputInjectorX11(
@@ skipping 196 matching lines @@
   VLOG(3) << "Converting USB keycode: " << std::hex << event.usb_keycode()
           << " to keycode: " << keycode << std::dec;
 
   // Ignore events which can't be mapped.
   if (keycode == ui::KeycodeConverter::InvalidNativeKeycode())
     return;
 
   if (event.pressed()) {
     if (pressed_keys_.find(keycode) != pressed_keys_.end()) {
       // Ignore repeats for modifier keys.
-      if (IsModifierKey(event.usb_keycode()))
+      if (IsModifierKey(static_cast<ui::DomCode>(event.usb_keycode())))
         return;
       // Key is already held down, so lift the key up to ensure this repeated
       // press takes effect.
       XTestFakeKeyEvent(display_, keycode, False, CurrentTime);
     }
 
     if (pressed_keys_.empty()) {
       // Disable auto-repeat, if necessary, to avoid triggering auto-repeat
       // if network congestion delays the key-up event from the client.
       saved_auto_repeat_enabled_ = IsAutoRepeatEnabled();
@@ skipping 327 matching lines @@
     return nullptr;
   return injector.Pass();
 }
 
 // static
 bool InputInjector::SupportsTouchEvents() {
   return false;
 }
 
 }  // namespace remoting