Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2478)

Unified Diff: ash/accelerators/accelerator_controller.cc

Issue 232333002: ozone: Rename XKeyboard to KeyboardController & use fake under ozone (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rename to ImeKeyboard & rebase Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/system/chromeos/tray_caps_lock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_controller.cc
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 17b260e85bba4547bcf40e01532f97c0f52b2d6f..18f95e6e97c72110eadd472562e3e49af2ccb20a 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -73,8 +73,8 @@
#include "ash/session_state_delegate.h"
#include "ash/system/chromeos/keyboard_brightness_controller.h"
#include "base/sys_info.h"
+#include "chromeos/ime/ime_keyboard.h"
#include "chromeos/ime/input_method_manager.h"
-#include "chromeos/ime/xkeyboard.h"
#endif // defined(OS_CHROMEOS)
namespace ash {
@@ -644,10 +644,10 @@ 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;
- if (xkeyboard && xkeyboard->CapsLockIsEnabled()) {
- xkeyboard->SetCapsLockEnabled(false);
+ chromeos::input_method::ImeKeyboard* keyboard =
+ ime ? ime->GetImeKeyboard() : NULL;
+ if (keyboard && keyboard->CapsLockIsEnabled()) {
+ keyboard->SetCapsLockEnabled(false);
return true;
}
return false;
@@ -668,10 +668,10 @@ 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;
- if (xkeyboard)
- xkeyboard->SetCapsLockEnabled(!xkeyboard->CapsLockIsEnabled());
+ chromeos::input_method::ImeKeyboard* keyboard =
+ ime ? ime->GetImeKeyboard() : NULL;
+ if (keyboard)
+ keyboard->SetCapsLockEnabled(!keyboard->CapsLockIsEnabled());
return true;
}
« no previous file with comments | « no previous file | ash/system/chromeos/tray_caps_lock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698