Removes WmRootWindowController subclasses

ash/common/wm_root_window_controller.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/common/wm_root_window_controller.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/shelf_widget.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/system/status_area_widget.h"
 #include "ash/common/wallpaper/wallpaper_delegate.h"
 #include "ash/common/wallpaper/wallpaper_widget_controller.h"
 #include "ash/common/wm/always_on_top_controller.h"
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/dock/docked_window_layout_manager.h"
 #include "ash/common/wm/lock_layout_manager.h"
 #include "ash/common/wm/panels/panel_layout_manager.h"
 #include "ash/common/wm/root_window_layout_manager.h"
 #include "ash/common/wm/system_modal_container_layout_manager.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_snap_to_pixel_layout_manager.h"
 #include "ash/common/wm/workspace/workspace_layout_manager.h"
 #include "ash/common/wm/workspace_controller.h"
 #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"
 #include "ui/base/models/menu_model.h"
 #include "ui/events/event_targeter.h"
 #include "ui/events/event_utils.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 
 namespace ash {
@@ skipping 103 matching lines @@
   window->SetShellWindowId(window_id);
   window->SetName(name);
   parent->AddChild(window);
   if (window_id != kShellWindowId_UnparentedControlContainer)
     window->Show();
   return window;
 }
 
 }  // 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())
     animating_wallpaper_widget_controller_->StopAnimating();
 }
 
 void WmRootWindowController::SetWallpaperWidgetController(
     WallpaperWidgetController* controller) {
   wallpaper_widget_controller_.reset(controller);
 }
@@ skipping 27 matching lines @@
         WmShell::Get()->GetSessionStateDelegate()->IsUserSessionBlocked()
             ? kShellWindowId_LockSystemModalContainer
             : kShellWindowId_SystemModalContainer;
     modal_container = GetContainer(modal_window_id);
   }
   return modal_container ? static_cast<SystemModalContainerLayoutManager*>(
                                modal_container->GetLayoutManager())
                          : 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())
     return;
   shelf->InitializeShelf();
 
   if (panel_layout_manager_)
     panel_layout_manager_->SetShelf(shelf);
   if (docked_window_layout_manager_) {
     docked_window_layout_manager_->SetShelf(shelf);
@@ skipping 18 matching lines @@
   shelf->shelf_widget()->status_area_widget()->Show();
 }
 
 SystemTray* WmRootWindowController::GetSystemTray() {
   ShelfWidget* shelf_widget = GetShelf()->shelf_widget();
   if (!shelf_widget || !shelf_widget->status_area_widget())
     return nullptr;
   return shelf_widget->status_area_widget()->system_tray();
 }
 
+WmWindow* WmRootWindowController::GetWindow() {
+  return root_;
+}
+
 WmWindow* WmRootWindowController::GetContainer(int container_id) {
   return root_->GetChildByShellWindowId(container_id);
 }
 
 const WmWindow* WmRootWindowController::GetContainer(int container_id) const {
   return root_->GetChildByShellWindowId(container_id);
 }
 
 void WmRootWindowController::ConfigureWidgetInitParamsForContainer(
     views::Widget* widget,
@@ skipping 44 matching lines @@
 
   menu_runner_.reset(new views::MenuRunner(
       menu_model_adapter_->CreateMenu(),
       views::MenuRunner::CONTEXT_MENU | views::MenuRunner::ASYNC));
   ignore_result(
       menu_runner_->RunMenuAt(wallpaper_widget_controller()->widget(), nullptr,
                               gfx::Rect(location_in_screen, gfx::Size()),
                               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
   // be a white flash during the animation.
   if (animating_wallpaper_widget_controller()) {
     WallpaperWidgetController* controller =
         animating_wallpaper_widget_controller()->GetController(true);
     DCHECK_EQ(controller->widget(), widget);
     // Release the old controller and close its wallpaper widget.
     SetWallpaperWidgetController(controller);
@@ skipping 301 matching lines @@
   }
 
   shelf->DestroyShelfWidget();
 
   // CloseChildWindows() may be called twice during the shutdown of ash
   // unittests. Avoid notifying WmShelf that the shelf has been destroyed twice.
   if (shelf->IsShelfInitialized())
     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();
   menu_model_.reset();
   GetShelf()->UpdateVisibilityState();
 }
 
 }  // namespace ash