Folds WmRootWindowController into RootWindowController

ash/mus/bridge/wm_window_mus.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/bridge/wm_window_mus.h"
 
 #include "ash/common/shelf/shelf_item_types.h"
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/window_positioning_utils.h"
 #include "ash/common/wm/window_state.h"
@@ skipping 43 matching lines @@
 
 // static
 WmWindowMus* WmWindowMus::Get(views::Widget* widget) {
   return WmWindowMus::Get(widget->GetNativeView());
 }
 
 bool WmWindowMus::IsContainer() const {
   return GetShellWindowId() != kShellWindowId_Invalid;
 }
 
-WmRootWindowController* WmWindowMus::GetRootWindowController() {
+ash::RootWindowController* WmWindowMus::GetRootWindowController() {
   return RootWindowController::ForWindow(aura_window())
-      ->ash_root_window_controller()
-      ->wm_root_window_controller();
+      ->ash_root_window_controller();
 }
 
 WmShell* WmWindowMus::GetShell() const {
   return WmShellMus::Get();
 }
 
 void WmWindowMus::CloseWidget() {
   // NOTE: in the FOR_CLIENT case there is not necessarily a widget associated
   // with the window. Mash only creates widgets for top level windows if mash
   // renders the non-client frame.
   if (aura_window()->GetProperty(kWidgetCreationTypeKey) ==
       WidgetCreationType::FOR_CLIENT) {
     WmShellMus::Get()->window_manager()->window_manager_client()->RequestClose(
         aura_window());
   } else {
     WmWindowAura::CloseWidget();
   }
 }
 
 void WmWindowMus::AddLimitedPreTargetHandler(ui::EventHandler* handler) {
   DCHECK(WmShellMus::Get()->window_tree_client()->WasCreatedByThisClient(
       aura::WindowMus::Get(aura_window())));
   WmWindowAura::AddLimitedPreTargetHandler(handler);
 }
 
 }  // namespace mus
 }  // namespace ash