| 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_;
|
|
|
|
|