Reapply Caps Lock and Num Lock to core keyboard whenever new X input device is added

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 2ea3c8884c29f2c057765e76f010afb479650a2d..55799a706888caa919c38afc19e06ff753437870 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -15,9 +15,12 @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/session_manager_client.h"
+#include "chrome/browser/chromeos/input_method/input_method_manager.h"
+#include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/login/session_manager_observer.h"
 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h"
+#include "chrome/browser/chromeos/system/runtime_environment.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/common/chrome_switches.h"
@@ -164,4 +167,11 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() {
   // change notifier starts to monitor changes from the power manager and
   // the network manager.
   chromeos::CrosNetworkChangeNotifierFactory::GetInstance()->Init();
+
+  // For http://crosbug.com/p/5795 and http://crosbug.com/p/6245.
+  // Enable Num Lock on X start up.
+  if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) {
+    chromeos::input_method::InputMethodManager::GetInstance()->GetXKeyboard()->
+        SetNumLockEnabled(true);
+  }
 }