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

Unified Diff: ash/shell.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/shell.h ('k') | ash/wm/base_layout_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « ash/shell.h ('k') | ash/wm/base_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698