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

Unified Diff: ash/touch/touch_observer_hud_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/tooltips/tooltip_controller_unittest.cc ('k') | ash/wm/activation_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/touch/touch_observer_hud_unittest.cc
diff --git a/ash/touch/touch_observer_hud_unittest.cc b/ash/touch/touch_observer_hud_unittest.cc
index c616f6f348005da808943babdff4fac0c6d81caf..7e8b91bbdda7455ba4c6e47c2a5e824d835c5681 100644
--- a/ash/touch/touch_observer_hud_unittest.cc
+++ b/ash/touch/touch_observer_hud_unittest.cc
@@ -243,6 +243,9 @@ class TouchHudTest : public test::AshTestBase {
// Checks if touch HUDs are correctly initialized for displays.
TEST_F(TouchHudTest, Basic) {
+ if (!SupportsMultipleDisplays())
+ return;
+
// Setup a dual display setting.
SetupDualDisplays();
@@ -254,6 +257,9 @@ TEST_F(TouchHudTest, Basic) {
// Checks if touch HUDs are correctly handled when primary display is changed.
TEST_F(TouchHudTest, SwapPrimaryDisplay) {
+ if (!SupportsMultipleDisplays())
+ return;
+
// Setup a dual display setting.
SetupDualDisplays();
@@ -278,6 +284,9 @@ TEST_F(TouchHudTest, SwapPrimaryDisplay) {
// Checks if touch HUDs are correctly handled when displays are mirrored.
TEST_F(TouchHudTest, MirrorDisplays) {
+ if (!SupportsMultipleDisplays())
+ return;
+
// Setup a dual display setting.
SetupDualDisplays();
@@ -301,6 +310,9 @@ TEST_F(TouchHudTest, MirrorDisplays) {
// Checks if touch HUDs are correctly handled when displays are mirrored after
// setting the external display as the primary one.
TEST_F(TouchHudTest, SwapPrimaryThenMirrorDisplays) {
+ if (!SupportsMultipleDisplays())
+ return;
+
// Setup a dual display setting.
SetupDualDisplays();
@@ -328,6 +340,9 @@ TEST_F(TouchHudTest, SwapPrimaryThenMirrorDisplays) {
// Checks if touch HUDs are correctly handled when the external display, which
// is the secondary one, is removed.
TEST_F(TouchHudTest, RemoveSecondaryDisplay) {
+ if (!SupportsMultipleDisplays())
+ return;
+
// Setup a dual display setting.
SetupDualDisplays();
@@ -351,6 +366,9 @@ TEST_F(TouchHudTest, RemoveSecondaryDisplay) {
// Checks if touch HUDs are correctly handled when the external display, which
// is set as the primary display, is removed.
TEST_F(TouchHudTest, RemovePrimaryDisplay) {
+ if (!SupportsMultipleDisplays())
+ return;
+
// Setup a dual display setting.
SetupDualDisplays();
@@ -377,6 +395,9 @@ TEST_F(TouchHudTest, RemovePrimaryDisplay) {
// Checks if touch HUDs are correctly handled when all displays are removed.
TEST_F(TouchHudTest, Headless) {
+ if (!SupportsMultipleDisplays())
+ return;
+
// Setup a single display setting.
SetupSingleDisplay();
« no previous file with comments | « ash/tooltips/tooltip_controller_unittest.cc ('k') | ash/wm/activation_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698