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

Unified Diff: ash/accelerators/accelerator_controller_unittest.cc

Issue 12217120: Add IsInternal property to gfx::Display (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 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 | « no previous file | ash/display/display_controller.cc » ('j') | ash/display/display_manager.h » ('J')
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 5de157c28fbc52c2510d017c9f0ac5d79d65edae..92e66a360471bcb77030c381f6f4c487f8986b1e 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -317,6 +317,10 @@ class AcceleratorControllerTest : public test::AshTestBase {
SetFirstDisplayAsInternalDisplayForTest();
}
+ void DisableInternalDisplay() {
oshima 2013/02/12 17:38:51 It's better to reset in AshTestBase::TearDown, and
ynovikov 2013/02/12 21:17:47 Done.
+ Shell::GetInstance()->display_manager()->ResetInternalDisplayForTest();
+ }
+
static AcceleratorController* GetController();
static bool ProcessWithContext(const ui::Accelerator& accelerator);
@@ -891,6 +895,7 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
// effect of locking the screen.
EXPECT_TRUE(ProcessWithContext(
ui::Accelerator(ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN)));
+ DisableInternalDisplay();
#endif
}
@@ -1239,6 +1244,7 @@ TEST_F(AcceleratorControllerTest, DisallowedAtModalWindow) {
EXPECT_EQ(1, delegate->handle_volume_up_count());
EXPECT_EQ(volume_up, delegate->last_accelerator());
}
+ DisableInternalDisplay();
}
#endif
« no previous file with comments | « no previous file | ash/display/display_controller.cc » ('j') | ash/display/display_manager.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698