chromeos: gets rid of wm_screen_util

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"
 #include "ash/wm/window_positioning_utils.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
-#include "ash/wm/wm_screen_util.h"
 #include "ash/wm_window.h"
 #include "ui/compositor/layer.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/insets.h"
 
 namespace ash {
 
 const int WindowPositioner::kMinimumWindowOffset = 32;
 
@@ skipping 103 matching lines @@
   gfx::Rect old_bounds = window->GetTargetBounds();
   if (bounds == old_bounds)
     return;
   gfx::Vector2d offset(bounds.origin() - old_bounds.origin());
   SetBoundsAndOffsetTransientChildren(window, bounds, work_area, offset);
 }
 
 // Move |window| into the center of the screen - or restore it to the previous
 // position.
 void AutoPlaceSingleWindow(WmWindow* window, bool animated) {
-  gfx::Rect work_area = wm::GetDisplayWorkAreaBoundsInParent(window);
+  gfx::Rect work_area =
+      ScreenUtil::GetDisplayWorkAreaBoundsInParent(window->aura_window());
   gfx::Rect bounds = window->GetBounds();
   const gfx::Rect* user_defined_area =
       window->GetWindowState()->pre_auto_manage_window_bounds();
   if (user_defined_area) {
     bounds = *user_defined_area;
     wm::AdjustBoundsToEnsureMinimumWindowVisibility(work_area, &bounds);
   } else {
     // Center the window (only in x).
     bounds.set_x(work_area.x() + (work_area.width() - bounds.width()) / 2);
   }
@@ skipping 162 matching lines @@
 // static
 void WindowPositioner::RearrangeVisibleWindowOnShow(WmWindow* added_window) {
   wm::WindowState* added_window_state = added_window->GetWindowState();
   if (!added_window->GetTargetVisibility())
     return;
 
   if (!UseAutoWindowManager(added_window) ||
       added_window_state->bounds_changed_by_user()) {
     if (added_window_state->minimum_visibility()) {
       // Guarantee minimum visibility within the work area.
-      gfx::Rect work_area = wm::GetDisplayWorkAreaBoundsInParent(added_window);
+      gfx::Rect work_area = ScreenUtil::GetDisplayWorkAreaBoundsInParent(
+          added_window->aura_window());
       gfx::Rect bounds = added_window->GetBounds();
       gfx::Rect new_bounds = bounds;
       wm::AdjustBoundsToEnsureMinimumWindowVisibility(work_area, &new_bounds);
       if (new_bounds != bounds)
         added_window->SetBounds(new_bounds);
     }
     return;
   }
   // Find a single open managed window.
   bool single_window;
   WmWindow* other_shown_window = GetReferenceWindow(
       added_window->GetRootWindow(), added_window, &single_window);
 
   if (!other_shown_window) {
     // It could be that this window is the first window joining the workspace.
     if (!WindowPositionCanBeManaged(added_window) || other_shown_window)
       return;
     // Since we might be going from 0 to 1 window, we have to arrange the new
     // window to a good default.
     AutoPlaceSingleWindow(added_window, false);
     return;
   }
 
   gfx::Rect other_bounds = other_shown_window->GetBounds();
-  gfx::Rect work_area = wm::GetDisplayWorkAreaBoundsInParent(added_window);
+  gfx::Rect work_area =
+      ScreenUtil::GetDisplayWorkAreaBoundsInParent(added_window->aura_window());
   bool move_other_right =
       other_bounds.CenterPoint().x() > work_area.x() + work_area.width() / 2;
 
   // Push the other window to the size only if there are two windows left.
   if (single_window) {
     // When going from one to two windows both windows loose their
     // "positioned by user" flags.
     added_window_state->set_bounds_changed_by_user(false);
     wm::WindowState* other_window_state = other_shown_window->GetWindowState();
     other_window_state->set_bounds_changed_by_user(false);
@@ skipping 199 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