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

Unified Diff: ash/wm/workspace/workspace_manager2.h

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/workspace_manager.cc ('k') | ash/wm/workspace/workspace_manager2.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_manager2.h
diff --git a/ash/wm/workspace/workspace_manager2.h b/ash/wm/workspace/workspace_manager2.h
index f9885116f82fc17c5cd12261076f10796828292a..f142daf73535ed1a74e34c6ac51ec6b80201539b 100644
--- a/ash/wm/workspace/workspace_manager2.h
+++ b/ash/wm/workspace/workspace_manager2.h
@@ -61,8 +61,6 @@ class ASH_EXPORT WorkspaceManager2 : public BaseWorkspaceManager {
// BaseWorkspaceManager2 overrides:
virtual bool IsInMaximizedMode() const OVERRIDE;
- virtual void SetGridSize(int size) OVERRIDE;
- virtual int GetGridSize() const OVERRIDE;
virtual WorkspaceWindowState GetWindowState() const OVERRIDE;
virtual void SetShelf(ShelfLayoutManager* shelf) OVERRIDE;
virtual void SetActiveWorkspaceByWindow(aura::Window* window) OVERRIDE;
@@ -167,9 +165,6 @@ class ASH_EXPORT WorkspaceManager2 : public BaseWorkspaceManager {
// |workspaces_|.
std::set<Workspace2*> pending_workspaces_;
- // See description above setter.
- int grid_size_;
-
// Owned by the Shell. May be NULL.
ShelfLayoutManager* shelf_;
« no previous file with comments | « ash/wm/workspace/workspace_manager.cc ('k') | ash/wm/workspace/workspace_manager2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698