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

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

Issue 1050713002: aura: Remove layerless windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: layerless: rebase Created 5 years, 8 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
« no previous file with comments | « ui/views/widget/native_widget_mac_unittest.mm ('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>
11 11
12 #include "base/gtest_prod_util.h" 12 #include "base/gtest_prod_util.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/observer_list.h" 14 #include "base/observer_list.h"
15 #include "base/scoped_observer.h" 15 #include "base/scoped_observer.h"
16 #include "ui/aura/window_layer_type.h"
17 #include "ui/base/ui_base_types.h" 16 #include "ui/base/ui_base_types.h"
18 #include "ui/events/event_source.h" 17 #include "ui/events/event_source.h"
19 #include "ui/gfx/geometry/rect.h" 18 #include "ui/gfx/geometry/rect.h"
20 #include "ui/gfx/native_widget_types.h" 19 #include "ui/gfx/native_widget_types.h"
21 #include "ui/native_theme/native_theme_observer.h" 20 #include "ui/native_theme/native_theme_observer.h"
22 #include "ui/views/focus/focus_manager.h" 21 #include "ui/views/focus/focus_manager.h"
23 #include "ui/views/widget/native_widget_delegate.h" 22 #include "ui/views/widget/native_widget_delegate.h"
24 #include "ui/views/window/client_view.h" 23 #include "ui/views/window/client_view.h"
25 #include "ui/views/window/non_client_view.h" 24 #include "ui/views/window/non_client_view.h"
26 25
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 gfx::Rect bounds; 241 gfx::Rect bounds;
243 // When set, this value is used as the Widget's NativeWidget implementation. 242 // When set, this value is used as the Widget's NativeWidget implementation.
244 // The Widget will not construct a default one. Default is NULL. 243 // The Widget will not construct a default one. Default is NULL.
245 NativeWidget* native_widget; 244 NativeWidget* native_widget;
246 // Aura-only. Provides a DesktopWindowTreeHost implementation to use instead 245 // Aura-only. Provides a DesktopWindowTreeHost implementation to use instead
247 // of the default one. 246 // of the default one.
248 // TODO(beng): Figure out if there's a better way to expose this, e.g. get 247 // TODO(beng): Figure out if there's a better way to expose this, e.g. get
249 // rid of NW subclasses and do this all via message handling. 248 // rid of NW subclasses and do this all via message handling.
250 DesktopWindowTreeHost* desktop_window_tree_host; 249 DesktopWindowTreeHost* desktop_window_tree_host;
251 // Only used by NativeWidgetAura. Specifies the type of layer for the 250 // Only used by NativeWidgetAura. Specifies the type of layer for the
252 // aura::Window. Default is WINDOW_LAYER_TEXTURED. 251 // aura::Window. Default is ui::LAYER_TEXTURED.
253 aura::WindowLayerType layer_type; 252 ui::LayerType layer_type;
254 // Only used by Aura. Provides a context window whose RootWindow is 253 // Only used by Aura. Provides a context window whose RootWindow is
255 // consulted during widget creation to determine where in the Window 254 // consulted during widget creation to determine where in the Window
256 // hierarchy this widget should be placed. (This is separate from |parent|; 255 // hierarchy this widget should be placed. (This is separate from |parent|;
257 // if you pass a RootWindow to |parent|, your window will be parented to 256 // if you pass a RootWindow to |parent|, your window will be parented to
258 // |parent|. If you pass a RootWindow to |context|, we ask that RootWindow 257 // |parent|. If you pass a RootWindow to |context|, we ask that RootWindow
259 // where it wants your window placed.) NULL is not allowed if you are using 258 // where it wants your window placed.) NULL is not allowed if you are using
260 // aura. 259 // aura.
261 gfx::NativeWindow context; 260 gfx::NativeWindow context;
262 // If true, forces the window to be shown in the taskbar, even for window 261 // If true, forces the window to be shown in the taskbar, even for window
263 // types that do not appear in the taskbar by default (popup and bubble). 262 // types that do not appear in the taskbar by default (popup and bubble).
(...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after
980 bool movement_disabled_; 979 bool movement_disabled_;
981 980
982 ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver> observer_manager_; 981 ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver> observer_manager_;
983 982
984 DISALLOW_COPY_AND_ASSIGN(Widget); 983 DISALLOW_COPY_AND_ASSIGN(Widget);
985 }; 984 };
986 985
987 } // namespace views 986 } // namespace views
988 987
989 #endif // UI_VIEWS_WIDGET_WIDGET_H_ 988 #endif // UI_VIEWS_WIDGET_WIDGET_H_
OLDNEW
« no previous file with comments | « ui/views/widget/native_widget_mac_unittest.mm ('k') | ui/views/widget/widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698