Remove duplicate Caps Lock handling

remoting/host/input_injector_chromeos.cc

 // Copyright 2014 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_chromeos.h"
 
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "remoting/host/chromeos/point_transformer.h"
 #include "remoting/host/clipboard.h"
 #include "remoting/proto/internal.pb.h"
+#include "ui/base/ime/chromeos/ime_keyboard.h"
+#include "ui/base/ime/chromeos/input_method_manager.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"
 
 namespace remoting {
 
 using protocol::ClipboardEvent;
 using protocol::KeyEvent;
 using protocol::MouseEvent;
 using protocol::TextEvent;
 using protocol::TouchEvent;
 
 namespace {
 
 ui::EventFlags MouseButtonToUIFlags(MouseEvent::MouseButton button) {
   switch (button) {
     case MouseEvent::BUTTON_LEFT:
       return ui::EF_LEFT_MOUSE_BUTTON;
     case MouseEvent::BUTTON_RIGHT:
       return ui::EF_RIGHT_MOUSE_BUTTON;
     case MouseEvent::BUTTON_MIDDLE:
       return ui::EF_MIDDLE_MOUSE_BUTTON;
     default:
       NOTREACHED();
       return ui::EF_NONE;
   }
 }
 
+bool shouldSetLockStates(ui::DomCode dom_code, bool key_pressed) {
+  if (!key_pressed)
+    return false;
+  switch (dom_code) {
+    // Ignores all the keys that could possibly be mapped to Caps Lock in event
+    // rewriter.

[rkjnsn, 2017/06/05 17:49:23]

Can you include a reference to where this list comes from?

[weidongg, 2017/06/05 20:06:57]

https://cs.chromium.org/chromium/src/ui/chromeos/events/event_rewriter_chrome...

+    case ui::DomCode::F16:
+    case ui::DomCode::CAPS_LOCK:
+    case ui::DomCode::META_LEFT:
+    case ui::DomCode::META_RIGHT:
+    case ui::DomCode::CONTROL_LEFT:
+    case ui::DomCode::CONTROL_RIGHT:
+    case ui::DomCode::ALT_LEFT:
+    case ui::DomCode::ALT_RIGHT:
+    case ui::DomCode::ESCAPE:
+    case ui::DomCode::BACKSPACE:
+      return false;
+    default:
+      return true;
+  }
+}
+
 }  // namespace
 
 // This class is run exclusively on the UI thread of the browser process.
 class InputInjectorChromeos::Core {
  public:
   Core();
 
   // Mirrors the public InputInjectorChromeos interface.
   void InjectClipboardEvent(const ClipboardEvent& event);
   void InjectKeyEvent(const KeyEvent& event);
@@ skipping 20 matching lines @@
 
 void InputInjectorChromeos::Core::InjectClipboardEvent(
     const ClipboardEvent& event) {
   clipboard_->InjectClipboardEvent(event);
 }
 
 void InputInjectorChromeos::Core::InjectKeyEvent(const KeyEvent& event) {
   DCHECK(event.has_pressed());
   DCHECK(event.has_usb_keycode());
 
-  if (event.has_lock_states()) {
-    SetLockStates(event.lock_states());
-  }
-
   ui::DomCode dom_code =
       ui::KeycodeConverter::UsbKeycodeToDomCode(event.usb_keycode());
 
+  if (event.has_lock_states() &&
+      shouldSetLockStates(dom_code, event.pressed())) {
+    SetLockStates(event.lock_states());
+  }
+
   // Ignore events which can't be mapped.
   if (dom_code != ui::DomCode::NONE) {
     delegate_->InjectKeyEvent(dom_code, event.pressed(),
                               true /* suppress_auto_repeat */);
   }
 }
 
 void InputInjectorChromeos::Core::InjectTextEvent(const TextEvent& event) {
   // Chrome OS only supports It2Me, which is not supported on mobile clients, so
   // we don't need to implement text events.
@@ skipping 19 matching lines @@
   delegate_ = ozone_platform->CreateSystemInputInjector();
   DCHECK(delegate_);
 
   // Implemented by remoting::ClipboardAura.
   clipboard_ = Clipboard::Create();
   clipboard_->Start(std::move(client_clipboard));
   point_transformer_.reset(new PointTransformer());
 }
 
 void InputInjectorChromeos::Core::SetLockStates(uint32_t states) {
-  ui::InputController* input_controller =
-      ui::OzonePlatform::GetInstance()->GetInputController();
-  input_controller->SetCapsLockEnabled(
+  chromeos::input_method::InputMethodManager* ime =
+      chromeos::input_method::InputMethodManager::Get();
+  ime->GetImeKeyboard()->SetCapsLockEnabled(
       states & protocol::KeyEvent::LOCK_STATES_CAPSLOCK);
 }
 
 InputInjectorChromeos::InputInjectorChromeos(
     scoped_refptr<base::SingleThreadTaskRunner> task_runner)
     : input_task_runner_(task_runner) {
   core_.reset(new Core());
 }
 
 InputInjectorChromeos::~InputInjectorChromeos() {
@@ skipping 43 matching lines @@
   // browser process.
   return base::WrapUnique(new InputInjectorChromeos(ui_task_runner));
 }
 
 // static
 bool InputInjector::SupportsTouchEvents() {
   return false;
 }
 
 }  // namespace remoting