Centralizes more shared code between ash and mash

ash/mus/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/mus/root_window_controller.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
 #include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shell_window_ids.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/panels/panel_layout_manager.h"
 #include "ash/common/wm/root_window_layout_manager.h"
 #include "ash/common/wm/workspace/workspace_layout_manager.h"
 #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 36 matching lines @@
   disconnected_app_handler_.reset(new DisconnectedAppHandler(root));
 
   // Force a layout of the root, and its children, RootWindowLayout handles
   // both.
   wm_root_window_controller_->root_window_layout_manager()->OnWindowResized();
 
   for (size_t i = 0; i < kNumActivatableShellWindowIds; ++i) {
     window_manager_->window_manager_client()->AddActivationParent(
         GetWindowByShellWindowId(kActivatableShellWindowIds[i])->mus_window());
   }
-
-  WmWindowMus* always_on_top_container =
-      GetWindowByShellWindowId(kShellWindowId_AlwaysOnTopContainer);
-  always_on_top_controller_.reset(
-      new AlwaysOnTopController(always_on_top_container));
 }
 
 RootWindowController::~RootWindowController() {
-  wm_root_window_controller_->DeleteWorkspaceController();
+  Shutdown();
+  root_->Destroy();
+}
+
+void RootWindowController::Shutdown() {
+  // NOTE: Shutdown() may be called multiple times.
+  wm_root_window_controller_->ResetRootForNewWindowsIfNecessary();
+  wm_root_window_controller_->CloseChildWindows();
 }
 
 shell::Connector* RootWindowController::GetConnector() {
   return window_manager_->connector();
 }
 
 ui::Window* RootWindowController::NewTopLevelWindow(
     std::map<std::string, std::vector<uint8_t>>* properties) {
   // TODO(sky): panels need a different frame, http:://crbug.com/614362.
   const bool provide_non_client_frame =
@@ skipping 78 matching lines @@
   // Creating the shelf also creates the status area and both layout managers.
   wm_shelf_.reset(new WmShelfMus(wm_root_window_controller_->GetWindow()));
 
   WmWindowMus* default_container =
       GetWindowByShellWindowId(kShellWindowId_DefaultContainer);
   // WorkspaceLayoutManager is not a mash::wm::LayoutManager (it's a
   // wm::LayoutManager), so it can't be in |layout_managers_|.
   workspace_layout_manager_ = new WorkspaceLayoutManager(default_container);
   default_container->SetLayoutManager(
       base::WrapUnique(workspace_layout_manager_));
-
-  WmWindowMus* docked_container =
-      GetWindowByShellWindowId(kShellWindowId_DockedContainer);
-  std::unique_ptr<DockedWindowLayoutManager> docked_window_layout_manager =
-      base::MakeUnique<DockedWindowLayoutManager>(docked_container);
-  docked_window_layout_manager->SetShelf(wm_shelf_.get());
-  docked_window_layout_manager->AddObserver(wm_shelf_->shelf_layout_manager());
-  docked_container->SetLayoutManager(std::move(docked_window_layout_manager));
-
-  WmWindowMus* panel_container =
-      GetWindowByShellWindowId(kShellWindowId_PanelContainer);
-  std::unique_ptr<PanelLayoutManager> panel_layout_manager =
-      base::MakeUnique<PanelLayoutManager>(panel_container);
-  panel_layout_manager->SetShelf(wm_shelf_.get());
-  panel_container->SetLayoutManager(std::move(panel_layout_manager));
 }
 
 }  // namespace mus
 }  // namespace ash