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

Unified Diff: ash/wm/base_layout_manager_unittest.cc

Issue 10910164: Removes the grid from ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix ShelfBrowserTest Created 8 years, 3 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/wm/base_layout_manager.cc ('k') | ash/wm/custom_frame_view_ash_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/base_layout_manager_unittest.cc
diff --git a/ash/wm/base_layout_manager_unittest.cc b/ash/wm/base_layout_manager_unittest.cc
index e797c75670a40ed454844ad83427067044b7113a..d9938851d3c13eb00dac2163176b069fc9cc8dc6 100644
--- a/ash/wm/base_layout_manager_unittest.cc
+++ b/ash/wm/base_layout_manager_unittest.cc
@@ -10,6 +10,7 @@
#include "ash/test/ash_test_base.h"
#include "ash/wm/property_util.h"
#include "ash/wm/window_util.h"
+#include "ash/wm/workspace/workspace_window_resizer.h"
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "ui/aura/client/aura_constants.h"
@@ -170,7 +171,7 @@ TEST_F(BaseLayoutManagerTest, BoundsWithScreenEdgeVisible) {
// Restore it.
window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
// It should have the default maximized window bounds, inset by the grid size.
- int grid_size = ash::Shell::GetInstance()->GetGridSize();
+ int grid_size = internal::WorkspaceWindowResizer::kScreenEdgeInset;
gfx::Rect max_bounds =
ash::ScreenAsh::GetMaximizedWindowBoundsInParent(window.get());
max_bounds.Inset(grid_size, grid_size);
« no previous file with comments | « ash/wm/base_layout_manager.cc ('k') | ash/wm/custom_frame_view_ash_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698