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

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

Issue 419293002: IME refactoring: ChromeOS introduce input methods State. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests. Created 6 years, 4 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_browsertests.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc
index fe44b8447451e826542c33f6bf1a96314c659b2e..4e48705bd7593936e1d5e03edd3635bb70d58376 100644
--- a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc
+++ b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc
@@ -71,10 +71,12 @@ class InputMethodEngineBrowserTest
extension_ime_ids.push_back(kIdentityIMEID);
extension_ime_ids.push_back(kToUpperIMEID);
extension_ime_ids.push_back(kAPIArgumentIMEID);
- InputMethodManager::Get()->SetEnabledExtensionImes(&extension_ime_ids);
+ InputMethodManager::Get()->GetActiveIMEState()->SetEnabledExtensionImes(
+ &extension_ime_ids);
InputMethodDescriptors extension_imes;
- InputMethodManager::Get()->GetInputMethodExtensions(&extension_imes);
+ InputMethodManager::Get()->GetActiveIMEState()->GetInputMethodExtensions(
+ &extension_imes);
// Test IME has two input methods, thus InputMethodManager should have two
// extension IME.
@@ -145,7 +147,8 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineBrowserTest,
BasicScenarioTest) {
LoadTestInputMethod();
- InputMethodManager::Get()->ChangeInputMethod(kIdentityIMEID);
+ InputMethodManager::Get()->GetActiveIMEState()->ChangeInputMethod(
+ kIdentityIMEID, false /* show_message */);
scoped_ptr<MockIMEInputContextHandler> mock_input_context(
new MockIMEInputContextHandler());
@@ -225,7 +228,8 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineBrowserTest,
APIArgumentTest) {
LoadTestInputMethod();
- InputMethodManager::Get()->ChangeInputMethod(kAPIArgumentIMEID);
+ InputMethodManager::Get()->GetActiveIMEState()->ChangeInputMethod(
+ kAPIArgumentIMEID, false /* show_message */);
scoped_ptr<MockIMEInputContextHandler> mock_input_context(
new MockIMEInputContextHandler());

Powered by Google App Engine
This is Rietveld 408576698