Enable options to remap CapsLock whenever an external keyboard is connected.

chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc

Index: chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
index f6455dd1b03f71f8399bff576948281b8fe85fe6..23f4045003846083ef37dd1cee9de47cee034361 100644
--- a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
@@ -15,6 +15,8 @@
 #include "content/public/browser/web_ui.h"
 #include "ui/base/ime/chromeos/ime_keyboard.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/events/devices/device_data_manager.h"
+#include "ui/events/devices/keyboard_device.h"
 
 namespace {
 const struct ModifierKeysSelectItem {
@@ -42,15 +44,27 @@ const char* kDataValuesNames[] = {
   "remapCapsLockKeyToValue",
   "remapDiamondKeyToValue",
 };
+
+bool HasExternalKeyboard() {
+  for (const ui::KeyboardDevice& keyboard :
+       ui::DeviceDataManager::GetInstance()->keyboard_devices()) {
+    if (keyboard.type == ui::InputDeviceType::INPUT_DEVICE_EXTERNAL)
+      return true;
+  }
+
+  return false;
+}
 }  // namespace
 
 namespace chromeos {
 namespace options {
 
 KeyboardHandler::KeyboardHandler() {
+  ui::DeviceDataManager::GetInstance()->AddObserver(this);
 }
 
 KeyboardHandler::~KeyboardHandler() {
+  ui::DeviceDataManager::GetInstance()->RemoveObserver(this);
 }
 
 void KeyboardHandler::GetLocalizedValues(
@@ -131,20 +145,15 @@ void KeyboardHandler::GetLocalizedValues(
 }
 
 void KeyboardHandler::InitializePage() {
-  bool chromeos_keyboard = base::CommandLine::ForCurrentProcess()->HasSwitch(
-      chromeos::switches::kHasChromeOSKeyboard);

[Jun Mukai, 2015/06/15 23:57:25]

Do we need to keep this flag?
It looks like:
- defined in chromeos/chromeos_switches
- used only here
- referred in chrome/browser/chromeos/login/chrome_restart_request.cc, but it
looks like just copying the flag existence.
- chrome/browser/chromeos/events/event_rewriter_unittest.cc refers this flag,
but I'm not sure how this affects the test.


My bet is that this flag is almost deprecated, and you've removed the last
usage. If that's true, you can safely remove this flag itself.
You can remove the flag in another CL though.

[afakhry, 2015/06/16 00:52:47]

Yes I noticed that this flag is no longer used, but I wasn't sure if I should
remove it or if its removal should be part of this CL. I think I can remove it
in a follow-up CL as you suggested.

-  const base::FundamentalValue show_caps_lock_options(!chromeos_keyboard);
-
   bool has_diamond_key = base::CommandLine::ForCurrentProcess()->HasSwitch(
       chromeos::switches::kHasChromeOSDiamondKey);
   const base::FundamentalValue show_diamond_key_options(has_diamond_key);
 
   web_ui()->CallJavascriptFunction(
-      "options.KeyboardOverlay.showCapsLockOptions",
-      show_caps_lock_options);
-  web_ui()->CallJavascriptFunction(
       "options.KeyboardOverlay.showDiamondKeyOptions",
       show_diamond_key_options);
+
+  UpdateCapsLockOptions();
 }
 
 void KeyboardHandler::RegisterMessages() {
@@ -155,9 +164,20 @@ void KeyboardHandler::RegisterMessages() {
                  base::Unretained(this)));
 }
 
+void KeyboardHandler::OnKeyboardDeviceConfigurationChanged() {
+  UpdateCapsLockOptions();
+}
+
 void KeyboardHandler::HandleShowKeyboardShortcuts(const base::ListValue* args) {
   ash::Shell::GetInstance()->new_window_delegate()->ShowKeyboardOverlay();
 }
 
+void KeyboardHandler::UpdateCapsLockOptions() const {
+  const base::FundamentalValue show_caps_lock_options(HasExternalKeyboard());
+  web_ui()->CallJavascriptFunction(
+      "options.KeyboardOverlay.showCapsLockOptions",
+      show_caps_lock_options);
+}
+
 }  // namespace options
 }  // namespace chromeos