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

Unified Diff: ui/views/mus/native_widget_mus.cc

Issue 2484813002: Add child for parent_mus when params.parent_mus is not initialized. (Closed)
Patch Set: Discard this patchset. Wrong branch committed. Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/mus/window_manager_ash_unittest.cc ('k') | ui/views/mus/native_widget_mus_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/native_widget_mus.cc
diff --git a/ui/views/mus/native_widget_mus.cc b/ui/views/mus/native_widget_mus.cc
index bfce92136a3e543ab7ce4bb89e6533b7ddb9f097..77aa5df24fd08bf131bfd1cd0eaad91653412c25 100644
--- a/ui/views/mus/native_widget_mus.cc
+++ b/ui/views/mus/native_widget_mus.cc
@@ -775,16 +775,21 @@ void NativeWidgetMus::InitNativeWidget(const Widget::InitParams& params) {
content_->set_ignore_events(!params.accept_events);
hosted_window->AddChild(content_);
+ ui::Window* parent_mus = params.parent_mus;
+
// Set-up transiency if appropriate.
if (params.parent && !params.child) {
- aura::Window* parent_root = params.parent->GetRootWindow();
- ui::Window* parent_mus = parent_root->GetProperty(kMusWindow);
- if (parent_mus)
- parent_mus->AddTransientWindow(window_);
+ aura::Window* parent_root_aura = params.parent->GetRootWindow();
+ ui::Window* parent_root_mus = parent_root_aura->GetProperty(kMusWindow);
+ if (parent_root_mus) {
+ parent_root_mus->AddTransientWindow(window_);
+ if (!parent_mus)
+ parent_mus = parent_root_mus;
+ }
}
- if (params.parent_mus)
- params.parent_mus->AddChild(window_);
+ if (parent_mus)
+ parent_mus->AddChild(window_);
// TODO(sky): deal with show state.
if (!params.bounds.size().IsEmpty())
« no previous file with comments | « ash/mus/window_manager_ash_unittest.cc ('k') | ui/views/mus/native_widget_mus_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698