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

Unified Diff: ash/screen_ash_unittest.cc

Issue 22793011: ash:Shelf - Enable Alternate Shelf and Side Shelf by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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
Index: ash/screen_ash_unittest.cc
diff --git a/ash/screen_ash_unittest.cc b/ash/screen_ash_unittest.cc
index 22437423e0acfa2589195e21a859f07987878a94..b8440cae55f8c00e6e8e05d382a72b4d4d6fbf98 100644
--- a/ash/screen_ash_unittest.cc
+++ b/ash/screen_ash_unittest.cc
@@ -4,12 +4,14 @@
#include "ash/screen_ash.h"
+#include "ash/ash_switches.h"
#include "ash/root_window_controller.h"
#include "ash/shelf/shelf_layout_manager.h"
#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/wm/window_util.h"
+#include "base/command_line.h"
#include "ui/aura/env.h"
#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
@@ -40,7 +42,7 @@ TEST_F(ScreenAshTest, Bounds) {
EXPECT_EQ("0,0 600x597",
ScreenAsh::GetMaximizedWindowBoundsInParent(
primary->GetNativeView()).ToString());
- EXPECT_EQ("0,0 500x452",
+ EXPECT_EQ("0,0 500x453",
ScreenAsh::GetMaximizedWindowBoundsInParent(
secondary->GetNativeView()).ToString());
@@ -56,7 +58,7 @@ TEST_F(ScreenAshTest, Bounds) {
EXPECT_EQ("0,0 600x597",
ScreenAsh::GetDisplayWorkAreaBoundsInParent(
primary->GetNativeView()).ToString());
- EXPECT_EQ("0,0 500x452",
+ EXPECT_EQ("0,0 500x453",
ScreenAsh::GetDisplayWorkAreaBoundsInParent(
secondary->GetNativeView()).ToString());
}

Powered by Google App Engine
This is Rietveld 408576698