diff options
author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-23 15:35:59 +0000 |
---|---|---|
committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-23 15:35:59 +0000 |
commit | f358508ae08002fe2e32c078414d0b73737db264 (patch) | |
tree | 88c20ed08f2a4c70e1b24933e4c05b39cf9a2a54 /ash | |
parent | 5a8551f668939a56fd3f768bc2545e2547425167 (diff) | |
download | chromium_src-f358508ae08002fe2e32c078414d0b73737db264.zip chromium_src-f358508ae08002fe2e32c078414d0b73737db264.tar.gz chromium_src-f358508ae08002fe2e32c078414d0b73737db264.tar.bz2 |
ash: Disable MirrorToDockedWithFullscreen on Windows.
The test creates multiple-displays, and multi-display tests do not work reliably
on Windows.
BUG=none
R=oshima@chromium.org
Review URL: https://codereview.chromium.org/410943003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284931 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r-- | ash/display/display_controller_unittest.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc index 5ee4cae..26e01cc 100644 --- a/ash/display/display_controller_unittest.cc +++ b/ash/display/display_controller_unittest.cc @@ -550,6 +550,9 @@ DisplayInfo CreateDisplayInfo(int64 id, } // namespace TEST_F(DisplayControllerTest, MirrorToDockedWithFullscreen) { + if (!SupportsMultipleDisplays()) + return; + // Creates windows to catch activation change event. scoped_ptr<aura::Window> w1(CreateTestWindowInShellWithId(1)); w1->Focus(); |