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

Unified Diff: ash/root_window_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/root_window_controller.cc ('k') | ash/screen_ash_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller_unittest.cc
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index 55b3ed26b2c7469df266bb096b2d2e205b893165..b33e01262a046d4a8454782252191d228e4aa6c8 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -144,15 +144,9 @@ TEST_F(RootWindowControllerTest, MAYBE_MoveWindows_Basic) {
views::Widget* maximized = CreateTestWidget(gfx::Rect(700, 10, 100, 100));
maximized->Maximize();
EXPECT_EQ(root_windows[1], maximized->GetNativeView()->GetRootWindow());
- if (Shell::IsLauncherPerDisplayEnabled()) {
- EXPECT_EQ("600,0 500x452", maximized->GetWindowBoundsInScreen().ToString());
- EXPECT_EQ("0,0 500x452",
- maximized->GetNativeView()->GetBoundsInRootWindow().ToString());
- } else {
- EXPECT_EQ("600,0 500x500", maximized->GetWindowBoundsInScreen().ToString());
- EXPECT_EQ("0,0 500x500",
- maximized->GetNativeView()->GetBoundsInRootWindow().ToString());
- }
+ EXPECT_EQ("600,0 500x452", maximized->GetWindowBoundsInScreen().ToString());
+ EXPECT_EQ("0,0 500x452",
+ maximized->GetNativeView()->GetBoundsInRootWindow().ToString());
views::Widget* minimized = CreateTestWidget(gfx::Rect(800, 10, 100, 100));
minimized->Minimize();
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/screen_ash_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698