[Cleanup] Screen cleanup

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/ash_switches.h"
-#include "ash/screen_ash.h"
+#include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/window_resizer.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
@@ skipping 59 matching lines @@
 gfx::Rect GetWorkAreaForWindowInParent(aura::Window* window) {
 #if defined(OS_WIN)
   // On Win 8, the host window can't be resized, so
   // use window's bounds instead.
   // TODO(oshima): Emulate host window resize on win8.
   gfx::Rect work_area = gfx::Rect(window->parent()->bounds().size());
   work_area.Inset(Shell::GetScreen()->GetDisplayMatching(
       window->parent()->GetBoundsInScreen()).GetWorkAreaInsets());
   return work_area;
 #else
-  return ScreenAsh::GetDisplayWorkAreaBoundsInParent(window);
+  return ScreenUtil::GetDisplayWorkAreaBoundsInParent(window);
 #endif
 }
 
 // Move the given |bounds| on the available |work_area| in the direction
 // indicated by |move_right|. If |move_right| is true, the rectangle gets moved
 // to the right edge, otherwise to the left one.
 bool MoveRectToOneSide(const gfx::Rect& work_area,
                        bool move_right,
                        gfx::Rect* bounds) {
   if (move_right) {
@@ skipping 437 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