Use standard DOM code definitions instead of custom.

remoting/host/win/session_input_injector.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/win/session_input_injector.h"
 
 #include <set>
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/win/windows_version.h"
 #include "remoting/host/sas_injector.h"
 #include "remoting/proto/event.pb.h"
-#include "remoting/protocol/usb_key_codes.h"
 #include "third_party/webrtc/modules/desktop_capture/win/desktop.h"
 #include "third_party/webrtc/modules/desktop_capture/win/scoped_thread_desktop.h"
+#include "ui/events/keycodes/dom/dom_code.h"
 
 namespace {
 
-bool CheckCtrlAndAltArePressed(const std::set<uint32>& pressed_keys) {
-  size_t ctrl_keys = pressed_keys.count(kUsbLeftControl) +
-    pressed_keys.count(kUsbRightControl);
-  size_t alt_keys = pressed_keys.count(kUsbLeftAlt) +
-    pressed_keys.count(kUsbRightAlt);
+bool CheckCtrlAndAltArePressed(const std::set<ui::DomCode>& pressed_keys) {
+  size_t ctrl_keys = pressed_keys.count(ui::DomCode::CONTROL_LEFT) +
+                     pressed_keys.count(ui::DomCode::CONTROL_RIGHT);
+  size_t alt_keys = pressed_keys.count(ui::DomCode::ALT_LEFT) +
+                    pressed_keys.count(ui::DomCode::ALT_RIGHT);
   return ctrl_keys != 0 && alt_keys != 0 &&
     (ctrl_keys + alt_keys == pressed_keys.size());
 }
 
 } // namespace
 
 namespace remoting {
 
 using protocol::ClipboardEvent;
 using protocol::KeyEvent;
@@ skipping 40 matching lines @@
 
   webrtc::ScopedThreadDesktop desktop_;
 
   // Used to inject Secure Attention Sequence on Vista+.
   base::Closure inject_sas_;
 
   // Used to inject Secure Attention Sequence on XP.
   scoped_ptr<SasInjector> sas_injector_;
 
   // Keys currently pressed by the client, used to detect Ctrl-Alt-Del.
-  std::set<uint32> pressed_keys_;
+  std::set<ui::DomCode> pressed_keys_;
 
   DISALLOW_COPY_AND_ASSIGN(Core);
 };
 
 SessionInputInjectorWin::Core::Core(
     scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
     scoped_ptr<InputInjector> nested_executor,
     scoped_refptr<base::SingleThreadTaskRunner> inject_sas_task_runner,
     const base::Closure& inject_sas)
     : input_task_runner_(input_task_runner),
@@ skipping 29 matching lines @@
   if (!input_task_runner_->BelongsToCurrentThread()) {
     input_task_runner_->PostTask(
         FROM_HERE, base::Bind(&Core::InjectKeyEvent, this, event));
     return;
   }
 
   // HostEventDispatcher should drop events lacking the pressed field.
   DCHECK(event.has_pressed());
 
   if (event.has_usb_keycode()) {
+    ui::DomCode dom_code = static_cast<ui::DomCode>(event.usb_keycode());
     if (event.pressed()) {
       // Simulate secure attention sequence if Ctrl-Alt-Del was just pressed.
-      if (event.usb_keycode() == kUsbDelete &&
+      if (dom_code == ui::DomCode::DEL &&
           CheckCtrlAndAltArePressed(pressed_keys_)) {
         VLOG(3) << "Sending Secure Attention Sequence to the session";
 
         if (base::win::GetVersion() < base::win::VERSION_VISTA) {
           if (!sas_injector_)
             sas_injector_ = SasInjector::Create();
           if (!sas_injector_->InjectSas())
             LOG(ERROR) << "Failed to inject Secure Attention Sequence.";
         } else {
           inject_sas_task_runner_->PostTask(FROM_HERE, inject_sas_);
         }
       }
 
-      pressed_keys_.insert(event.usb_keycode());
+      pressed_keys_.insert(dom_code);
     } else {
-      pressed_keys_.erase(event.usb_keycode());
+      pressed_keys_.erase(dom_code);
     }
   }
 
   SwitchToInputDesktop();
   nested_executor_->InjectKeyEvent(event);
 }
 
 void SessionInputInjectorWin::Core::InjectTextEvent(const TextEvent& event) {
   if (!input_task_runner_->BelongsToCurrentThread()) {
     input_task_runner_->PostTask(
@@ skipping 77 matching lines @@
     const protocol::MouseEvent& event) {
   core_->InjectMouseEvent(event);
 }
 
 void SessionInputInjectorWin::InjectTouchEvent(
     const protocol::TouchEvent& event) {
   core_->InjectTouchEvent(event);
 }
 
 }  // namespace remoting