| Index: ash/system/chromeos/tray_caps_lock.cc
|
| diff --git a/ash/system/chromeos/tray_caps_lock.cc b/ash/system/chromeos/tray_caps_lock.cc
|
| index 163634f6ef976d203bb3552c9bf67e9d6cd0d4c3..0bb837c9d1aaf9cf48eb26aea06f436e0bec625e 100644
|
| --- a/ash/system/chromeos/tray_caps_lock.cc
|
| +++ b/ash/system/chromeos/tray_caps_lock.cc
|
| @@ -11,7 +11,7 @@
|
| #include "ash/system/tray/system_tray_notifier.h"
|
| #include "ash/system/tray/tray_constants.h"
|
| #include "chromeos/ime/input_method_manager.h"
|
| -#include "chromeos/ime/xkeyboard.h"
|
| +#include "chromeos/ime/keyboard_controller.h"
|
| #include "grit/ash_resources.h"
|
| #include "grit/ash_strings.h"
|
| #include "ui/accessibility/ax_view_state.h"
|
| @@ -30,8 +30,9 @@ namespace {
|
| bool CapsLockIsEnabled() {
|
| chromeos::input_method::InputMethodManager* ime =
|
| chromeos::input_method::InputMethodManager::Get();
|
| - return (ime && ime->GetXKeyboard()) ? ime->GetXKeyboard()->CapsLockIsEnabled()
|
| - : false;
|
| + return (ime && ime->GetKeyboardController())
|
| + ? ime->GetKeyboardController()->CapsLockIsEnabled()
|
| + : false;
|
| }
|
|
|
| }
|
| @@ -109,8 +110,9 @@ class CapsLockDefaultView : public ActionableView {
|
|
|
| // Overridden from ActionableView:
|
| virtual bool PerformAction(const ui::Event& event) OVERRIDE {
|
| - chromeos::input_method::XKeyboard* xkeyboard =
|
| - chromeos::input_method::InputMethodManager::Get()->GetXKeyboard();
|
| + chromeos::input_method::KeyboardController* xkeyboard =
|
| + chromeos::input_method::InputMethodManager::Get()
|
| + ->GetKeyboardController();
|
| Shell::GetInstance()->metrics()->RecordUserMetricsAction(
|
| xkeyboard->CapsLockIsEnabled() ?
|
| ash::UMA_STATUS_AREA_CAPS_LOCK_DISABLED_BY_CLICK :
|
|
|