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

Unified Diff: ash/wm/workspace_controller.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/workspace_controller.h ('k') | chrome/browser/ui/ash/shelf_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace_controller.cc
diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc
index 61257ee77abbb3eb5aac07437a6d5bfcb46f542c..c9c06b5d50e13f00eb92a4ab157cbbd3e6877db5 100644
--- a/ash/wm/workspace_controller.cc
+++ b/ash/wm/workspace_controller.cc
@@ -19,13 +19,6 @@
namespace ash {
namespace internal {
-namespace {
-
-// Size of the grid when a grid is enabled.
-const int kGridSize = 16;
-
-} // namespace
-
WorkspaceController::WorkspaceController(aura::Window* viewport)
: viewport_(viewport),
layout_manager_(NULL),
@@ -44,7 +37,6 @@ WorkspaceController::WorkspaceController(aura::Window* viewport)
viewport->SetEventFilter(event_filter_);
}
aura::client::GetActivationClient(root_window)->AddObserver(this);
- SetGridSize(kGridSize);
}
WorkspaceController::~WorkspaceController() {
@@ -65,16 +57,6 @@ bool WorkspaceController::IsInMaximizedMode() const {
return workspace_manager_->IsInMaximizedMode();
}
-void WorkspaceController::SetGridSize(int grid_size) {
- workspace_manager_->SetGridSize(grid_size);
- if (event_filter_)
- event_filter_->set_grid_size(grid_size);
-}
-
-int WorkspaceController::GetGridSize() const {
- return workspace_manager_->GetGridSize();
-}
-
WorkspaceWindowState WorkspaceController::GetWindowState() const {
return workspace_manager_->GetWindowState();
}
« no previous file with comments | « ash/wm/workspace_controller.h ('k') | chrome/browser/ui/ash/shelf_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698