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

Unified Diff: ash/accelerators/accelerator_controller_unittest.cc

Issue 9309098: Handle F6 and F7 (brightness keys) in ash [part 3 of 3]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 10 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
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ui/base/keycodes/keyboard_code_conversion_x.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 78d731b16dea45864d8a04768719ab533c53e275..617b4ec118208dc59fe17c2b8744a6c86f2c4e62 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -531,6 +531,41 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
EXPECT_EQ(1, delegate->handle_brightness_up_count());
EXPECT_EQ(f7, delegate->last_accelerator());
}
+#if defined(OS_CHROMEOS)
+ // ui::VKEY_BRIGHTNESS_DOWN/UP are not defined on Windows.
+ const ui::Accelerator brightness_down(
+ ui::VKEY_BRIGHTNESS_DOWN, false, false, false);
+ const ui::Accelerator brightness_up(
+ ui::VKEY_BRIGHTNESS_UP, false, false, false);
+ {
+ DummyBrightnessControlDelegate* delegate =
+ new DummyBrightnessControlDelegate(false);
+ GetController()->SetBrightnessControlDelegate(
+ scoped_ptr<BrightnessControlDelegate>(delegate).Pass());
+ EXPECT_EQ(0, delegate->handle_brightness_down_count());
+ EXPECT_FALSE(GetController()->Process(brightness_down));
+ EXPECT_EQ(1, delegate->handle_brightness_down_count());
+ EXPECT_EQ(brightness_down, delegate->last_accelerator());
+ EXPECT_EQ(0, delegate->handle_brightness_up_count());
+ EXPECT_FALSE(GetController()->Process(brightness_up));
+ EXPECT_EQ(1, delegate->handle_brightness_up_count());
+ EXPECT_EQ(brightness_up, delegate->last_accelerator());
+ }
+ {
+ DummyBrightnessControlDelegate* delegate =
+ new DummyBrightnessControlDelegate(true);
+ GetController()->SetBrightnessControlDelegate(
+ scoped_ptr<BrightnessControlDelegate>(delegate).Pass());
+ EXPECT_EQ(0, delegate->handle_brightness_down_count());
+ EXPECT_TRUE(GetController()->Process(brightness_down));
+ EXPECT_EQ(1, delegate->handle_brightness_down_count());
+ EXPECT_EQ(brightness_down, delegate->last_accelerator());
+ EXPECT_EQ(0, delegate->handle_brightness_up_count());
+ EXPECT_TRUE(GetController()->Process(brightness_up));
+ EXPECT_EQ(1, delegate->handle_brightness_up_count());
+ EXPECT_EQ(brightness_up, delegate->last_accelerator());
+ }
+#endif
#if !defined(NDEBUG)
// RotateScreen
EXPECT_TRUE(GetController()->Process(
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ui/base/keycodes/keyboard_code_conversion_x.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698