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

Unified Diff: ash/accelerators/accelerator_controller_unittest.cc

Issue 10134036: Let Chrome app handle Ash accelerators first if the app is launched as a window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 8 years, 8 months 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
Index: ash/accelerators/accelerator_controller_unittest.cc
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
index 22d1465b6a06e99bdbc4269aca894f5f545ae338..3820b034d295cd91e8d73d8b8782b29870451ba9 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -349,6 +349,18 @@ TEST_F(AcceleratorControllerTest, UnregisterAll) {
EXPECT_EQ(1, target2.accelerator_pressed_count());
}
+TEST_F(AcceleratorControllerTest, IsAccelerator) {
+ const ui::Accelerator accelerator_a(ui::VKEY_A, false, false, false);
+ const ui::Accelerator accelerator_shift_a(ui::VKEY_A, true, false, false);
+ TestTarget target;
+ GetController()->Register(accelerator_a, &target);
+
+ EXPECT_TRUE(GetController()->IsAccelerator(accelerator_a));
+ EXPECT_FALSE(GetController()->IsAccelerator(accelerator_shift_a));
+ GetController()->UnregisterAll(&target);
+ EXPECT_FALSE(GetController()->IsAccelerator(accelerator_a));
+}
+
TEST_F(AcceleratorControllerTest, Process) {
const ui::Accelerator accelerator_a(ui::VKEY_A, false, false, false);
TestTarget target1;

Powered by Google App Engine
This is Rietveld 408576698