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

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

Issue 219503003: Make keyboard controller a singleton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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_engine.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_engine.cc b/chrome/browser/chromeos/input_method/input_method_engine.cc
index 775f5cecde1f52d389bd878935124fe11fe13bf1..8486238628e758fd32d87b4d4bfaef59d07dfc88 100644
--- a/chrome/browser/chromeos/input_method/input_method_engine.cc
+++ b/chrome/browser/chromeos/input_method/input_method_engine.cc
@@ -433,7 +433,7 @@ bool InputMethodEngine::DeleteSurroundingText(int context_id,
void InputMethodEngine::HideInputView() {
keyboard::KeyboardController* keyboard_controller =
- ash::Shell::GetInstance()->keyboard_controller();
+ keyboard::KeyboardController::GetInstance();
if (keyboard_controller) {
keyboard_controller->HideKeyboard(
keyboard::KeyboardController::HIDE_REASON_MANUAL);
@@ -492,7 +492,7 @@ void InputMethodEngine::Enable() {
keyboard::SetOverrideContentUrl(input_view_url_);
keyboard::KeyboardController* keyboard_controller =
- ash::Shell::GetInstance()->keyboard_controller();
+ keyboard::KeyboardController::GetInstance();
if (keyboard_controller)
keyboard_controller->Reload();
}
@@ -504,7 +504,7 @@ void InputMethodEngine::Disable() {
GURL empty_url;
keyboard::SetOverrideContentUrl(empty_url);
keyboard::KeyboardController* keyboard_controller =
- ash::Shell::GetInstance()->keyboard_controller();
+ keyboard::KeyboardController::GetInstance();
if (keyboard_controller)
keyboard_controller->Reload();
}

Powered by Google App Engine
This is Rietveld 408576698