Merges RootWindowControllerCommon into WmRootWindowController

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/root_window_controller_common.h"
 #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"
@@ skipping 22 matching lines @@
 namespace ash {
 namespace mus {
 
 RootWindowController::RootWindowController(WindowManager* window_manager,
                                            ui::Window* root,
                                            const display::Display& display)
     : window_manager_(window_manager),
       root_(root),
       window_count_(0),
       display_(display) {
-  wm_root_window_controller_.reset(
-      new WmRootWindowControllerMus(window_manager_->shell(), this));
+  wm_root_window_controller_ = base::MakeUnique<WmRootWindowControllerMus>(

[msw, 2016/08/30 21:26:46]

nit: move to initializer list?

[sky, 2016/08/30 22:02:56]

I avoid that because of supplying 'this', but I think should be ok. Done.

+      window_manager_->shell(), this);
 
-  root_window_controller_common_.reset(
-      new RootWindowControllerCommon(WmWindowMus::Get(root_)));
-  root_window_controller_common_->CreateContainers();
-  root_window_controller_common_->CreateLayoutManagers();
+  wm_root_window_controller_->CreateContainers();
+  wm_root_window_controller_->CreateLayoutManagers();
   CreateLayoutManagers();
 
   disconnected_app_handler_.reset(new DisconnectedAppHandler(root));
 
   // Force a layout of the root, and its children, RootWindowLayout handles
   // both.
-  root_window_controller_common_->root_window_layout()->OnWindowResized();
+  wm_root_window_controller_->root_window_layout()->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() {
-  root_window_controller_common_->DeleteWorkspaceController();
+  wm_root_window_controller_->DeleteWorkspaceController();
 }
 
 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 97 matching lines @@
   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