ozone: evdev: Sync caps lock LED state to evdev

ui/events/ozone/evdev/input_controller_evdev.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 "ui/events/ozone/evdev/input_controller_evdev.h"
 
 #include <algorithm>
 #include <linux/input.h>
 
 #include "base/thread_task_runner_handle.h"
 #include "ui/events/ozone/evdev/input_device_factory_evdev_proxy.h"
 #include "ui/events/ozone/evdev/keyboard_evdev.h"
 #include "ui/events/ozone/evdev/mouse_button_map_evdev.h"
 
 namespace ui {
 
 InputControllerEvdev::InputControllerEvdev(KeyboardEvdev* keyboard,
                                            MouseButtonMapEvdev* button_map)
     : settings_update_pending_(false),
       input_device_factory_(nullptr),
       keyboard_(keyboard),
       button_map_(button_map),
       has_mouse_(false),
       has_touchpad_(false),
+      caps_lock_led_state_(false),
       weak_ptr_factory_(this) {
 }
 
 InputControllerEvdev::~InputControllerEvdev() {
 }
 
 void InputControllerEvdev::SetInputDeviceFactory(
     InputDeviceFactoryEvdevProxy* input_device_factory) {
   input_device_factory_ = input_device_factory;
 
   UpdateDeviceSettings();
+  UpdateCapsLockLed();
 }
 
 void InputControllerEvdev::set_has_mouse(bool has_mouse) {
   has_mouse_ = has_mouse;
 }
 
 void InputControllerEvdev::set_has_touchpad(bool has_touchpad) {
   has_touchpad_ = has_touchpad;
 }
 
 bool InputControllerEvdev::HasMouse() {
   return has_mouse_;
 }
 
 bool InputControllerEvdev::HasTouchpad() {
   return has_touchpad_;
 }
 
 bool InputControllerEvdev::IsCapsLockEnabled() {
   return keyboard_->IsCapsLockEnabled();
 }
 
 void InputControllerEvdev::SetCapsLockEnabled(bool enabled) {
   keyboard_->SetCapsLockEnabled(enabled);
+
+  if (input_device_factory_)

[kpschoedel, 2015/03/02 22:19:35]

This doesn't thrill me because the connection between input_device_factory_ and
the LED isn't explicit here. Could the test be done below instead?

[spang, 2015/03/02 22:43:15]

Done.

+    UpdateCapsLockLed();
 }
 
 void InputControllerEvdev::SetNumLockEnabled(bool enabled) {
   NOTIMPLEMENTED();
 }
 
 bool InputControllerEvdev::IsAutoRepeatEnabled() {
   return keyboard_->IsAutoRepeatEnabled();
 }
 
@@ skipping 101 matching lines @@
       FROM_HERE, base::Bind(&InputControllerEvdev::UpdateDeviceSettings,
                             weak_ptr_factory_.GetWeakPtr()));
   settings_update_pending_ = true;
 }
 
 void InputControllerEvdev::UpdateDeviceSettings() {
   input_device_factory_->UpdateInputDeviceSettings(input_device_settings_);
   settings_update_pending_ = false;
 }
 
+void InputControllerEvdev::UpdateCapsLockLed() {
+  bool caps_lock_state = IsCapsLockEnabled();
+  if (caps_lock_state != caps_lock_led_state_)
+    input_device_factory_->SetCapsLockLed(caps_lock_state);
+  caps_lock_led_state_ = caps_lock_state;
+}
+
 }  // namespace ui