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

Unified Diff: ash/root_window_controller_unittest.cc

Issue 1998933002: Update shelf spacing in Chrome OS according to the MD specs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge Created 4 years, 6 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/root_window_controller_unittest.cc
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index 6f974ddd1c063253f1a5bd995ee71de708a921fb..1ca0af6dc1d4c1bc627ce7aa66406e67a20ec3ac 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -11,6 +11,8 @@
#include "ash/common/system/tray/system_tray_delegate.h"
#include "ash/common/wm/window_state.h"
#include "ash/display/display_manager.h"
+#include "ash/session/session_state_delegate.h"
+#include "ash/shelf/shelf_layout_manager.h"
tdanderson 2016/06/10 22:54:42 are these needed?
yiyix 2016/06/13 18:43:54 sorry, these are from other patches.
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/display_manager_test_api.h"
@@ -199,7 +201,7 @@ TEST_F(RootWindowControllerTest, MoveWindows_Basic) {
EXPECT_EQ("100,20 100x100",
normal->GetNativeView()->GetBoundsInRootWindow().ToString());
- // Maximized area on primary display has 47px (ash::kShelfSize) inset at the
+ // Maximized area on primary display has 48px (ash::SHELF_SIZE) inset at the
tdanderson 2016/06/10 22:54:42 nit: please include the old comment since we haven
yiyix 2016/06/13 18:43:54 Done.
// bottom.
// First clear fullscreen status, since both fullscreen and maximized windows

Powered by Google App Engine
This is Rietveld 408576698