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

Side by Side Diff: ui/aura/window.h

Issue 7890054: Adds code for a new Aura shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 months 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/desktop.cc ('k') | ui/aura/window.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_WINDOW_H_ 5 #ifndef UI_AURA_WINDOW_H_
6 #define UI_AURA_WINDOW_H_ 6 #define UI_AURA_WINDOW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "ui/aura/aura_export.h" 13 #include "ui/aura/aura_export.h"
14 #include "ui/gfx/compositor/layer_delegate.h" 14 #include "ui/gfx/compositor/layer_delegate.h"
15 #include "ui/gfx/rect.h" 15 #include "ui/gfx/rect.h"
16 16
17 class SkCanvas; 17 class SkCanvas;
18 18
19 namespace ui { 19 namespace ui {
20 class Compositor; 20 class Compositor;
21 class Layer; 21 class Layer;
22 } 22 }
23 23
24 namespace aura { 24 namespace aura {
25 25
26 class Desktop; 26 class Desktop;
27 class KeyEvent; 27 class KeyEvent;
28 class LayoutManager;
28 class MouseEvent; 29 class MouseEvent;
29 class WindowDelegate; 30 class WindowDelegate;
30 class WindowManager; 31 class WindowManager;
31 32
32 namespace internal { 33 namespace internal {
33 class FocusManager; 34 class FocusManager;
34 } 35 }
35 36
36 // Aura window implementation. Interesting events are sent to the 37 // Aura window implementation. Interesting events are sent to the
37 // WindowDelegate. 38 // WindowDelegate.
(...skipping 20 matching lines...) Expand all
58 int id() const { return id_; } 59 int id() const { return id_; }
59 void set_id(int id) { id_ = id; } 60 void set_id(int id) { id_ = id; }
60 61
61 ui::Layer* layer() { return layer_.get(); } 62 ui::Layer* layer() { return layer_.get(); }
62 const ui::Layer* layer() const { return layer_.get(); } 63 const ui::Layer* layer() const { return layer_.get(); }
63 64
64 // Changes the visibility of the window. 65 // Changes the visibility of the window.
65 void SetVisibility(Visibility visibility); 66 void SetVisibility(Visibility visibility);
66 Visibility visibility() const { return visibility_; } 67 Visibility visibility() const { return visibility_; }
67 68
69 void SetLayoutManager(LayoutManager* layout_manager);
70
68 // Changes the bounds of the window. 71 // Changes the bounds of the window.
69 void SetBounds(const gfx::Rect& bounds, int anim_ms); 72 void SetBounds(const gfx::Rect& bounds, int anim_ms);
70 const gfx::Rect& bounds() const { return bounds_; } 73 const gfx::Rect& bounds() const { return bounds_; }
71 74
72 // Marks the a portion of window as needing to be painted. 75 // Marks the a portion of window as needing to be painted.
73 void SchedulePaintInRect(const gfx::Rect& rect); 76 void SchedulePaintInRect(const gfx::Rect& rect);
74 77
75 // Sets the contents of the window. 78 // Sets the contents of the window.
76 void SetCanvas(const SkCanvas& canvas, const gfx::Point& origin); 79 void SetCanvas(const SkCanvas& canvas, const gfx::Point& origin);
77 80
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 // The Window's parent. 151 // The Window's parent.
149 // TODO(beng): Implement NULL-ness for toplevels. 152 // TODO(beng): Implement NULL-ness for toplevels.
150 Window* parent_; 153 Window* parent_;
151 154
152 // Child windows. Topmost is last. 155 // Child windows. Topmost is last.
153 Windows children_; 156 Windows children_;
154 157
155 int id_; 158 int id_;
156 159
157 scoped_ptr<WindowManager> window_manager_; 160 scoped_ptr<WindowManager> window_manager_;
161 scoped_ptr<LayoutManager> layout_manager_;
158 162
159 void* user_data_; 163 void* user_data_;
160 164
161 DISALLOW_COPY_AND_ASSIGN(Window); 165 DISALLOW_COPY_AND_ASSIGN(Window);
162 }; 166 };
163 167
164 } // namespace aura 168 } // namespace aura
165 169
166 #endif // UI_AURA_WINDOW_H_ 170 #endif // UI_AURA_WINDOW_H_
OLDNEW
« no previous file with comments | « ui/aura/desktop.cc ('k') | ui/aura/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698