| 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 4bbed214e167b856a58d868bf8c26590748da40b..d6fe4be41cbe49447e6fc0651066d95de1b26d44 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -88,7 +88,7 @@
|
| #include "chromeos/dbus/session_manager_client.h"
|
| #include "chromeos/disks/disk_mount_manager.h"
|
| #include "chromeos/ime/input_method_manager.h"
|
| -#include "chromeos/ime/xkeyboard.h"
|
| +#include "chromeos/ime/keyboard_controller.h"
|
| #include "chromeos/login/login_state.h"
|
| #include "chromeos/network/network_change_notifier_chromeos.h"
|
| #include "chromeos/network/network_change_notifier_factory_chromeos.h"
|
| @@ -288,7 +288,9 @@ class DBusServices {
|
|
|
| if (base::SysInfo::IsRunningOnChromeOS()) {
|
| // Disable Num Lock on X start up for http://crosbug.com/29169.
|
| - input_method::InputMethodManager::Get()->GetXKeyboard()->DisableNumLock();
|
| + input_method::InputMethodManager::Get()
|
| + ->GetKeyboardController()
|
| + ->DisableNumLock();
|
| }
|
|
|
| // Initialize the device settings service so that we'll take actions per
|
|
|