mash: remove more shell/shelf WmWindow usage.

ash/wm/window_positioner.cc

 // Copyright 2013 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_positioner.h"
 
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/wm/mru_window_tracker.h"
@@ skipping 201 matching lines @@
 }
 
 // static
 void WindowPositioner::GetBoundsAndShowStateForNewWindow(
     const WmWindow* new_window,
     bool is_saved_bounds,
     ui::WindowShowState show_state_in,
     gfx::Rect* bounds_in_out,
     ui::WindowShowState* show_state_out) {
   // Always open new window in the target display.
-  WmWindow* target = Shell::GetWmRootWindowForNewWindows();
+  aura::Window* target = Shell::GetRootWindowForNewWindows();
 
-  WmWindow* top_window = GetReferenceWindow(target, nullptr, nullptr);
+  WmWindow* top_window =
+      GetReferenceWindow(WmWindow::Get(target), nullptr, nullptr);
   // Our window should not have any impact if we are already on top.
   if (top_window == new_window)
     top_window = nullptr;
 
   // If there is no valid other window we take and adjust the passed coordinates
   // and show state.
   if (!top_window) {
-    gfx::Rect work_area = target->GetDisplayNearestWindow().work_area();
+    gfx::Rect work_area = display::Screen::GetScreen()
+                              ->GetDisplayNearestWindow(target)
+                              .work_area();
 
     bounds_in_out->AdjustToFit(work_area);
     // Use adjusted saved bounds, if there is one.
     if (is_saved_bounds)
       return;
 
     if (show_state_in == ui::SHOW_STATE_DEFAULT) {
       const bool maximize_first_window_on_first_run =
           ShellPort::Get()->IsForceMaximizeOnFirstRun();
       // We want to always open maximized on "small screens" or when policy
@@ skipping 24 matching lines @@
     if (has_restore_bounds) {
       // For a maximized/fullscreen window ignore the real bounds of
       // the top level window and use its restore bounds
       // instead. Offset the bounds to prevent the windows from
       // overlapping exactly when restored.
       *bounds_in_out =
           top_window_state->GetRestoreBoundsInScreen() +
           gfx::Vector2d(kMinimumWindowOffset, kMinimumWindowOffset);
     }
     if (is_saved_bounds || has_restore_bounds) {
-      gfx::Rect work_area = target->GetDisplayNearestWindow().work_area();
+      gfx::Rect work_area = display::Screen::GetScreen()
+                                ->GetDisplayNearestWindow(target)
+                                .work_area();
       bounds_in_out->AdjustToFit(work_area);
       // Use adjusted saved bounds or restore bounds, if there is one.
       return;
     }
   }
 
   // Use the size of the other window. The window's bound will be rearranged
   // in ash::WorkspaceLayoutManager using this location.
   *bounds_in_out = top_window->GetBoundsInScreen();
 }
@@ skipping 270 matching lines @@
   // If the alignment was pushing the window out of the screen, we ignore the
   // alignment for that call.
   if (abs(pos.right() - work_area.right()) < grid)
     x = work_area.right() - w;
   if (abs(pos.bottom() - work_area.bottom()) < grid)
     y = work_area.bottom() - h;
   return gfx::Rect(x, y, w, h);
 }
 
 }  // namespace ash