Folds WmRootWindowController into RootWindowController

ash/aura/wm_window_aura.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/aura/wm_window_aura.h"
 
 #include "ash/aura/aura_layout_manager_adapter.h"
 #include "ash/aura/wm_shell_aura.h"
 #include "ash/common/ash_constants.h"
 #include "ash/common/shelf/shelf_item_types.h"
@@ skipping 132 matching lines @@
 
 void WmWindowAura::Destroy() {
   delete window_;
   // WARNING: this has been deleted.
 }
 
 const WmWindow* WmWindowAura::GetRootWindow() const {
   return Get(window_->GetRootWindow());
 }
 
-WmRootWindowController* WmWindowAura::GetRootWindowController() {
+RootWindowController* WmWindowAura::GetRootWindowController() {
   aura::Window* root = window_->GetRootWindow();
-  if (!root)
-    return nullptr;
-
-  RootWindowController* rwc = RootWindowController::ForWindow(root);
-  return rwc ? rwc->wm_root_window_controller() : nullptr;
+  return root ? RootWindowController::ForWindow(root) : nullptr;
 }
 
 WmShell* WmWindowAura::GetShell() const {
   return WmShell::Get();
 }
 
 void WmWindowAura::SetName(const char* name) {
   window_->SetName(name);
 }
 
@@ skipping 825 matching lines @@
     observer.OnTransientChildAdded(this, Get(transient));
 }
 
 void WmWindowAura::OnTransientChildRemoved(aura::Window* window,
                                            aura::Window* transient) {
   for (auto& observer : transient_observers_)
     observer.OnTransientChildRemoved(this, Get(transient));
 }
 
 }  // namespace ash