Folds WmRootWindowController into RootWindowController

ash/wm/window_util.cc

 // Copyright (c) 2012 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/wm/window_util.h"
 
 #include <vector>
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/ash_constants.h"
 #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"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
@@ skipping 41 matching lines @@
 }
 
 bool MoveWindowToEventRoot(aura::Window* window, const ui::Event& event) {
   views::View* target = static_cast<views::View*>(event.target());
   if (!target)
     return false;
   aura::Window* target_root =
       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;
 }
 
 void SnapWindowToPixelBoundary(aura::Window* window) {
   aura::Window* snapped_ancestor = window->parent();
   while (snapped_ancestor) {
     if (snapped_ancestor->GetProperty(kSnapChildrenToPixelBoundary)) {
       ui::SnapLayerToPhysicalPixelBoundary(snapped_ancestor->layer(),
                                            window->layer());
       return;
     }
     snapped_ancestor = snapped_ancestor->parent();
   }
 }
 
 void SetSnapsChildrenToPhysicalPixelBoundary(aura::Window* container) {
   DCHECK(!container->GetProperty(kSnapChildrenToPixelBoundary))
       << container->GetName();
   container->SetProperty(kSnapChildrenToPixelBoundary, true);
 }
 
 }  // namespace wm
 }  // namespace ash