Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2345)

Unified Diff: ash/accelerators/accelerator_controller_unittest.cc

Issue 11580005: Don't fire Alt-Search binding when Alt-Search is being used for accessing a modifer key. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/accelerators/accelerator_table.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_controller_unittest.cc
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
index 1c5b9bb64e07474cbeaa85608333667cc51319ac..74f6ccb9a42d31d17e9079c9d0f0099ea1223d6c 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -710,11 +710,15 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
CapsLockDelegate* delegate = Shell::GetInstance()->caps_lock_delegate();
delegate->SetCapsLockEnabled(true);
EXPECT_TRUE(delegate->IsCapsLockEnabled());
- EXPECT_TRUE(ProcessWithContext(
+ EXPECT_FALSE(ProcessWithContext(
ui::Accelerator(ui::VKEY_LWIN, ui::EF_ALT_DOWN)));
- EXPECT_FALSE(delegate->IsCapsLockEnabled());
EXPECT_TRUE(ProcessWithContext(
+ ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_ALT_DOWN)));
+ EXPECT_FALSE(delegate->IsCapsLockEnabled());
+ EXPECT_FALSE(ProcessWithContext(
ui::Accelerator(ui::VKEY_LWIN, ui::EF_ALT_DOWN)));
+ EXPECT_TRUE(ProcessWithContext(
+ ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_ALT_DOWN)));
EXPECT_TRUE(delegate->IsCapsLockEnabled());
}
const ui::Accelerator volume_mute(ui::VKEY_VOLUME_MUTE, ui::EF_NONE);
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/accelerators/accelerator_table.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698