Chromium Code Reviews| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 44 | 44 |
| 45 // See description in WorkspaceManager::GetParentForNewWindow(). | 45 // See description in WorkspaceManager::GetParentForNewWindow(). |
| 46 aura::Window* GetParentForNewWindow(aura::Window* window); | 46 aura::Window* GetParentForNewWindow(aura::Window* window); |
| 47 | 47 |
| 48 // Starts the animation that occurs on first login. | 48 // Starts the animation that occurs on first login. |
| 49 void DoInitialAnimation(); | 49 void DoInitialAnimation(); |
| 50 | 50 |
| 51 // aura::client::ActivationChangeObserver overrides: | 51 // aura::client::ActivationChangeObserver overrides: |
| 52 virtual void OnWindowActivated(aura::Window* gained_active, | 52 virtual void OnWindowActivated(aura::Window* gained_active, |
| 53 aura::Window* lost_active) OVERRIDE; | 53 aura::Window* lost_active) OVERRIDE; |
| 54 virtual void OnAttemptToReactivateWindow( | |
| 55 aura::Window* request_active, aura::Window* actual_active) OVERRIDE; | |
|
sky
2013/04/23 21:36:42
When you wrap, each param on its own line.
sschmitz
2013/04/24 01:23:43
Done.
| |
| 54 | 56 |
| 55 private: | 57 private: |
| 56 friend class WorkspaceControllerTestHelper; | 58 friend class WorkspaceControllerTestHelper; |
| 57 | 59 |
| 58 aura::Window* viewport_; | 60 aura::Window* viewport_; |
| 59 | 61 |
| 60 scoped_ptr<WorkspaceManager> workspace_manager_; | 62 scoped_ptr<WorkspaceManager> workspace_manager_; |
| 61 | 63 |
| 62 DISALLOW_COPY_AND_ASSIGN(WorkspaceController); | 64 DISALLOW_COPY_AND_ASSIGN(WorkspaceController); |
| 63 }; | 65 }; |
| 64 | 66 |
| 65 } // namespace internal | 67 } // namespace internal |
| 66 } // namespace ash | 68 } // namespace ash |
| 67 | 69 |
| 68 #endif // ASH_WM_WORKSPACE_CONTROLLER_H_ | 70 #endif // ASH_WM_WORKSPACE_CONTROLLER_H_ |
| OLD | NEW |