Removes WmRootWindowController subclasses

ash/common/wm_root_window_controller.cc

Index: ash/common/wm_root_window_controller.cc
diff --git a/ash/common/wm_root_window_controller.cc b/ash/common/wm_root_window_controller.cc
index 9063e9519dc0537e2aedc729afbc1ad680e738c9..f52ef3fe720607effa84a3bf3cd06fae6c554602 100644
--- a/ash/common/wm_root_window_controller.cc
+++ b/ash/common/wm_root_window_controller.cc
@@ -27,7 +27,12 @@
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
+#include "ash/root_window_controller.h"
+#include "ash/shell.h"
 #include "base/memory/ptr_util.h"
+#include "ui/aura/env.h"
+#include "ui/aura/mus/window_mus.h"
+#include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
@@ -151,7 +156,10 @@ WmWindow* CreateContainer(int window_id, const char* name, WmWindow* parent) {
 
 }  // namespace
 
-WmRootWindowController::WmRootWindowController(WmWindow* root) : root_(root) {}
+WmRootWindowController::WmRootWindowController(
+    RootWindowController* root_window_controller,
+    WmWindow* root)
+    : root_window_controller_(root_window_controller), root_(root) {}

[James Cook, 2017/01/10 22:41:13]

nit: either DCHECK root_window_controller and root here, or document in header
that they cannot be null

[sky, 2017/01/10 23:06:56]

Done.

 
 WmRootWindowController::~WmRootWindowController() {
   if (animating_wallpaper_widget_controller_.get())
@@ -199,6 +207,14 @@ WmRootWindowController::GetSystemModalLayoutManager(WmWindow* window) {
                          : nullptr;
 }
 
+bool WmRootWindowController::HasShelf() {
+  return GetShelf()->shelf_widget() != nullptr;
+}
+
+WmShelf* WmRootWindowController::GetShelf() {
+  return root_window_controller_->wm_shelf();
+}
+
 void WmRootWindowController::CreateShelf() {
   WmShelf* shelf = GetShelf();
   if (shelf->IsShelfInitialized())
@@ -237,6 +253,10 @@ SystemTray* WmRootWindowController::GetSystemTray() {
   return shelf_widget->status_area_widget()->system_tray();
 }
 
+WmWindow* WmRootWindowController::GetWindow() {
+  return root_;
+}
+
 WmWindow* WmRootWindowController::GetContainer(int container_id) {
   return root_->GetChildByShellWindowId(container_id);
 }
@@ -301,10 +321,13 @@ void WmRootWindowController::ShowContextMenu(
                               views::MENU_ANCHOR_TOPLEFT, source_type));
 }
 
-void WmRootWindowController::OnInitialWallpaperAnimationStarted() {}
+void WmRootWindowController::OnInitialWallpaperAnimationStarted() {
+  root_window_controller_->OnInitialWallpaperAnimationStarted();
+}
 
 void WmRootWindowController::OnWallpaperAnimationFinished(
     views::Widget* widget) {
+  root_window_controller_->OnWallpaperAnimationFinished(widget);
   WmShell::Get()->wallpaper_delegate()->OnWallpaperAnimationFinished();
   // Only removes old component when wallpaper animation finished. If we
   // remove the old one before the new wallpaper is done fading in there will
@@ -626,6 +649,20 @@ void WmRootWindowController::CloseChildWindows() {
     shelf->ShutdownShelf();
 }
 
+bool WmRootWindowController::ShouldDestroyWindowInCloseChildWindows(
+    WmWindow* window) {
+  if (!WmWindowAura::GetAuraWindow(window)->owned_by_parent())
+    return false;
+
+  if (aura::Env::GetInstance()->mode() == aura::Env::Mode::LOCAL)
+    return true;
+
+  aura::WindowMus* window_mus =
+      aura::WindowMus::Get(WmWindowAura::GetAuraWindow(window));
+  return Shell::window_tree_client()->WasCreatedByThisClient(window_mus) ||
+         Shell::window_tree_client()->IsRoot(window_mus);
+}
+
 void WmRootWindowController::OnMenuClosed() {
   menu_runner_.reset();
   menu_model_adapter_.reset();