diff options
| author | nona <nona@chromium.org> | 2014-12-17 02:07:09 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-17 10:07:30 +0000 |
| commit | d8f38ca882019f984a6943dc9100e6f761b8520c (patch) | |
| tree | 4aa63474444b6eb28f49fbbc00d14bb0bde8265b /ash | |
| parent | c0540ab028e7dff62d6918b31cd4493270218422 (diff) | |
| download | chromium_src-d8f38ca882019f984a6943dc9100e6f761b8520c.zip chromium_src-d8f38ca882019f984a6943dc9100e6f761b8520c.tar.gz chromium_src-d8f38ca882019f984a6943dc9100e6f761b8520c.tar.bz2 | |
Revert "Pass through the CONVERT/NONCONVERT/HANKAKU_ZENKAKU keys."
I followed Windows's behavior but it does not make sense to Chrome OS and this
causes a regression: Zenkaku_Hankaku key on browser tab unexpectedly triggered
twice.
This reverts commit f5be2173f9794fdf121d80646740d6deced63c10.
BUG=438089
TEST=N/A
TBR=shuchen@chromium.org
TBR=pkotwicz@chromium.org
TBR=jamescook@chromium.org
Review URL: https://codereview.chromium.org/813683003
Cr-Commit-Position: refs/heads/master@{#308769}
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 7 | ||||
| -rw-r--r-- | ash/accelerators/accelerator_controller_unittest.cc | 10 |
2 files changed, 8 insertions, 9 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 3681dbf..c112ca9 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -1274,10 +1274,9 @@ void AcceleratorController::PerformAction(AcceleratorAction action, bool AcceleratorController::ShouldActionConsumeKeyEvent( AcceleratorAction action) { - if (action == NEXT_IME || action == SWITCH_IME) { - // NEXT_IME is bound to Alt-Shift key up event. SWITCH_IME is bound to - // HANKAKU_ZENKAKU, HENKAN, MUHENKAN keys. To be consistent with Windows - // behavior, do not consume the key event here. + if (action == NEXT_IME) { + // NEXT_IME is bound to Alt-Shift key up event. To be consistent with + // Windows behavior, do not consume the key event here. return false; } #if defined(OS_CHROMEOS) diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index 2d0ac17..f836eac 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc @@ -1054,15 +1054,15 @@ TEST_F(AcceleratorControllerTest, ImeGlobalAccelerators) { EXPECT_TRUE(ProcessInController(control_space_up)); EXPECT_EQ(1, delegate->handle_previous_ime_count()); EXPECT_EQ(0, delegate->handle_switch_ime_count()); - EXPECT_FALSE(ProcessInController(convert)); + EXPECT_TRUE(ProcessInController(convert)); EXPECT_EQ(1, delegate->handle_switch_ime_count()); - EXPECT_FALSE(ProcessInController(non_convert)); + EXPECT_TRUE(ProcessInController(non_convert)); EXPECT_EQ(2, delegate->handle_switch_ime_count()); - EXPECT_FALSE(ProcessInController(wide_half_1)); + EXPECT_TRUE(ProcessInController(wide_half_1)); EXPECT_EQ(3, delegate->handle_switch_ime_count()); - EXPECT_FALSE(ProcessInController(wide_half_2)); + EXPECT_TRUE(ProcessInController(wide_half_2)); EXPECT_EQ(4, delegate->handle_switch_ime_count()); - EXPECT_FALSE(ProcessInController(hangul)); + EXPECT_TRUE(ProcessInController(hangul)); EXPECT_EQ(5, delegate->handle_switch_ime_count()); } |