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

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

Issue 8450018: First shot at implementing drag&drop for Aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: modified according to comments 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 11 matching lines...) Expand all
22 namespace gfx { 22 namespace gfx {
23 class Rect; 23 class Rect;
24 } 24 }
25 25
26 namespace aura_shell { 26 namespace aura_shell {
27 27
28 class Launcher; 28 class Launcher;
29 class ShellDelegate; 29 class ShellDelegate;
30 30
31 namespace internal { 31 namespace internal {
32 class DragDropController;
32 class ShelfLayoutController; 33 class ShelfLayoutController;
33 class WorkspaceController; 34 class WorkspaceController;
34 } 35 }
35 36
36 // Shell is a singleton object that presents the Shell API and implements the 37 // Shell is a singleton object that presents the Shell API and implements the
37 // Desktop's delegate interface. 38 // Desktop's delegate interface.
38 class AURA_SHELL_EXPORT Shell { 39 class AURA_SHELL_EXPORT Shell {
39 public: 40 public:
40 // Upon creation, the Shell sets itself as the Desktop's delegate, which takes 41 // Upon creation, the Shell sets itself as the Desktop's delegate, which takes
41 // ownership of the Shell. 42 // ownership of the Shell.
(...skipping 30 matching lines...) Expand all
72 static Shell* instance_; 73 static Shell* instance_;
73 74
74 std::vector<WindowAndBoundsPair> to_restore_; 75 std::vector<WindowAndBoundsPair> to_restore_;
75 76
76 base::WeakPtrFactory<Shell> method_factory_; 77 base::WeakPtrFactory<Shell> method_factory_;
77 78
78 scoped_ptr<ShellDelegate> delegate_; 79 scoped_ptr<ShellDelegate> delegate_;
79 80
80 scoped_ptr<Launcher> launcher_; 81 scoped_ptr<Launcher> launcher_;
81 82
83 scoped_ptr<internal::DragDropController> drag_drop_controller_;
82 scoped_ptr<internal::WorkspaceController> workspace_controller_; 84 scoped_ptr<internal::WorkspaceController> workspace_controller_;
83 scoped_ptr<internal::ShelfLayoutController> shelf_layout_controller_; 85 scoped_ptr<internal::ShelfLayoutController> shelf_layout_controller_;
84 86
85 DISALLOW_COPY_AND_ASSIGN(Shell); 87 DISALLOW_COPY_AND_ASSIGN(Shell);
86 }; 88 };
87 89
88 } // namespace aura_shell 90 } // namespace aura_shell
89 91
90 #endif // UI_AURA_SHELL_SHELL_H_ 92 #endif // UI_AURA_SHELL_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698