OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 UI_AURA_SHELL_SHELL_H_ | 5 #ifndef UI_AURA_SHELL_SHELL_H_ |
6 #define UI_AURA_SHELL_SHELL_H_ | 6 #define UI_AURA_SHELL_SHELL_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 12 matching lines...) Expand all Loading... |
23 namespace gfx { | 23 namespace gfx { |
24 class Rect; | 24 class Rect; |
25 } | 25 } |
26 | 26 |
27 namespace aura_shell { | 27 namespace aura_shell { |
28 | 28 |
29 class Launcher; | 29 class Launcher; |
30 class ShellDelegate; | 30 class ShellDelegate; |
31 | 31 |
32 namespace internal { | 32 namespace internal { |
| 33 class DragDropController; |
33 class ShelfLayoutController; | 34 class ShelfLayoutController; |
34 class WorkspaceController; | 35 class WorkspaceController; |
35 } | 36 } |
36 | 37 |
37 // Shell is a singleton object that presents the Shell API and implements the | 38 // Shell is a singleton object that presents the Shell API and implements the |
38 // Desktop's delegate interface. | 39 // Desktop's delegate interface. |
39 class AURA_SHELL_EXPORT Shell { | 40 class AURA_SHELL_EXPORT Shell { |
40 public: | 41 public: |
41 // Upon creation, the Shell sets itself as the Desktop's delegate, which takes | 42 // Upon creation, the Shell sets itself as the Desktop's delegate, which takes |
42 // ownership of the Shell. | 43 // ownership of the Shell. |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 static Shell* instance_; | 78 static Shell* instance_; |
78 | 79 |
79 std::vector<WindowAndBoundsPair> to_restore_; | 80 std::vector<WindowAndBoundsPair> to_restore_; |
80 | 81 |
81 base::WeakPtrFactory<Shell> method_factory_; | 82 base::WeakPtrFactory<Shell> method_factory_; |
82 | 83 |
83 scoped_ptr<ShellDelegate> delegate_; | 84 scoped_ptr<ShellDelegate> delegate_; |
84 | 85 |
85 scoped_ptr<Launcher> launcher_; | 86 scoped_ptr<Launcher> launcher_; |
86 | 87 |
| 88 scoped_ptr<internal::DragDropController> drag_drop_controller_; |
87 scoped_ptr<internal::WorkspaceController> workspace_controller_; | 89 scoped_ptr<internal::WorkspaceController> workspace_controller_; |
88 scoped_ptr<internal::ShelfLayoutController> shelf_layout_controller_; | 90 scoped_ptr<internal::ShelfLayoutController> shelf_layout_controller_; |
89 | 91 |
90 DISALLOW_COPY_AND_ASSIGN(Shell); | 92 DISALLOW_COPY_AND_ASSIGN(Shell); |
91 }; | 93 }; |
92 | 94 |
93 } // namespace aura_shell | 95 } // namespace aura_shell |
94 | 96 |
95 #endif // UI_AURA_SHELL_SHELL_H_ | 97 #endif // UI_AURA_SHELL_SHELL_H_ |
OLD | NEW |