Wires up transients for DesktopWindowTreeHostMus

ui/views/mus/desktop_window_tree_host_mus.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/mus/desktop_window_tree_host_mus.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/client/focus_client.h"
@@ skipping 28 matching lines @@
 bool DesktopWindowTreeHostMus::IsDocked() const {
   return window()->GetProperty(aura::client::kShowStateKey) ==
          ui::SHOW_STATE_DOCKED;
 }
 
 void DesktopWindowTreeHostMus::Init(aura::Window* content_window,
                                     const Widget::InitParams& params) {}
 
 void DesktopWindowTreeHostMus::OnNativeWidgetCreated(
     const Widget::InitParams& params) {
+  if (params.parent && params.parent->GetHost()) {
+    parent_ = static_cast<DesktopWindowTreeHostMus*>(params.parent->GetHost());
+    DCHECK(parent_);

[msw, 2016/11/04 23:21:43]

nit: seems unnecessary to DCHECK a non-null value that's just been
static-casted, and is about to be dereferenced, but I'll leave it up to you.

[sky, 2016/11/04 23:30:50]

Done.

+    parent_->children_.insert(this);
+  }
   native_widget_delegate_->OnNativeWidgetCreated(true);
 }
 
 std::unique_ptr<corewm::Tooltip> DesktopWindowTreeHostMus::CreateTooltip() {
   return base::MakeUnique<corewm::TooltipAura>();
 }
 
 std::unique_ptr<aura::client::DragDropClient>
 DesktopWindowTreeHostMus::CreateDragDropClient(
     DesktopNativeCursorManager* cursor_manager) {
   // aura-mus handles installing a DragDropClient.
   return nullptr;
 }
 
 void DesktopWindowTreeHostMus::Close() {
   if (close_widget_factory_.HasWeakPtrs())
     return;
 
   // Close doesn't delete this immediately, as 'this' may still be on the stack
   // resulting in possible crashes when the stack unwindes.
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&DesktopWindowTreeHostMus::CloseNow,
                             close_widget_factory_.GetWeakPtr()));
 }
 
 void DesktopWindowTreeHostMus::CloseNow() {
+  // If we have children, close them. Use a copy for iteration because they'll
+  // remove themselves from |children_|.
+  std::set<DesktopWindowTreeHostMus*> children_copy = children_;
+  for (DesktopWindowTreeHostMus* child : children_copy)

[msw, 2016/11/04 23:21:43]

totally optional nit: convert the corresponding DesktopWindowTreeHostX11 code to
better match this (member names, for-range loop, comments, etc.) or vice versa.

[sky, 2016/11/04 23:30:50]

I'm leaving that code alone.

+    child->CloseNow();
+  DCHECK(children_.empty());
+
+  if (parent_) {
+    parent_->children_.erase(this);
+    parent_ = nullptr;
+  }
+
   native_widget_delegate_->OnNativeWidgetDestroying();

[msw, 2016/11/04 23:21:43]

q: DesktopWindowTreeHostX11 orders this before child/parent destruction, is
there a reason they should differ?

[sky, 2016/11/04 23:30:50]

Good catch. Updated.

   DestroyCompositor();
   desktop_native_widget_aura_->OnHostClosed();
 }
 
 aura::WindowTreeHost* DesktopWindowTreeHostMus::AsWindowTreeHost() {
   return this;
 }
 
 void DesktopWindowTreeHostMus::ShowWindowWithState(ui::WindowShowState state) {
   if (state == ui::SHOW_STATE_MAXIMIZED || state == ui::SHOW_STATE_FULLSCREEN ||
@@ skipping 250 matching lines @@
   Widget* widget = native_widget_delegate_->AsWidget();
   window()->SetProperty(aura::client::kCanMaximizeKey,
                         widget->widget_delegate()->CanMaximize());
   window()->SetProperty(aura::client::kCanMinimizeKey,
                         widget->widget_delegate()->CanMinimize());
   window()->SetProperty(aura::client::kCanResizeKey,
                         widget->widget_delegate()->CanResize());
 }
 
 }  // namespace views