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 <memory> |
| 9 |
8 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
9 #include "ash/wm/workspace/workspace_types.h" | 11 #include "ash/wm/workspace/workspace_types.h" |
10 #include "base/macros.h" | 12 #include "base/macros.h" |
11 #include "base/memory/scoped_ptr.h" | |
12 | 13 |
13 namespace aura { | 14 namespace aura { |
14 class Window; | 15 class Window; |
15 } | 16 } |
16 | 17 |
17 namespace ash { | 18 namespace ash { |
18 class ShelfLayoutManager; | 19 class ShelfLayoutManager; |
19 class WorkspaceControllerTestHelper; | 20 class WorkspaceControllerTestHelper; |
20 class WorkspaceEventHandler; | 21 class WorkspaceEventHandler; |
21 class WorkspaceLayoutManager; | 22 class WorkspaceLayoutManager; |
(...skipping 10 matching lines...) Expand all Loading... |
32 WorkspaceWindowState GetWindowState() const; | 33 WorkspaceWindowState GetWindowState() const; |
33 | 34 |
34 void SetShelf(ShelfLayoutManager* shelf); | 35 void SetShelf(ShelfLayoutManager* shelf); |
35 | 36 |
36 // Starts the animation that occurs on first login. | 37 // Starts the animation that occurs on first login. |
37 void DoInitialAnimation(); | 38 void DoInitialAnimation(); |
38 | 39 |
39 // Add a delegate which adds a backdrop behind the top window of the default | 40 // Add a delegate which adds a backdrop behind the top window of the default |
40 // workspace. | 41 // workspace. |
41 void SetMaximizeBackdropDelegate( | 42 void SetMaximizeBackdropDelegate( |
42 scoped_ptr<WorkspaceLayoutManagerDelegate> delegate); | 43 std::unique_ptr<WorkspaceLayoutManagerDelegate> delegate); |
43 | 44 |
44 WorkspaceLayoutManager* layout_manager() { return layout_manager_; } | 45 WorkspaceLayoutManager* layout_manager() { return layout_manager_; } |
45 | 46 |
46 private: | 47 private: |
47 friend class WorkspaceControllerTestHelper; | 48 friend class WorkspaceControllerTestHelper; |
48 | 49 |
49 aura::Window* viewport_; | 50 aura::Window* viewport_; |
50 | 51 |
51 ShelfLayoutManager* shelf_; | 52 ShelfLayoutManager* shelf_; |
52 scoped_ptr<WorkspaceEventHandler> event_handler_; | 53 std::unique_ptr<WorkspaceEventHandler> event_handler_; |
53 WorkspaceLayoutManager* layout_manager_; | 54 WorkspaceLayoutManager* layout_manager_; |
54 | 55 |
55 DISALLOW_COPY_AND_ASSIGN(WorkspaceController); | 56 DISALLOW_COPY_AND_ASSIGN(WorkspaceController); |
56 }; | 57 }; |
57 | 58 |
58 } // namespace ash | 59 } // namespace ash |
59 | 60 |
60 #endif // ASH_WM_WORKSPACE_CONTROLLER_H_ | 61 #endif // ASH_WM_WORKSPACE_CONTROLLER_H_ |
OLD | NEW |