| Index: ash/accelerators/accelerator_controller.cc
|
| diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
|
| index 9f1d226675c26e90bfdf82b44f12db760ca109a0..92546d810d44f6b5a78fecfe30876e7b224a7b48 100644
|
| --- a/ash/accelerators/accelerator_controller.cc
|
| +++ b/ash/accelerators/accelerator_controller.cc
|
| @@ -74,7 +74,7 @@
|
| #include "ash/system/chromeos/keyboard_brightness_controller.h"
|
| #include "base/sys_info.h"
|
| #include "chromeos/ime/input_method_manager.h"
|
| -#include "chromeos/ime/xkeyboard.h"
|
| +#include "chromeos/ime/keyboard_controller.h"
|
| #endif // defined(OS_CHROMEOS)
|
|
|
| namespace ash {
|
| @@ -644,8 +644,8 @@ bool HandleDisableCapsLock(ui::KeyboardCode key_code,
|
| base::RecordAction(UserMetricsAction("Accel_Disable_Caps_Lock"));
|
| chromeos::input_method::InputMethodManager* ime =
|
| chromeos::input_method::InputMethodManager::Get();
|
| - chromeos::input_method::XKeyboard* xkeyboard =
|
| - ime ? ime->GetXKeyboard() : NULL;
|
| + chromeos::input_method::KeyboardController* xkeyboard =
|
| + ime ? ime->GetKeyboardController() : NULL;
|
| if (xkeyboard && xkeyboard->CapsLockIsEnabled()) {
|
| xkeyboard->SetCapsLockEnabled(false);
|
| return true;
|
| @@ -668,8 +668,8 @@ bool HandleToggleCapsLock(ui::KeyboardCode key_code,
|
| base::RecordAction(UserMetricsAction("Accel_Toggle_Caps_Lock"));
|
| chromeos::input_method::InputMethodManager* ime =
|
| chromeos::input_method::InputMethodManager::Get();
|
| - chromeos::input_method::XKeyboard* xkeyboard =
|
| - ime ? ime->GetXKeyboard() : NULL;
|
| + chromeos::input_method::KeyboardController* xkeyboard =
|
| + ime ? ime->GetKeyboardController() : NULL;
|
| if (xkeyboard)
|
| xkeyboard->SetCapsLockEnabled(!xkeyboard->CapsLockIsEnabled());
|
| return true;
|
|
|