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

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

Issue 8387043: [Aura] Support always-on-top top level window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move always-on-top handling code from shell into a controller Created 9 years, 1 month 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
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 12 matching lines...) Expand all
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 AlwaysOnTopController;
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 : public aura::DesktopDelegate { 40 class AURA_SHELL_EXPORT Shell : public aura::DesktopDelegate {
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
77 base::WeakPtrFactory<Shell> method_factory_; 78 base::WeakPtrFactory<Shell> method_factory_;
78 79
79 scoped_ptr<ShellDelegate> delegate_; 80 scoped_ptr<ShellDelegate> delegate_;
80 81
81 scoped_ptr<Launcher> launcher_; 82 scoped_ptr<Launcher> launcher_;
82 83
83 scoped_ptr<internal::WorkspaceController> workspace_controller_; 84 scoped_ptr<internal::WorkspaceController> workspace_controller_;
84 85
85 scoped_ptr<internal::ShelfLayoutController> shelf_layout_controller_; 86 scoped_ptr<internal::ShelfLayoutController> shelf_layout_controller_;
86 87
88 scoped_ptr<internal::AlwaysOnTopController> always_on_top_controller_;
89
87 DISALLOW_COPY_AND_ASSIGN(Shell); 90 DISALLOW_COPY_AND_ASSIGN(Shell);
88 }; 91 };
89 92
90 } // namespace aura_shell 93 } // namespace aura_shell
91 94
92 #endif // UI_AURA_SHELL_SHELL_H_ 95 #endif // UI_AURA_SHELL_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698