Merges RootWindowControllerCommon into WmRootWindowController

ash/mus/root_window_controller.cc

Index: ash/mus/root_window_controller.cc
diff --git a/ash/mus/root_window_controller.cc b/ash/mus/root_window_controller.cc
index df4141fa8777d509a0b07875241353e3ad4c323e..116fe780592b6825b5fb910690a9479f9734ba93 100644
--- a/ash/mus/root_window_controller.cc
+++ b/ash/mus/root_window_controller.cc
@@ -13,7 +13,6 @@
 #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"
@@ -56,20 +55,18 @@ RootWindowController::RootWindowController(WindowManager* 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(
@@ -83,7 +80,7 @@ RootWindowController::RootWindowController(WindowManager* window_manager,
 }
 
 RootWindowController::~RootWindowController() {
-  root_window_controller_common_->DeleteWorkspaceController();
+  wm_root_window_controller_->DeleteWorkspaceController();
 }
 
 shell::Connector* RootWindowController::GetConnector() {