| 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();
|
| }
|
|
|