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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 9696025: Rename InputMethodManager::current_input_method() to InputMethodManager::GetCurrentInputMethod(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 9 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 | « chrome/browser/chromeos/input_method/input_method_manager.cc ('k') | chrome/browser/chromeos/login/login_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/input_method/input_method_manager_browsertest.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_browsertest.cc b/chrome/browser/chromeos/input_method/input_method_manager_browsertest.cc
index a5cb7b74aa5e481ef9774b7bfee98234f1944a8a..8c1b3d57608737e757f2a933ba8ab05cc7d51d74 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_browsertest.cc
+++ b/chrome/browser/chromeos/input_method/input_method_manager_browsertest.cc
@@ -42,99 +42,99 @@ IN_PROC_BROWSER_TEST_F(InputMethodManagerTest, TestEnableInputMethods) {
IN_PROC_BROWSER_TEST_F(InputMethodManagerTest, TestNextInputMethod) {
manager_->EnableInputMethods("en-US", kKeyboardLayoutsOnly, "xkb:us::eng");
EXPECT_EQ(5U, manager_->GetNumActiveInputMethods());
- EXPECT_EQ("xkb:us::eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
manager_->SwitchToNextInputMethod();
- EXPECT_EQ("xkb:us:intl:eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us:intl:eng", manager_->GetCurrentInputMethod().id());
manager_->SwitchToNextInputMethod();
- EXPECT_EQ("xkb:us:altgr-intl:eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us:altgr-intl:eng", manager_->GetCurrentInputMethod().id());
manager_->SwitchToNextInputMethod();
- EXPECT_EQ("xkb:us:dvorak:eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us:dvorak:eng", manager_->GetCurrentInputMethod().id());
manager_->SwitchToNextInputMethod();
- EXPECT_EQ("xkb:us:colemak:eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us:colemak:eng", manager_->GetCurrentInputMethod().id());
manager_->SwitchToNextInputMethod();
- EXPECT_EQ("xkb:us::eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
}
IN_PROC_BROWSER_TEST_F(InputMethodManagerTest, TestPreviousInputMethod) {
manager_->EnableInputMethods("en-US", kKeyboardLayoutsOnly, "xkb:us::eng");
EXPECT_EQ(5U, manager_->GetNumActiveInputMethods());
- EXPECT_EQ("xkb:us::eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
manager_->SwitchToNextInputMethod();
- EXPECT_EQ("xkb:us:intl:eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us:intl:eng", manager_->GetCurrentInputMethod().id());
manager_->SwitchToPreviousInputMethod();
- EXPECT_EQ("xkb:us::eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
manager_->SwitchToPreviousInputMethod();
- EXPECT_EQ("xkb:us:intl:eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us:intl:eng", manager_->GetCurrentInputMethod().id());
manager_->SwitchToPreviousInputMethod();
- EXPECT_EQ("xkb:us::eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
manager_->SwitchToNextInputMethod();
- EXPECT_EQ("xkb:us:intl:eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us:intl:eng", manager_->GetCurrentInputMethod().id());
manager_->SwitchToNextInputMethod();
- EXPECT_EQ("xkb:us:altgr-intl:eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us:altgr-intl:eng", manager_->GetCurrentInputMethod().id());
manager_->SwitchToPreviousInputMethod();
- EXPECT_EQ("xkb:us:intl:eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us:intl:eng", manager_->GetCurrentInputMethod().id());
manager_->SwitchToPreviousInputMethod();
- EXPECT_EQ("xkb:us:altgr-intl:eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us:altgr-intl:eng", manager_->GetCurrentInputMethod().id());
}
IN_PROC_BROWSER_TEST_F(InputMethodManagerTest, TestSwitchInputMethod) {
manager_->EnableInputMethods("en-US", kKeyboardLayoutsOnly, "xkb:us::eng");
EXPECT_EQ(5U, manager_->GetNumActiveInputMethods());
- EXPECT_EQ("xkb:us::eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
// Henkan, Muhenkan, ZenkakuHankaku should be ignored when no Japanese IMEs
// and keyboards are enabled.
EXPECT_FALSE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_CONVERT, false, false, false)));
- EXPECT_EQ("xkb:us::eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
EXPECT_FALSE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_NONCONVERT, false, false, false)));
- EXPECT_EQ("xkb:us::eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
EXPECT_FALSE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, false, false, false)));
- EXPECT_EQ("xkb:us::eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
EXPECT_FALSE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, false, false, false)));
- EXPECT_EQ("xkb:us::eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
// Do the same tests for Korean.
EXPECT_FALSE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_HANGUL, false, false, false)));
- EXPECT_EQ("xkb:us::eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
EXPECT_FALSE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_SPACE, true, false, false)));
- EXPECT_EQ("xkb:us::eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
// Enable "xkb:jp::jpn" and press Muhenkan/ZenkakuHankaku.
manager_->EnableInputMethods("ja", kKeyboardLayoutsOnly, "xkb:us::eng");
EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
- EXPECT_EQ("xkb:us::eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
EXPECT_TRUE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_NONCONVERT, false, false, false)));
- EXPECT_EQ("xkb:jp::jpn", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id());
manager_->SwitchToPreviousInputMethod();
- EXPECT_EQ("xkb:us::eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
EXPECT_TRUE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, false, false, false)));
- EXPECT_EQ("xkb:jp::jpn", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id());
manager_->SwitchToPreviousInputMethod();
- EXPECT_EQ("xkb:us::eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
EXPECT_TRUE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, false, false, false)));
- EXPECT_EQ("xkb:jp::jpn", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id());
// Do the same tests for Korean.
manager_->EnableInputMethods("ko", kKeyboardLayoutsOnly, "xkb:us::eng");
EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
- EXPECT_EQ("xkb:us::eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
EXPECT_TRUE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_HANGUL, false, false, false)));
- EXPECT_EQ("xkb:kr:kr104:kor", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:kr:kr104:kor", manager_->GetCurrentInputMethod().id());
manager_->SwitchToPreviousInputMethod();
- EXPECT_EQ("xkb:us::eng", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
EXPECT_TRUE(manager_->SwitchInputMethod(
ui::Accelerator(ui::VKEY_SPACE, true, false, false)));
- EXPECT_EQ("xkb:kr:kr104:kor", manager_->current_input_method().id());
+ EXPECT_EQ("xkb:kr:kr104:kor", manager_->GetCurrentInputMethod().id());
}
} // namespace input_method
« no previous file with comments | « chrome/browser/chromeos/input_method/input_method_manager.cc ('k') | chrome/browser/chromeos/login/login_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698