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

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

Issue 334573004: Fixes unittests with --enable-text-input-focus-manager flag enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed more unittests. Created 6 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/keyboard/keyboard_controller_unittest.cc » ('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 0aa2005cb1d893d26ee29a84796158cc911265f8..5ffc76fc1dc108d5e8e3d2d07322bde6bb8793c4 100644
--- a/ui/base/ime/mock_input_method.cc
+++ b/ui/base/ime/mock_input_method.cc
@@ -4,6 +4,9 @@
#include "ui/base/ime/mock_input_method.h"
+#include "ui/base/ime/text_input_focus_manager.h"
+#include "ui/base/ui_base_switches_util.h"
+
namespace ui {
MockInputMethod::MockInputMethod(internal::InputMethodDelegate* delegate)
@@ -17,6 +20,9 @@ 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;
@@ -31,6 +37,9 @@ 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/keyboard/keyboard_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698