| Index: ash/accelerators/accelerator_controller_unittest.cc
|
| diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
|
| index c5206dadf76334d8f90930434e5ba99d6ff2a79c..0031e4f74ef4fe5a0ecc3d8239355e942baa1cab 100644
|
| --- a/ash/accelerators/accelerator_controller_unittest.cc
|
| +++ b/ash/accelerators/accelerator_controller_unittest.cc
|
| @@ -979,7 +979,7 @@ class ToggleCapsLockTest : public AcceleratorControllerTest {
|
| DISALLOW_COPY_AND_ASSIGN(ToggleCapsLockTest);
|
| };
|
|
|
| -// Tests the four combinations of the TOGGLE_CAPS_LOCK accelerator.
|
| +// Tests the five combinations of the TOGGLE_CAPS_LOCK accelerator.
|
| TEST_F(ToggleCapsLockTest, ToggleCapsLockAccelerators) {
|
| chromeos::input_method::InputMethodManager* input_method_manager =
|
| chromeos::input_method::InputMethodManager::Get();
|
| @@ -1019,6 +1019,16 @@ TEST_F(ToggleCapsLockTest, ToggleCapsLockAccelerators) {
|
| EXPECT_FALSE(ProcessInController(press_search_then_alt));
|
| EXPECT_TRUE(ProcessInController(release_alt_before_search));
|
| EXPECT_TRUE(input_method_manager->GetImeKeyboard()->CapsLockIsEnabled());
|
| + input_method_manager->GetImeKeyboard()->SetCapsLockEnabled(false);
|
| +
|
| + // 5. Press Caps Lock, Release Caps Lock.
|
| + const ui::Accelerator press_caps_lock(ui::VKEY_CAPITAL, ui::EF_NONE);
|
| + EXPECT_FALSE(ProcessInController(press_caps_lock));
|
| + EXPECT_FALSE(input_method_manager->GetImeKeyboard()->CapsLockIsEnabled());
|
| + const ui::Accelerator release_caps_lock(
|
| + CreateReleaseAccelerator(ui::VKEY_CAPITAL, ui::EF_NONE));
|
| + EXPECT_TRUE(ProcessInController(release_caps_lock));
|
| + EXPECT_TRUE(input_method_manager->GetImeKeyboard()->CapsLockIsEnabled());
|
| }
|
|
|
| class PreferredReservedAcceleratorsTest : public test::AshTestBase {
|
|
|