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

Unified Diff: ui/base/ime/input_method_base.cc

Issue 1182523003: Removes TextInputFocusManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit per comment. 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
« no previous file with comments | « ui/base/ime/BUILD.gn ('k') | ui/base/ime/input_method_base_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/input_method_base.cc
diff --git a/ui/base/ime/input_method_base.cc b/ui/base/ime/input_method_base.cc
index b117a08d4d8fc0cb9687bf84cfc74b0d81cfdd73..dc856198b0ca3bc873b870fc677cf049360b9763 100644
--- a/ui/base/ime/input_method_base.cc
+++ b/ui/base/ime/input_method_base.cc
@@ -10,8 +10,6 @@
#include "ui/base/ime/input_method_delegate.h"
#include "ui/base/ime/input_method_observer.h"
#include "ui/base/ime/text_input_client.h"
-#include "ui/base/ime/text_input_focus_manager.h"
-#include "ui/base/ui_base_switches_util.h"
#include "ui/events/event.h"
namespace ui {
@@ -51,9 +49,6 @@ void InputMethodBase::DetachTextInputClient(TextInputClient* client) {
}
TextInputClient* InputMethodBase::GetTextInputClient() const {
- if (switches::IsTextInputFocusManagerEnabled())
- return TextInputFocusManager::GetInstance()->GetFocusedTextInputClient();
-
return system_toplevel_window_focused_ ? text_input_client_ : NULL;
}
@@ -132,9 +127,6 @@ void InputMethodBase::NotifyTextInputCaretBoundsChanged(
void InputMethodBase::SetFocusedTextInputClientInternal(
TextInputClient* client) {
- if (switches::IsTextInputFocusManagerEnabled())
- return;
-
TextInputClient* old = text_input_client_;
if (old == client)
return;
« no previous file with comments | « ui/base/ime/BUILD.gn ('k') | ui/base/ime/input_method_base_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698