| OLD | NEW |
| 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_CONTROLLER_H_ | 5 #ifndef ASH_WM_WORKSPACE_CONTROLLER_H_ |
| 6 #define ASH_WM_WORKSPACE_CONTROLLER_H_ | 6 #define ASH_WM_WORKSPACE_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "ash/wm/workspace/workspace_types.h" | 9 #include "ash/wm/workspace/workspace_types.h" |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 virtual ~WorkspaceController(); | 33 virtual ~WorkspaceController(); |
| 34 | 34 |
| 35 // Returns the current window state. | 35 // Returns the current window state. |
| 36 WorkspaceWindowState GetWindowState() const; | 36 WorkspaceWindowState GetWindowState() const; |
| 37 | 37 |
| 38 void SetShelf(ShelfLayoutManager* shelf); | 38 void SetShelf(ShelfLayoutManager* shelf); |
| 39 | 39 |
| 40 // Sets the active workspace based on |window|. | 40 // Sets the active workspace based on |window|. |
| 41 void SetActiveWorkspaceByWindow(aura::Window* window); | 41 void SetActiveWorkspaceByWindow(aura::Window* window); |
| 42 | 42 |
| 43 // See description in BaseWorkspaceManager::GetParentForNewWindow(). | 43 // Returns the container window for the active workspace, never NULL. |
| 44 aura::Window* GetActiveWorkspaceWindow(); |
| 45 |
| 46 // See description in WorkspaceManager::GetParentForNewWindow(). |
| 44 aura::Window* GetParentForNewWindow(aura::Window* window); | 47 aura::Window* GetParentForNewWindow(aura::Window* window); |
| 45 | 48 |
| 46 // Starts the animation that occurs on first login. | 49 // Starts the animation that occurs on first login. |
| 47 void DoInitialAnimation(); | 50 void DoInitialAnimation(); |
| 48 | 51 |
| 49 // aura::client::ActivationChangeObserver overrides: | 52 // aura::client::ActivationChangeObserver overrides: |
| 50 virtual void OnWindowActivated(aura::Window* gained_active, | 53 virtual void OnWindowActivated(aura::Window* gained_active, |
| 51 aura::Window* lost_active) OVERRIDE; | 54 aura::Window* lost_active) OVERRIDE; |
| 52 | 55 |
| 53 private: | 56 private: |
| 54 friend class WorkspaceControllerTestHelper; | 57 friend class WorkspaceControllerTestHelper; |
| 55 | 58 |
| 56 aura::Window* viewport_; | 59 aura::Window* viewport_; |
| 57 | 60 |
| 58 scoped_ptr<WorkspaceManager> workspace_manager_; | 61 scoped_ptr<WorkspaceManager> workspace_manager_; |
| 59 | 62 |
| 60 // Cycles through the WorkspaceManager's workspaces in response to a three | 63 // Cycles through the WorkspaceManager's workspaces in response to a three |
| 61 // finger vertical scroll. | 64 // finger vertical scroll. |
| 62 scoped_ptr<WorkspaceCycler> workspace_cycler_; | 65 scoped_ptr<WorkspaceCycler> workspace_cycler_; |
| 63 | 66 |
| 64 DISALLOW_COPY_AND_ASSIGN(WorkspaceController); | 67 DISALLOW_COPY_AND_ASSIGN(WorkspaceController); |
| 65 }; | 68 }; |
| 66 | 69 |
| 67 } // namespace internal | 70 } // namespace internal |
| 68 } // namespace ash | 71 } // namespace ash |
| 69 | 72 |
| 70 #endif // ASH_WM_WORKSPACE_CONTROLLER_H_ | 73 #endif // ASH_WM_WORKSPACE_CONTROLLER_H_ |
| OLD | NEW |