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

Unified Diff: ui/views/widget/widget.cc

Issue 282133005: Removes unnecessary views::Widget::InitParams::top_level (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/widget/widget.h ('k') | ui/views/widget/widget_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/widget.cc
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index a03bae6ca992e4330b0f097a997d871b9e24e171..b2ce42f2f431ddd8cb5228d70934dac736e9f31d 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -118,7 +118,6 @@ Widget::InitParams::InitParams()
parent(NULL),
native_widget(NULL),
desktop_window_tree_host(NULL),
- top_level(false),
layer_type(aura::WINDOW_LAYER_TEXTURED),
context(NULL),
force_show_in_taskbar(false) {
@@ -127,7 +126,7 @@ Widget::InitParams::InitParams()
Widget::InitParams::InitParams(Type type)
: type(type),
delegate(NULL),
- child(type == TYPE_CONTROL),
+ child(false),
opacity(INFER_OPACITY),
accept_events(true),
activatable(ACTIVATABLE_DEFAULT),
@@ -143,7 +142,6 @@ Widget::InitParams::InitParams(Type type)
parent(NULL),
native_widget(NULL),
desktop_window_tree_host(NULL),
- top_level(false),
layer_type(aura::WINDOW_LAYER_TEXTURED),
context(NULL),
force_show_in_taskbar(false) {
@@ -202,7 +200,6 @@ Widget* Widget::CreateWindowWithBounds(WidgetDelegate* delegate,
Widget::InitParams params;
params.bounds = bounds;
params.delegate = delegate;
- params.top_level = true;
widget->Init(params);
return widget;
}
@@ -332,11 +329,8 @@ void Widget::Init(const InitParams& in_params) {
TRACE_EVENT0("views", "Widget::Init");
InitParams params = in_params;
- is_top_level_ = params.top_level ||
- (!params.child &&
- params.type != InitParams::TYPE_CONTROL &&
- params.type != InitParams::TYPE_TOOLTIP);
- params.top_level = is_top_level_;
+ params.child |= (params.type == InitParams::TYPE_CONTROL);
+ is_top_level_ = (!params.child && params.type != InitParams::TYPE_TOOLTIP);
if (params.opacity == views::Widget::InitParams::INFER_OPACITY &&
params.type != views::Widget::InitParams::TYPE_WINDOW &&
« no previous file with comments | « ui/views/widget/widget.h ('k') | ui/views/widget/widget_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698