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

Unified Diff: ash/display/display_manager_unittest.cc

Issue 1594683002: Introduce DisplayConfigurationController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_576375_display1b1
Patch Set: Rebase Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/display/display_manager.cc ('k') | ash/display/screen_orientation_controller_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_manager_unittest.cc
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc
index e2166723b84dbab3e22b333e2b34a93f29e5375c..e51560141a107f6e370266c79b9e8145043a2be5 100644
--- a/ash/display/display_manager_unittest.cc
+++ b/ash/display/display_manager_unittest.cc
@@ -1432,7 +1432,7 @@ TEST_F(DisplayManagerTest, NotifyPrimaryChange) {
if (!SupportsMultipleDisplays())
return;
UpdateDisplay("500x500,500x500");
- ash::Shell::GetInstance()->window_tree_host_manager()->SwapPrimaryDisplay();
+ Shell::GetInstance()->window_tree_host_manager()->SwapPrimaryDisplayForTest();
reset();
UpdateDisplay("500x500");
EXPECT_FALSE(changed_metrics() & gfx::DisplayObserver::DISPLAY_METRIC_BOUNDS);
@@ -1442,7 +1442,7 @@ TEST_F(DisplayManagerTest, NotifyPrimaryChange) {
gfx::DisplayObserver::DISPLAY_METRIC_PRIMARY);
UpdateDisplay("500x500,500x500");
- ash::Shell::GetInstance()->window_tree_host_manager()->SwapPrimaryDisplay();
+ Shell::GetInstance()->window_tree_host_manager()->SwapPrimaryDisplayForTest();
reset();
UpdateDisplay("500x400");
EXPECT_TRUE(changed_metrics() & gfx::DisplayObserver::DISPLAY_METRIC_BOUNDS);
« no previous file with comments | « ash/display/display_manager.cc ('k') | ash/display/screen_orientation_controller_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698