diff options
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 9 | ||||
| -rw-r--r-- | ash/accelerators/accelerator_controller_unittest.cc | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 6299b95..c16958d 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -393,8 +393,13 @@ bool AcceleratorController::AcceleratorPressed( oak::ShowOakWindow(); break; case NEXT_IME: - if (ime_control_delegate_.get()) - return ime_control_delegate_->HandleNextIme(); + if (ime_control_delegate_.get()) { + ime_control_delegate_->HandleNextIme(); + // We shouldn't consume Shift+Alt. crbug.com/123720 + // TODO(yusukes): We might be able to remove the hack when issue 123856 + // is fixed. + return false; + } break; case PREVIOUS_IME: if (ime_control_delegate_.get()) diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index 8ac8a14..7d88bdb 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc @@ -769,11 +769,11 @@ TEST_F(AcceleratorControllerTest, GlobalAcceleratorsPreIme) { EXPECT_EQ(0, delegate->handle_next_ime_count()); EXPECT_FALSE(GetController()->Process(shift_alt_press)); EXPECT_FALSE(GetController()->Process(shift_alt_press_post)); - EXPECT_TRUE(GetController()->Process(shift_alt)); + EXPECT_FALSE(GetController()->Process(shift_alt)); // crbug.com/123720 EXPECT_EQ(1, delegate->handle_next_ime_count()); EXPECT_FALSE(GetController()->Process(alt_shift_press)); EXPECT_FALSE(GetController()->Process(alt_shift_press_post)); - EXPECT_TRUE(GetController()->Process(alt_shift)); + EXPECT_FALSE(GetController()->Process(alt_shift)); // crbug.com/123720 EXPECT_EQ(2, delegate->handle_next_ime_count()); // We should NOT switch IME when e.g. Shift+Alt+X is pressed and X is |