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

Unified Diff: views/widget/native_widget_views.cc

Issue 7979035: Fix for black-hole. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix more tests, reset non_client_view when new contentview is 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | views/widget/widget.cc » ('j') | views/widget/widget.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/widget/native_widget_views.cc
diff --git a/views/widget/native_widget_views.cc b/views/widget/native_widget_views.cc
index bd0e56ff65036df5e86c853bb5959f810157c44b..9216383daabb8f8813edb29e2157e6948414c6f7 100644
--- a/views/widget/native_widget_views.cc
+++ b/views/widget/native_widget_views.cc
@@ -119,7 +119,8 @@ void NativeWidgetViews::InitNativeWidget(const Widget::InitParams& params) {
if (params.parent_widget) {
parent_view = params.parent_widget->GetChildViewParent();
} else if (ViewsDelegate::views_delegate &&
- ViewsDelegate::views_delegate->GetDefaultParentView()) {
+ ViewsDelegate::views_delegate->GetDefaultParentView() &&
+ !params.child) {
parent_view = ViewsDelegate::views_delegate->GetDefaultParentView();
} else if (params.parent) {
Widget* widget = Widget::GetWidgetForNativeView(params.parent);
« no previous file with comments | « no previous file | views/widget/widget.cc » ('j') | views/widget/widget.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698