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

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

Issue 12212136: Ensures Widget::InitParams::top_level is set correctly before calling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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/test/test_views_delegate.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 ee03493bcaf374bd4d523c4aa91e023a8988a5b4..49c4486542a1d33a82e11bd1e7ff1616ab9f6890 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -338,13 +338,16 @@ bool Widget::RequiresNonClientView(InitParams::Type type) {
void Widget::Init(const InitParams& in_params) {
InitParams params = in_params;
- if (ViewsDelegate::views_delegate)
- ViewsDelegate::views_delegate->OnBeforeWidgetInit(&params, this);
is_top_level_ = params.top_level ||
(!params.child &&
params.type != InitParams::TYPE_CONTROL &&
params.type != InitParams::TYPE_TOOLTIP);
+ params.top_level = is_top_level_;
+
+ if (ViewsDelegate::views_delegate)
+ ViewsDelegate::views_delegate->OnBeforeWidgetInit(&params, this);
+
widget_delegate_ = params.delegate ?
params.delegate : new DefaultWidgetDelegate(this, params);
ownership_ = params.ownership;
« no previous file with comments | « ui/views/test/test_views_delegate.h ('k') | ui/views/widget/widget_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698