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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/display/display_manager.cc

Issue 16539005: Skip mulitple-dispay tests on win8 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/display/display_error_dialog_unittest.cc ('k') | ash/display/display_manager_unittest.cc » ('j') | ash/test/ash_test_base.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_manager.cc
diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc
index 980a38524f5fa0addb98793bec125456efa3a04d..4e28ef1b9371c13762eb5586450feab65aca81f1 100644
--- a/ash/display/display_manager.cc
+++ b/ash/display/display_manager.cc
@@ -421,6 +421,14 @@ void DisplayManager::UpdateDisplays() {
void DisplayManager::UpdateDisplays(
const std::vector<DisplayInfo>& updated_display_info_list) {
+#if defined(OS_WIN)
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
+ DCHECK_EQ(1u, updated_display_info_list.size()) <<
+ "Multi display test does not work on Win8 bots. Please "
+ "skip (don't disable) the test using |SupportMultiDisplay()|";
James Cook 2013/06/11 17:48:07 SupportsMultipleDisplays()
oshima 2013/06/12 00:12:12 Done.
+ }
+#endif
+
DisplayInfoList new_display_info_list = updated_display_info_list;
std::sort(displays_.begin(), displays_.end(), DisplaySortFunctor());
std::sort(new_display_info_list.begin(),
« no previous file with comments | « ash/display/display_error_dialog_unittest.cc ('k') | ash/display/display_manager_unittest.cc » ('j') | ash/test/ash_test_base.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698