Centralizes more shared code between ash and mash

ash/mus/bridge/wm_window_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 "ash/mus/bridge/wm_window_mus.h"
 
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/window_positioning_utils.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_layout_manager.h"
@@ skipping 143 matching lines @@
 bool WmWindowMus::ShouldUseExtendedHitRegion() const {
   const WmWindowMus* parent = Get(window_->parent());
   return parent && parent->children_use_extended_hit_region_;
 }
 
 bool WmWindowMus::IsContainer() const {
   return GetShellWindowId() != kShellWindowId_Invalid;
 }
 
 void WmWindowMus::Destroy() {
+  // TODO(sky): to match aura behavior this should delete children.

[James Cook, 2016/09/21 22:03:19]

Are we going to leak windows at shutdown until this is fixed? If so this
probably should have a tracking bug.

[sky, 2016/09/21 22:47:49]

Indeed. Added pointer to bug.

   window_->Destroy();
   // WARNING: this has been deleted.
 }
 
 const WmWindow* WmWindowMus::GetRootWindow() const {
   return Get(window_->GetRoot());
 }
 
 WmRootWindowController* WmWindowMus::GetRootWindowController() {
   return GetRootWindowControllerMus();
@@ skipping 263 matching lines @@
 
 void WmWindowMus::SetParentUsingContext(WmWindow* context,
                                         const gfx::Rect& screen_bounds) {
   wm::GetDefaultParent(context, this, screen_bounds)->AddChild(this);
 }
 
 void WmWindowMus::AddChild(WmWindow* window) {
   window_->AddChild(GetMusWindow(window));
 }
 
+void WmWindowMus::RemoveChild(WmWindow* child) {
+  window_->RemoveChild(GetMusWindow(child));
+}
+
 const WmWindow* WmWindowMus::GetParent() const {
   return Get(window_->parent());
 }
 
 const WmWindow* WmWindowMus::GetTransientParent() const {
   return Get(window_->transient_parent());
 }
 
 std::vector<WmWindow*> WmWindowMus::GetTransientChildren() {
   return FromMusWindows(window_->transient_children());
@@ skipping 466 matching lines @@
 }
 
 void WmWindowMus::OnTransientChildRemoved(ui::Window* window,
                                           ui::Window* transient) {
   FOR_EACH_OBSERVER(WmTransientWindowObserver, transient_observers_,
                     OnTransientChildRemoved(this, Get(transient)));
 }
 
 }  // namespace mus
 }  // namespace ash