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

Unified Diff: ui/views/focus/focus_manager.cc

Issue 1177503003: Remove the 2-level input method system & InputMethodBridge. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reverted changes for MockInputMethod. Created 5 years, 6 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: ui/views/focus/focus_manager.cc
diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc
index 86acea3c79c837208580ea6e261e7a84a7a3840b..f3b8edfecd94b2d28aae564d5cf9385a7d80403b 100644
--- a/ui/views/focus/focus_manager.cc
+++ b/ui/views/focus/focus_manager.cc
@@ -460,7 +460,7 @@ void FocusManager::FocusTextInputClient(View* view) {
view ? view->GetTextInputClient() : NULL;
ui::TextInputFocusManager::GetInstance()->
FocusTextInputClient(text_input_client);
- ui::InputMethod* input_method = widget_->GetHostInputMethod();
+ ui::InputMethod* input_method = widget_->GetInputMethod();
if (input_method) {
input_method->OnTextInputTypeChanged(text_input_client);
input_method->OnCaretBoundsChanged(text_input_client);
@@ -475,7 +475,7 @@ void FocusManager::BlurTextInputClient(View* view) {
view ? view->GetTextInputClient() : NULL;
if (text_input_client && text_input_client->HasCompositionText()) {
text_input_client->ConfirmCompositionText();
- ui::InputMethod* input_method = widget_->GetHostInputMethod();
+ ui::InputMethod* input_method = widget_->GetInputMethod();
if (input_method && input_method->GetTextInputClient() == text_input_client)
input_method->CancelComposition(text_input_client);
}

Powered by Google App Engine
This is Rietveld 408576698