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

Side by Side Diff: ui/aura_shell/shell.h

Issue 8743014: [cros, Aura] Refresh status area widget bounds on StatusAreaView layout. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nit fixes, merge, prevent double deletion of ShelfLayoutManager Created 9 years 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 | « ui/aura_shell/shelf_layout_manager.cc ('k') | ui/aura_shell/shell.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) 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 17 matching lines...) Expand all
28 28
29 class Launcher; 29 class Launcher;
30 class ShellAcceleratorController; 30 class ShellAcceleratorController;
31 class ShellDelegate; 31 class ShellDelegate;
32 class ShellTooltipManager; 32 class ShellTooltipManager;
33 33
34 namespace internal { 34 namespace internal {
35 class AppList; 35 class AppList;
36 class DragDropController; 36 class DragDropController;
37 class ShadowController; 37 class ShadowController;
38 class ShelfLayoutController;
39 class ShellAcceleratorFilter; 38 class ShellAcceleratorFilter;
40 class WorkspaceController; 39 class WorkspaceController;
41 } 40 }
42 41
43 // Shell is a singleton object that presents the Shell API and implements the 42 // Shell is a singleton object that presents the Shell API and implements the
44 // Desktop's delegate interface. 43 // Desktop's delegate interface.
45 class AURA_SHELL_EXPORT Shell { 44 class AURA_SHELL_EXPORT Shell {
46 public: 45 public:
47 // Upon creation, the Shell sets itself as the Desktop's delegate, which takes 46 // Upon creation, the Shell sets itself as the Desktop's delegate, which takes
48 // ownership of the Shell. 47 // ownership of the Shell.
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 scoped_ptr<ShellAcceleratorController> accelerator_controller_; 104 scoped_ptr<ShellAcceleratorController> accelerator_controller_;
106 105
107 scoped_ptr<ShellDelegate> delegate_; 106 scoped_ptr<ShellDelegate> delegate_;
108 107
109 scoped_ptr<Launcher> launcher_; 108 scoped_ptr<Launcher> launcher_;
110 109
111 scoped_ptr<internal::AppList> app_list_; 110 scoped_ptr<internal::AppList> app_list_;
112 111
113 scoped_ptr<internal::DragDropController> drag_drop_controller_; 112 scoped_ptr<internal::DragDropController> drag_drop_controller_;
114 scoped_ptr<internal::WorkspaceController> workspace_controller_; 113 scoped_ptr<internal::WorkspaceController> workspace_controller_;
115 scoped_ptr<internal::ShelfLayoutController> shelf_layout_controller_;
116 scoped_ptr<internal::ShadowController> shadow_controller_; 114 scoped_ptr<internal::ShadowController> shadow_controller_;
117 115
118 // An event filter that pre-handles global accelerators. 116 // An event filter that pre-handles global accelerators.
119 scoped_ptr<internal::ShellAcceleratorFilter> accelerator_filter_; 117 scoped_ptr<internal::ShellAcceleratorFilter> accelerator_filter_;
120 118
121 scoped_ptr<ShellTooltipManager> tooltip_manager_; 119 scoped_ptr<ShellTooltipManager> tooltip_manager_;
122 120
123 DISALLOW_COPY_AND_ASSIGN(Shell); 121 DISALLOW_COPY_AND_ASSIGN(Shell);
124 }; 122 };
125 123
126 } // namespace aura_shell 124 } // namespace aura_shell
127 125
128 #endif // UI_AURA_SHELL_SHELL_H_ 126 #endif // UI_AURA_SHELL_SHELL_H_
OLDNEW
« no previous file with comments | « ui/aura_shell/shelf_layout_manager.cc ('k') | ui/aura_shell/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698