Folds WmRootWindowController into RootWindowController

ash/mus/window_manager.cc

 // Copyright 2015 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/window_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/window_state.h"
-#include "ash/common/wm_root_window_controller.h"
 #include "ash/display/screen_position_controller.h"
 #include "ash/mus/accelerators/accelerator_handler.h"
 #include "ash/mus/accelerators/accelerator_ids.h"
 #include "ash/mus/bridge/wm_lookup_mus.h"
 #include "ash/mus/bridge/wm_shell_mus.h"
 #include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/move_event_handler.h"
 #include "ash/mus/non_client_frame_controller.h"
 #include "ash/mus/property_util.h"
 #include "ash/mus/root_window_controller.h"
 #include "ash/mus/screen_mus.h"
 #include "ash/mus/shadow_controller.h"
 #include "ash/mus/shell_delegate_mus.h"
 #include "ash/mus/window_manager_observer.h"
 #include "ash/mus/window_properties.h"
 #include "ash/public/cpp/shell_window_ids.h"
+#include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/wm/ash_focus_rules.h"
 #include "ash/wm/event_client_impl.h"
 #include "ash/wm/window_properties.h"
 #include "base/memory/ptr_util.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/common/accelerator_util.h"
 #include "services/ui/common/types.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/interfaces/constants.mojom.h"
@@ skipping 183 matching lines @@
 
   std::unique_ptr<RootWindowController> root_window_controller_ptr(
       new RootWindowController(this, std::move(window_tree_host), display,
                                root_window_type));
   RootWindowController* root_window_controller =
       root_window_controller_ptr.get();
   root_window_controllers_.insert(std::move(root_window_controller_ptr));
 
   // TODO: this should be called when logged in. See http://crbug.com/654606.
   root_window_controller->ash_root_window_controller()
-      ->wm_root_window_controller()
       ->CreateShelf();
 
   for (auto& observer : observers_)
     observer.OnRootWindowControllerAdded(root_window_controller);
 
   for (auto& observer : *screen_->display_list().observers())
     observer.OnDisplayAdded(root_window_controller->display());
 
   return root_window_controller;
 }
@@ skipping 269 matching lines @@
 
 void WindowManager::OnWindowInitialized(aura::Window* window) {
   // This ensures WmWindowAura won't be called before WmWindowMus. This is
   // important as if WmWindowAura::Get() is called first, then WmWindowAura
   // would be created, not WmWindowMus.
   WmWindowMus::Get(window);
 }
 
 }  // namespace mus
 }  // namespace ash