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

Unified Diff: ash/display/display_controller_unittest.cc

Issue 14584004: Remove ash-disable-launcher-per-display flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 7 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/ash_switches.cc ('k') | ash/launcher/launcher_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_controller_unittest.cc
diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc
index 8ac928db3a5de70e57fc9fb5b28e56dd1867f6f7..9faeea7663d6f5763f6121b40f012ab55d94ffb8 100644
--- a/ash/display/display_controller_unittest.cc
+++ b/ash/display/display_controller_unittest.cc
@@ -279,15 +279,11 @@ TEST_F(DisplayControllerTest, BoundsUpdated) {
EXPECT_EQ(1, observer.CountAndReset()); // two resizes
EXPECT_EQ("0,0 400x400", GetPrimaryDisplay().bounds().ToString());
EXPECT_EQ("0,400 200x200", GetSecondaryDisplay().bounds().ToString());
- if (!ash::Shell::IsLauncherPerDisplayEnabled())
- EXPECT_EQ("5,405 190x190", GetSecondaryDisplay().work_area().ToString());
UpdateDisplay("400x400,300x300");
EXPECT_EQ(1, observer.CountAndReset());
EXPECT_EQ("0,0 400x400", GetPrimaryDisplay().bounds().ToString());
EXPECT_EQ("0,400 300x300", GetSecondaryDisplay().bounds().ToString());
- if (!ash::Shell::IsLauncherPerDisplayEnabled())
- EXPECT_EQ("5,405 290x290", GetSecondaryDisplay().work_area().ToString());
UpdateDisplay("400x400");
EXPECT_EQ(1, observer.CountAndReset());
@@ -412,10 +408,7 @@ TEST_F(DisplayControllerTest, MAYBE_SwapPrimary) {
EXPECT_EQ("0,0 200x200", primary_display.bounds().ToString());
EXPECT_EQ("0,0 200x152", primary_display.work_area().ToString());
EXPECT_EQ("200,0 300x300", secondary_display.bounds().ToString());
- if (ash::Shell::IsLauncherPerDisplayEnabled())
- EXPECT_EQ("200,0 300x252", secondary_display.work_area().ToString());
- else
- EXPECT_EQ("200,0 300x300", secondary_display.work_area().ToString());
+ EXPECT_EQ("200,0 300x252", secondary_display.work_area().ToString());
EXPECT_EQ("right, 50",
display_controller->GetCurrentDisplayLayout().ToString());
@@ -450,10 +443,7 @@ TEST_F(DisplayControllerTest, MAYBE_SwapPrimary) {
EXPECT_EQ("0,0 300x252", swapped_primary.work_area().ToString());
EXPECT_EQ("-200,-50 200x200", swapped_secondary.bounds().ToString());
- if (ash::Shell::IsLauncherPerDisplayEnabled())
- EXPECT_EQ("-200,-50 200x152", swapped_secondary.work_area().ToString());
- else
- EXPECT_EQ("-200,-50 200x200", swapped_secondary.work_area().ToString());
+ EXPECT_EQ("-200,-50 200x152", swapped_secondary.work_area().ToString());
aura::WindowTracker tracker;
tracker.Add(primary_root);
« no previous file with comments | « ash/ash_switches.cc ('k') | ash/launcher/launcher_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698