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

Unified Diff: chrome/browser/chromeos/input_method/input_method_manager_impl.cc

Issue 10829065: Remove InputMethodManager::EnableHotkeys() and DisableHotkeys(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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
Index: chrome/browser/chromeos/input_method/input_method_manager_impl.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
index 7f6d37d081eeb65f3afc239a20c35093fc6227c0..dab12cadd0892d35687a199942f56bf7f018fac6 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
@@ -32,8 +32,7 @@ bool Contains(const std::vector<std::string>& container,
} // namespace
InputMethodManagerImpl::InputMethodManagerImpl()
- : ignore_hotkeys_(false),
- state_(STATE_LOGIN_SCREEN),
+ : state_(STATE_LOGIN_SCREEN),
util_(GetSupportedInputMethods()) {
}
@@ -341,18 +340,7 @@ void InputMethodManagerImpl::RemoveInputMethodExtension(const std::string& id) {
ChangeInputMethod(current_input_method_.id());
}
-void InputMethodManagerImpl::EnableHotkeys() {
- ignore_hotkeys_ = false;
-}
-
-void InputMethodManagerImpl::DisableHotkeys() {
- ignore_hotkeys_ = true;
-}
-
bool InputMethodManagerImpl::SwitchToNextInputMethod() {
- if (ignore_hotkeys_)
- return false;
-
// Sanity checks.
if (active_input_method_ids_.empty()) {
DVLOG(1) << "active input method is empty";
@@ -370,9 +358,6 @@ bool InputMethodManagerImpl::SwitchToNextInputMethod() {
}
bool InputMethodManagerImpl::SwitchToPreviousInputMethod() {
- if (ignore_hotkeys_)
- return false;
-
// Sanity check.
if (active_input_method_ids_.empty()) {
DVLOG(1) << "active input method is empty";
@@ -398,9 +383,6 @@ bool InputMethodManagerImpl::SwitchToPreviousInputMethod() {
bool InputMethodManagerImpl::SwitchInputMethod(
const ui::Accelerator& accelerator) {
- if (ignore_hotkeys_)
- return false;
-
// Sanity check.
if (active_input_method_ids_.empty()) {
DVLOG(1) << "active input method is empty";

Powered by Google App Engine
This is Rietveld 408576698