Index: ash/shell.cc |
diff --git a/ash/shell.cc b/ash/shell.cc |
index f43a1e35d5505160205a72f4878a2466f5d49e9b..2f5ada2f641ef4f1df86c11482913a2e3a593221 100644 |
--- a/ash/shell.cc |
+++ b/ash/shell.cc |
@@ -656,11 +656,6 @@ SystemTray* Shell::system_tray() { |
return status_area_widget_->system_tray(); |
} |
-int Shell::GetGridSize() const { |
- return |
- GetPrimaryRootWindowController()->workspace_controller()->GetGridSize(); |
-} |
- |
void Shell::InitRootWindowForSecondaryDisplay(aura::RootWindow* root) { |
root->set_focus_manager(focus_manager_.get()); |
internal::RootWindowController* controller = |
@@ -753,14 +748,6 @@ void Shell::InitLayoutManagersForPrimaryDisplay( |
panel_container->SetLayoutManager(panel_layout_manager_); |
} |
-// TODO: this is only used in tests, move with test. |
-void Shell::DisableWorkspaceGridLayout() { |
- RootWindowControllerList controllers = GetAllRootWindowControllers(); |
- for (RootWindowControllerList::iterator iter = controllers.begin(); |
- iter != controllers.end(); ++iter) |
- (*iter)->workspace_controller()->SetGridSize(0); |
-} |
- |
void Shell::SetCursor(gfx::NativeCursor cursor) { |
RootWindowList root_windows = GetAllRootWindows(); |
for (RootWindowList::iterator iter = root_windows.begin(); |