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

Side by Side Diff: ui/views/widget/widget.h

Issue 11364053: make StackingClient dispatch to either ash or desktop (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase + disable prerender tests on win-aura Created 8 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
« no previous file with comments | « ui/views/widget/native_widget_aura.cc ('k') | ui/views/widget/widget.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_VIEWS_WIDGET_WIDGET_H_ 5 #ifndef UI_VIEWS_WIDGET_WIDGET_H_
6 #define UI_VIEWS_WIDGET_WIDGET_H_ 6 #define UI_VIEWS_WIDGET_WIDGET_H_
7 7
8 #include <set> 8 #include <set>
9 #include <stack> 9 #include <stack>
10 #include <vector> 10 #include <vector>
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 NativeWidget* native_widget; 184 NativeWidget* native_widget;
185 // Aura-only. Provides a DesktopRootWindowHost implementation to use instead 185 // Aura-only. Provides a DesktopRootWindowHost implementation to use instead
186 // of the default one. 186 // of the default one.
187 // TODO(beng): Figure out if there's a better way to expose this, e.g. get 187 // TODO(beng): Figure out if there's a better way to expose this, e.g. get
188 // rid of NW subclasses and do this all via message handling. 188 // rid of NW subclasses and do this all via message handling.
189 DesktopRootWindowHost* desktop_root_window_host; 189 DesktopRootWindowHost* desktop_root_window_host;
190 bool top_level; 190 bool top_level;
191 // Only used by NativeWidgetAura. Specifies the type of layer for the 191 // Only used by NativeWidgetAura. Specifies the type of layer for the
192 // aura::Window. Default is LAYER_TEXTURED. 192 // aura::Window. Default is LAYER_TEXTURED.
193 ui::LayerType layer_type; 193 ui::LayerType layer_type;
194 // Only used by Aura. Provides additional context (generally a RootWindow)
195 // during creation to allow the widget to determine which desktop type it
196 // will belong to. NULL indicates a normal native desktop.
197 gfx::NativeView context;
194 }; 198 };
195 199
196 Widget(); 200 Widget();
197 virtual ~Widget(); 201 virtual ~Widget();
198 202
199 // Creates a decorated window Widget with the specified properties. 203 // Creates a decorated window Widget with the specified properties.
200 static Widget* CreateWindow(WidgetDelegate* delegate); 204 static Widget* CreateWindow(WidgetDelegate* delegate);
201 static Widget* CreateWindowWithParent(WidgetDelegate* delegate, 205 static Widget* CreateWindowWithParent(WidgetDelegate* delegate,
202 gfx::NativeWindow parent); 206 gfx::NativeWindow parent);
203 static Widget* CreateWindowWithBounds(WidgetDelegate* delegate, 207 static Widget* CreateWindowWithBounds(WidgetDelegate* delegate,
(...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 811
808 // Is |root_layers_| out of date? 812 // Is |root_layers_| out of date?
809 bool root_layers_dirty_; 813 bool root_layers_dirty_;
810 814
811 DISALLOW_COPY_AND_ASSIGN(Widget); 815 DISALLOW_COPY_AND_ASSIGN(Widget);
812 }; 816 };
813 817
814 } // namespace views 818 } // namespace views
815 819
816 #endif // UI_VIEWS_WIDGET_WIDGET_H_ 820 #endif // UI_VIEWS_WIDGET_WIDGET_H_
OLDNEW
« no previous file with comments | « ui/views/widget/native_widget_aura.cc ('k') | ui/views/widget/widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698