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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 784823002: Pass through the CONVERT/NONCONVERT/HANKAKU_ZENKAKU keys. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
« chrome/browser/chromeos/input_method/input_method_manager_impl.cc ('K') | « chrome/browser/chromeos/input_method/input_method_manager_impl.cc ('k') | no next file » | 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_impl_unittest.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc
index e77412dfd418c0ed3d26bdea315d227ca7357b8e..f1e25c1289dfd474fa50c2b9be65a048d15f04ae 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc
@@ -1082,7 +1082,7 @@ TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithJpLayout) {
EXPECT_EQ(ImeIdFromEngineId("xkb:us::eng"),
manager_->GetActiveIMEState()->GetCurrentInputMethod().id());
EXPECT_EQ("us", keyboard_->last_layout_);
- EXPECT_TRUE(manager_->GetActiveIMEState()->SwitchInputMethod(
+ EXPECT_FALSE(manager_->GetActiveIMEState()->SwitchInputMethod(
ui::Accelerator(ui::VKEY_NONCONVERT, ui::EF_NONE)));
EXPECT_EQ(ImeIdFromEngineId("xkb:jp::jpn"),
manager_->GetActiveIMEState()->GetCurrentInputMethod().id());
@@ -1094,7 +1094,7 @@ TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithJpLayout) {
EXPECT_EQ(ImeIdFromEngineId("xkb:us::eng"),
manager_->GetActiveIMEState()->GetCurrentInputMethod().id());
EXPECT_EQ("us", keyboard_->last_layout_);
- EXPECT_TRUE(manager_->GetActiveIMEState()->SwitchInputMethod(
+ EXPECT_FALSE(manager_->GetActiveIMEState()->SwitchInputMethod(
ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE)));
EXPECT_EQ(ImeIdFromEngineId("xkb:jp::jpn"),
manager_->GetActiveIMEState()->GetCurrentInputMethod().id());
@@ -1106,7 +1106,7 @@ TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithJpLayout) {
EXPECT_EQ(ImeIdFromEngineId("xkb:us::eng"),
manager_->GetActiveIMEState()->GetCurrentInputMethod().id());
EXPECT_EQ("us", keyboard_->last_layout_);
- EXPECT_TRUE(manager_->GetActiveIMEState()->SwitchInputMethod(
+ EXPECT_FALSE(manager_->GetActiveIMEState()->SwitchInputMethod(
ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE)));
EXPECT_EQ(ImeIdFromEngineId("xkb:jp::jpn"),
manager_->GetActiveIMEState()->GetCurrentInputMethod().id());
@@ -1123,32 +1123,32 @@ TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithJpIme) {
EXPECT_EQ(ImeIdFromEngineId("xkb:jp::jpn"),
manager_->GetActiveIMEState()->GetCurrentInputMethod().id());
EXPECT_EQ("jp", keyboard_->last_layout_);
- EXPECT_TRUE(manager_->GetActiveIMEState()->SwitchInputMethod(
+ EXPECT_FALSE(manager_->GetActiveIMEState()->SwitchInputMethod(
ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE)));
EXPECT_EQ(ImeIdFromEngineId(kNaclMozcJpId),
manager_->GetActiveIMEState()->GetCurrentInputMethod().id());
EXPECT_EQ("jp", keyboard_->last_layout_);
- EXPECT_TRUE(manager_->GetActiveIMEState()->SwitchInputMethod(
+ EXPECT_FALSE(manager_->GetActiveIMEState()->SwitchInputMethod(
ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE)));
EXPECT_EQ(ImeIdFromEngineId("xkb:jp::jpn"),
manager_->GetActiveIMEState()->GetCurrentInputMethod().id());
EXPECT_EQ("jp", keyboard_->last_layout_);
- EXPECT_TRUE(manager_->GetActiveIMEState()->SwitchInputMethod(
+ EXPECT_FALSE(manager_->GetActiveIMEState()->SwitchInputMethod(
ui::Accelerator(ui::VKEY_CONVERT, ui::EF_NONE)));
EXPECT_EQ(ImeIdFromEngineId(kNaclMozcJpId),
manager_->GetActiveIMEState()->GetCurrentInputMethod().id());
EXPECT_EQ("jp", keyboard_->last_layout_);
- EXPECT_TRUE(manager_->GetActiveIMEState()->SwitchInputMethod(
+ EXPECT_FALSE(manager_->GetActiveIMEState()->SwitchInputMethod(
ui::Accelerator(ui::VKEY_CONVERT, ui::EF_NONE)));
EXPECT_EQ(ImeIdFromEngineId(kNaclMozcJpId),
manager_->GetActiveIMEState()->GetCurrentInputMethod().id());
EXPECT_EQ("jp", keyboard_->last_layout_);
- EXPECT_TRUE(manager_->GetActiveIMEState()->SwitchInputMethod(
+ EXPECT_FALSE(manager_->GetActiveIMEState()->SwitchInputMethod(
ui::Accelerator(ui::VKEY_NONCONVERT, ui::EF_NONE)));
EXPECT_EQ(ImeIdFromEngineId("xkb:jp::jpn"),
manager_->GetActiveIMEState()->GetCurrentInputMethod().id());
EXPECT_EQ("jp", keyboard_->last_layout_);
- EXPECT_TRUE(manager_->GetActiveIMEState()->SwitchInputMethod(
+ EXPECT_FALSE(manager_->GetActiveIMEState()->SwitchInputMethod(
ui::Accelerator(ui::VKEY_NONCONVERT, ui::EF_NONE)));
EXPECT_EQ(ImeIdFromEngineId("xkb:jp::jpn"),
manager_->GetActiveIMEState()->GetCurrentInputMethod().id());
@@ -1160,12 +1160,12 @@ TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithJpIme) {
EXPECT_EQ(ImeIdFromEngineId("xkb:jp::jpn"),
manager_->GetActiveIMEState()->GetCurrentInputMethod().id());
EXPECT_EQ("jp", keyboard_->last_layout_);
- EXPECT_TRUE(manager_->GetActiveIMEState()->SwitchInputMethod(
+ EXPECT_FALSE(manager_->GetActiveIMEState()->SwitchInputMethod(
ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE)));
EXPECT_EQ(ImeIdFromEngineId(kNaclMozcJpId),
manager_->GetActiveIMEState()->GetCurrentInputMethod().id());
EXPECT_EQ("jp", keyboard_->last_layout_);
- EXPECT_TRUE(manager_->GetActiveIMEState()->SwitchInputMethod(
+ EXPECT_FALSE(manager_->GetActiveIMEState()->SwitchInputMethod(
ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE)));
EXPECT_EQ(ImeIdFromEngineId("xkb:jp::jpn"),
manager_->GetActiveIMEState()->GetCurrentInputMethod().id());
« chrome/browser/chromeos/input_method/input_method_manager_impl.cc ('K') | « chrome/browser/chromeos/input_method/input_method_manager_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698