Index: ash/accelerators/accelerator_controller_unittest.cc |
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc |
index fca81ff9cb343ddf3b3873c2253094dbfe056688..ad9170701f131e926c947c8379208eb38743f726 100644 |
--- a/ash/accelerators/accelerator_controller_unittest.cc |
+++ b/ash/accelerators/accelerator_controller_unittest.cc |
@@ -627,6 +627,21 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) { |
EXPECT_FALSE(GetController()->Process( |
ReleaseAccelerator(ui::VKEY_A, ui::EF_SHIFT_DOWN))); |
EXPECT_TRUE(delegate->IsCapsLockEnabled()); |
+ |
+ // Do not consume shift keyup when caps lock is off. |
+ delegate->SetCapsLockEnabled(false); |
+ EXPECT_FALSE(GetController()->Process( |
+ ui::Accelerator(ui::VKEY_LSHIFT, ui::EF_NONE))); |
+ EXPECT_FALSE(GetController()->Process( |
+ ReleaseAccelerator(ui::VKEY_LSHIFT, ui::EF_NONE))); |
+ EXPECT_FALSE(GetController()->Process( |
+ ui::Accelerator(ui::VKEY_RSHIFT, ui::EF_NONE))); |
+ EXPECT_FALSE(GetController()->Process( |
+ ReleaseAccelerator(ui::VKEY_RSHIFT, ui::EF_NONE))); |
+ EXPECT_FALSE(GetController()->Process( |
+ ui::Accelerator(ui::VKEY_SHIFT, ui::EF_NONE))); |
+ EXPECT_FALSE(GetController()->Process( |
+ ReleaseAccelerator(ui::VKEY_SHIFT, ui::EF_NONE))); |
} |
// ToggleCapsLock |
{ |