Index: ash/accelerators/accelerator_controller_unittest.cc |
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc |
index 7012f4f33aa2bcffbfd6ba162e1444b2e2ffa1cb..f8668d22b405f458b9e6eb785c34ac42be80d152 100644 |
--- a/ash/accelerators/accelerator_controller_unittest.cc |
+++ b/ash/accelerators/accelerator_controller_unittest.cc |
@@ -631,11 +631,17 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) { |
// ToggleAppList |
{ |
EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility()); |
- EXPECT_TRUE(ProcessWithContext( |
+ // Pressing the search key should do nothing, since the Search key can be |
+ // used as a modifier for accessing extended keyboard shortcuts. |
+ EXPECT_FALSE(ProcessWithContext( |
ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE))); |
- EXPECT_TRUE(ash::Shell::GetInstance()->GetAppListTargetVisibility()); |
EXPECT_TRUE(ProcessWithContext( |
+ ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE))); |
+ EXPECT_TRUE(ash::Shell::GetInstance()->GetAppListTargetVisibility()); |
+ EXPECT_FALSE(ProcessWithContext( |
ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE))); |
+ EXPECT_TRUE(ProcessWithContext( |
+ ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE))); |
EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility()); |
} |
// ToggleAppList (with spoken feedback enabled) |
@@ -644,9 +650,13 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) { |
delegate->ToggleSpokenFeedback(); |
EXPECT_FALSE(ProcessWithContext( |
ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE))); |
+ EXPECT_FALSE(ProcessWithContext( |
+ ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE))); |
delegate->ToggleSpokenFeedback(); |
- EXPECT_TRUE(ProcessWithContext( |
+ EXPECT_FALSE(ProcessWithContext( |
ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE))); |
+ EXPECT_TRUE(ProcessWithContext( |
+ ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE))); |
} |
// DisableCapsLock |
{ |