[Cleanup] Screen cleanup

ash/wm/overview/window_overview.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/overview/window_overview.h"
 
 #include <algorithm>
 
 #include "ash/metrics/user_metrics_recorder.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/overview/scoped_transform_overview_window.h"
 #include "ash/wm/overview/window_selector.h"
 #include "ash/wm/overview/window_selector_item.h"
 #include "base/metrics/histogram.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/root_window.h"
@@ skipping 345 matching lines @@
   PositionWindowsOnRoot(root_window, windows);
 }
 
 void WindowOverview::PositionWindowsOnRoot(
     aura::Window* root_window,
     const std::vector<WindowSelectorItem*>& windows) {
   if (windows.empty())
     return;
 
   gfx::Size window_size;
-  gfx::Rect total_bounds = ScreenAsh::ConvertRectToScreen(root_window,
-      ScreenAsh::GetDisplayWorkAreaBoundsInParent(
+  gfx::Rect total_bounds = ScreenUtil::ConvertRectToScreen(root_window,
+      ScreenUtil::GetDisplayWorkAreaBoundsInParent(
       Shell::GetContainer(root_window,
                           internal::kShellWindowId_DefaultContainer)));
 
   // Find the minimum number of windows per row that will fit all of the
   // windows on screen.
   size_t columns = std::max(
       total_bounds.width() > total_bounds.height() ? kMinCardsMajor : 1,
       static_cast<int>(ceil(sqrt(total_bounds.width() * windows.size() /
                                  (kCardAspectRatio * total_bounds.height())))));
   size_t rows = ((windows.size() + columns - 1) / columns);
@@ skipping 47 matching lines @@
 }
 
 gfx::Rect WindowOverview::GetSelectionBounds(size_t index) {
   gfx::Rect bounds((*windows_)[index]->bounds());
   bounds.Inset(-kWindowOverviewSelectionPadding,
                -kWindowOverviewSelectionPadding);
   return bounds;
 }
 
 }  // namespace ash