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

Side by Side Diff: ash/wm/workspace/workspace_manager.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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/wm/workspace/workspace_layout_manager2.cc ('k') | ash/wm/workspace/workspace_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_WM_WORKSPACE_WORKSPACE_MANAGER_H_ 5 #ifndef ASH_WM_WORKSPACE_WORKSPACE_MANAGER_H_
6 #define ASH_WM_WORKSPACE_WORKSPACE_MANAGER_H_ 6 #define ASH_WM_WORKSPACE_WORKSPACE_MANAGER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 aura::Window* contents_view() { return contents_view_; } 52 aura::Window* contents_view() { return contents_view_; }
53 53
54 // Updates the visibility and whether any windows overlap the shelf. 54 // Updates the visibility and whether any windows overlap the shelf.
55 void UpdateShelfVisibility(); 55 void UpdateShelfVisibility();
56 56
57 // Invoked when the show state of the specified window changes. 57 // Invoked when the show state of the specified window changes.
58 void ShowStateChanged(aura::Window* window); 58 void ShowStateChanged(aura::Window* window);
59 59
60 // BaseWorkspaceManager overrides: 60 // BaseWorkspaceManager overrides:
61 virtual bool IsInMaximizedMode() const OVERRIDE; 61 virtual bool IsInMaximizedMode() const OVERRIDE;
62 virtual void SetGridSize(int size) OVERRIDE;
63 virtual int GetGridSize() const OVERRIDE;
64 virtual WorkspaceWindowState GetWindowState() const OVERRIDE; 62 virtual WorkspaceWindowState GetWindowState() const OVERRIDE;
65 virtual void SetShelf(ShelfLayoutManager* shelf) OVERRIDE; 63 virtual void SetShelf(ShelfLayoutManager* shelf) OVERRIDE;
66 virtual void SetActiveWorkspaceByWindow(aura::Window* window) OVERRIDE; 64 virtual void SetActiveWorkspaceByWindow(aura::Window* window) OVERRIDE;
67 virtual aura::Window* GetParentForNewWindow(aura::Window* window) OVERRIDE; 65 virtual aura::Window* GetParentForNewWindow(aura::Window* window) OVERRIDE;
68 66
69 private: 67 private:
70 // Enumeration of whether windows should animate or not. 68 // Enumeration of whether windows should animate or not.
71 enum AnimateChangeType { 69 enum AnimateChangeType {
72 ANIMATE, 70 ANIMATE,
73 DONT_ANIMATE 71 DONT_ANIMATE
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 // Owned by the Shell container window LauncherContainer. May be NULL. 135 // Owned by the Shell container window LauncherContainer. May be NULL.
138 ShelfLayoutManager* shelf_; 136 ShelfLayoutManager* shelf_;
139 137
140 DISALLOW_COPY_AND_ASSIGN(WorkspaceManager); 138 DISALLOW_COPY_AND_ASSIGN(WorkspaceManager);
141 }; 139 };
142 140
143 } // namespace internal 141 } // namespace internal
144 } // namespace ash 142 } // namespace ash
145 143
146 #endif // ASH_WM_WORKSPACE_WORKSPACE_MANAGER_H_ 144 #endif // ASH_WM_WORKSPACE_WORKSPACE_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/wm/workspace/workspace_layout_manager2.cc ('k') | ash/wm/workspace/workspace_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698