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

Side by Side Diff: ash/display/display_manager_unittest.cc

Issue 142003003: Skip DisplayManagerTest.ScreenAfterShutdown on win8 (which doesn't support multiple dislpays on ash) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/display/display_manager.h" 5 #include "ash/display/display_manager.h"
6 6
7 #include "ash/display/display_controller.h" 7 #include "ash/display/display_controller.h"
8 #include "ash/display/display_layout_store.h" 8 #include "ash/display/display_layout_store.h"
9 #include "ash/screen_util.h" 9 #include "ash/screen_util.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 1191 matching lines...) Expand 10 before | Expand all | Expand 10 after
1202 std::vector<gfx::Display> all = screen->GetAllDisplays(); 1202 std::vector<gfx::Display> all = screen->GetAllDisplays();
1203 EXPECT_EQ("500x300", all[0].size().ToString()); 1203 EXPECT_EQ("500x300", all[0].size().ToString());
1204 EXPECT_EQ("800x400", all[1].size().ToString()); 1204 EXPECT_EQ("800x400", all[1].size().ToString());
1205 } 1205 }
1206 1206
1207 private: 1207 private:
1208 DISALLOW_COPY_AND_ASSIGN(ScreenShutdownTest); 1208 DISALLOW_COPY_AND_ASSIGN(ScreenShutdownTest);
1209 }; 1209 };
1210 1210
1211 TEST_F(DisplayManagerTest, ScreenAfterShutdown) { 1211 TEST_F(DisplayManagerTest, ScreenAfterShutdown) {
1212 if (!SupportsMultipleDisplays())
1213 return;
1212 UpdateDisplay("500x300,800x400"); 1214 UpdateDisplay("500x300,800x400");
1213 } 1215 }
1214 1216
1215 } // namespace internal 1217 } // namespace internal
1216 } // namespace ash 1218 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698