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

Unified Diff: ash/screen_ash_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/root_window_controller_unittest.cc ('k') | ash/shelf/shelf_widget_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/screen_ash_unittest.cc
diff --git a/ash/screen_ash_unittest.cc b/ash/screen_ash_unittest.cc
index 7ef789b8abd98985a7b8fb1fe6dac5045fcc975d..71d608fb347f8671e7ee63408e598273904b4e9d 100644
--- a/ash/screen_ash_unittest.cc
+++ b/ash/screen_ash_unittest.cc
@@ -38,15 +38,9 @@ TEST_F(ScreenAshTest, Bounds) {
EXPECT_EQ("0,0 600x597",
ScreenAsh::GetMaximizedWindowBoundsInParent(
primary->GetNativeView()).ToString());
- if (Shell::IsLauncherPerDisplayEnabled()) {
- EXPECT_EQ("0,0 500x452",
- ScreenAsh::GetMaximizedWindowBoundsInParent(
- secondary->GetNativeView()).ToString());
- } else {
- EXPECT_EQ("0,0 500x500",
- ScreenAsh::GetMaximizedWindowBoundsInParent(
- secondary->GetNativeView()).ToString());
- }
+ EXPECT_EQ("0,0 500x452",
+ ScreenAsh::GetMaximizedWindowBoundsInParent(
+ secondary->GetNativeView()).ToString());
// Display bounds
EXPECT_EQ("0,0 600x600",
@@ -60,15 +54,9 @@ TEST_F(ScreenAshTest, Bounds) {
EXPECT_EQ("0,0 600x597",
ScreenAsh::GetDisplayWorkAreaBoundsInParent(
primary->GetNativeView()).ToString());
- if (Shell::IsLauncherPerDisplayEnabled()) {
- EXPECT_EQ("0,0 500x452",
- ScreenAsh::GetDisplayWorkAreaBoundsInParent(
- secondary->GetNativeView()).ToString());
- } else {
- EXPECT_EQ("0,0 500x500",
- ScreenAsh::GetDisplayWorkAreaBoundsInParent(
- secondary->GetNativeView()).ToString());
- }
+ EXPECT_EQ("0,0 500x452",
+ ScreenAsh::GetDisplayWorkAreaBoundsInParent(
+ secondary->GetNativeView()).ToString());
}
// Test verifies a stable handling of secondary screen widget changes
« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | ash/shelf/shelf_widget_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698