Folds WmRootWindowController into RootWindowController

ash/common/wm/window_positioning_utils.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/common/wm/window_positioning_utils.h"
 
 #include <algorithm>
 
 #include "ash/common/wm/system_modal_container_layout_manager.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_lookup.h"
-#include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/common/wm_window_tracker.h"
+#include "ash/root_window_controller.h"
 #include "ui/display/display.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace ash {
 namespace wm {
 
 namespace {
 
@@ skipping 103 matching lines @@
                        const display::Display& display) {
   DCHECK_NE(display::kInvalidDisplayId, display.id());
   // Don't move a window to other root window if:
   // a) the window is a transient window. It moves when its
   //    transient parent moves.
   // b) if the window or its ancestor has IsLockedToRoot(). It's intentionally
   //    kept in the same root window even if the bounds is outside of the
   //    display.
   if (!window->GetTransientParent() &&
       !IsWindowOrAncestorLockedToRoot(window)) {
-    WmRootWindowController* dst_root_window_controller =
+    RootWindowController* dst_root_window_controller =
         WmLookup::Get()->GetRootWindowControllerWithDisplayId(display.id());
     DCHECK(dst_root_window_controller);
     WmWindow* dst_root = dst_root_window_controller->GetWindow();
     DCHECK(dst_root);
     WmWindow* dst_container = nullptr;
     if (dst_root != window->GetRootWindow()) {
       int container_id = window->GetParent()->GetShellWindowId();
       // All containers that uses screen coordinates must have valid window ids.
       DCHECK_GE(container_id, 0);
       // Don't move modal background.
@@ skipping 41 matching lines @@
   }
   gfx::Point origin(bounds_in_screen.origin());
   const gfx::Point display_origin =
       window->GetDisplayNearestWindow().bounds().origin();
   origin.Offset(-display_origin.x(), -display_origin.y());
   window->SetBounds(gfx::Rect(origin, bounds_in_screen.size()));
 }
 
 }  // namespace wm
 }  // namespace ash