Folds WmRootWindowController into RootWindowController

ash/wm/window_util.cc

Index: ash/wm/window_util.cc
diff --git a/ash/wm/window_util.cc b/ash/wm/window_util.cc
index 6700bf09a08380d064fad71141bec9fcc3033e56..38cb68265040d0c26e31b83e829521e9d7ef5ff8 100644
--- a/ash/wm/window_util.cc
+++ b/ash/wm/window_util.cc
@@ -11,8 +11,7 @@
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm/wm_screen_util.h"
-#include "ash/common/wm_root_window_controller.h"
-#include "ash/common/wm_window.h"
+#include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state_aura.h"
@@ -74,11 +73,10 @@ bool MoveWindowToEventRoot(aura::Window* window, const ui::Event& event) {
       target->GetWidget()->GetNativeView()->GetRootWindow();
   if (!target_root || target_root == window->GetRootWindow())
     return false;
-  WmWindow* window_container = WmWindowAura::Get(target_root)
-                                   ->GetRootWindowController()
-                                   ->GetContainer(window->parent()->id());
+  aura::Window* window_container = RootWindowController::ForWindow(target_root)
+                                       ->GetContainer(window->parent()->id());
   // Move the window to the target launcher.
-  window_container->AddChild(WmWindowAura::Get(window));
+  window_container->AddChild(window);
   return true;
 }