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

Unified Diff: ash/screen_ash_unittest.cc

Issue 16539005: Skip mulitple-dispay tests on win8 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed comment Created 7 years, 6 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/root_window_controller_unittest.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/screen_ash_unittest.cc
diff --git a/ash/screen_ash_unittest.cc b/ash/screen_ash_unittest.cc
index 71d608fb347f8671e7ee63408e598273904b4e9d..f5faf3b04edb90a086d8365877a6f4ec0d7fd7b8 100644
--- a/ash/screen_ash_unittest.cc
+++ b/ash/screen_ash_unittest.cc
@@ -23,6 +23,9 @@ namespace test {
typedef test::AshTestBase ScreenAshTest;
TEST_F(ScreenAshTest, Bounds) {
+ if (!SupportsMultipleDisplays())
+ return;
+
UpdateDisplay("600x600,500x500");
Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager()->
SetAutoHideBehavior(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
@@ -62,6 +65,9 @@ TEST_F(ScreenAshTest, Bounds) {
// Test verifies a stable handling of secondary screen widget changes
// (crbug.com/226132).
TEST_F(ScreenAshTest, StabilityTest) {
+ if (!SupportsMultipleDisplays())
+ return;
+
UpdateDisplay("600x600,500x500");
views::Widget* secondary = views::Widget::CreateWindowWithContextAndBounds(
NULL, CurrentContext(), gfx::Rect(610, 10, 100, 100));
@@ -76,6 +82,9 @@ TEST_F(ScreenAshTest, StabilityTest) {
}
TEST_F(ScreenAshTest, ConvertRect) {
+ if (!SupportsMultipleDisplays())
+ return;
+
UpdateDisplay("600x600,500x500");
views::Widget* primary = views::Widget::CreateWindowWithContextAndBounds(
« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698