Centralizes more shared code between ash and mash

ash/mus/bridge/wm_root_window_controller_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_root_window_controller_mus.h"
 
 #include "ash/mus/bridge/wm_shelf_mus.h"
 #include "ash/mus/bridge/wm_shell_mus.h"
 #include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/container_ids.h"
@@ skipping 57 matching lines @@
     const gfx::Point& point) const {
   gfx::Point result = point;
   result -= GetDisplay().bounds().OffsetFromOrigin();
   return target->GetRootWindow()->ConvertPointToTarget(target, result);
 }
 
 const display::Display& WmRootWindowControllerMus::GetDisplay() const {
   return root_window_controller_->display();
 }
 
+void WmRootWindowControllerMus::MoveWindowsTo(WmWindow* dest) {
+  WmRootWindowController::MoveWindowsTo(dest);
+}
+
 bool WmRootWindowControllerMus::HasShelf() {
   return GetShelf() != nullptr;
 }
 
 WmShell* WmRootWindowControllerMus::GetShell() {
   return shell_;
 }
 
-AlwaysOnTopController* WmRootWindowControllerMus::GetAlwaysOnTopController() {
-  return root_window_controller_->always_on_top_controller();
-}
-
 WmShelf* WmRootWindowControllerMus::GetShelf() {
   return root_window_controller_->wm_shelf();
 }
 
 WmWindow* WmRootWindowControllerMus::GetWindow() {
   return WmWindowMus::Get(root_window_controller_->root());
 }
 
 void WmRootWindowControllerMus::ConfigureWidgetInitParamsForContainer(
     views::Widget* widget,
@@ skipping 20 matching lines @@
 
 gfx::Point WmRootWindowControllerMus::GetLastMouseLocationInRoot() {
   gfx::Point location = root_window_controller_->window_manager()
                             ->window_tree_client()
                             ->GetCursorScreenPoint();
   location -=
       root_window_controller_->display().bounds().origin().OffsetFromOrigin();
   return location;
 }
 
+bool WmRootWindowControllerMus::ShouldDestroyWindowInCloseChildWindows(
+    WmWindow* window) {
+  ui::Window* ui_window = WmWindowMus::GetMusWindow(window);
+  return ui_window->WasCreatedByThisClient() ||
+         ui_window->window_tree()->GetRoots().count(ui_window);

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

Question for my knowledge: So we don't have a concept of not-owned-by-parent for
ui::Window?  (And that's what makes unit tests hard?)

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

Currently ui::Window doesn't own it's children, so not-owned-by-parent doesn't
apply to ui::Window. I filed 647513 for this. I see two possibilities:
. We change ownership of ui::Window to match aura::Window.
. We make WmWindowMus own it's children (to mirror aura).

But I may be misunderstanding your question. If you're asking why we can't make
tests have code like:

std::unique_ptr<WmWindow> window;

It's because WmWindow is owned by the corresponding ui::Window or aura::Window.
We could introduce a different ownership model e.g. something like
WINDOWS_OWNS_NATIVE_WINDOW and NATIVE_WINDOW_OWNS_WINDOW, but it would only be
for tests and result in a much different shutdown flow than is normally seen.

Does that answer your question?

+}
+
 }  // namespace mus
 }  // namespace ash