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

Unified Diff: ui/base/ime/mock_input_method.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/input_method_chromeos_unittest.cc ('k') | ui/base/ime/text_input_focus_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/mock_input_method.cc
diff --git a/ui/base/ime/mock_input_method.cc b/ui/base/ime/mock_input_method.cc
index 6a93643ba7cea77029e42ada64d58fdd9c171856..046942ab3c3a73e931dca68a9e901fea163824f7 100644
--- a/ui/base/ime/mock_input_method.cc
+++ b/ui/base/ime/mock_input_method.cc
@@ -5,8 +5,6 @@
#include "ui/base/ime/mock_input_method.h"
#include "ui/base/ime/input_method_delegate.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 {
@@ -25,9 +23,6 @@ void MockInputMethod::SetDelegate(internal::InputMethodDelegate* delegate) {
}
void MockInputMethod::SetFocusedTextInputClient(TextInputClient* client) {
- if (switches::IsTextInputFocusManagerEnabled())
- return;
-
if (text_input_client_ == client)
return;
text_input_client_ = client;
@@ -42,9 +37,6 @@ void MockInputMethod::DetachTextInputClient(TextInputClient* client) {
}
TextInputClient* MockInputMethod::GetTextInputClient() const {
- if (switches::IsTextInputFocusManagerEnabled())
- return TextInputFocusManager::GetInstance()->GetFocusedTextInputClient();
-
return text_input_client_;
}
« no previous file with comments | « ui/base/ime/input_method_chromeos_unittest.cc ('k') | ui/base/ime/text_input_focus_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698