[Cleanup] Screen cleanup

ash/wm/workspace/snap_sizer.cc

 // Copyright (c) 2012 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/workspace/snap_sizer.h"
 
 #include <cmath>
 
 #include "ash/ash_switches.h"
-#include "ash/screen_ash.h"
+#include "ash/screen_util.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/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
 namespace internal {
@@ skipping 27 matching lines @@
 // may not be in the width list generated by BuildIdealWidthList().
 int GetMinWidth(aura::Window* window) {
   return window->delegate() ? window->delegate()->GetMinimumSize().width() : 0;
 }
 
 // Returns the maximum width that |window| can be snapped to. The returned width
 // may not be in the width list generated by BuildIdealWidthList().
 // The aura::WindowDelegate's max size is ignored because
 // ash::wm::CanSnapWindow() returns false when a max size is specified.
 int GetMaxWidth(aura::Window* window) {
-  gfx::Rect work_area(ScreenAsh::GetDisplayWorkAreaBoundsInParent(window));
+  gfx::Rect work_area(ScreenUtil::GetDisplayWorkAreaBoundsInParent(window));
   return std::max(work_area.width() * kMaximumScreenPercent / 100,
                   GetMinWidth(window));
 }
 
 // Returns the width that |window| should be snapped to if resizing is disabled
 // in the SnapSizer.
 int GetDefaultWidth(aura::Window* window) {
-  gfx::Rect work_area(ScreenAsh::GetDisplayWorkAreaBoundsInParent(window));
+  gfx::Rect work_area(ScreenUtil::GetDisplayWorkAreaBoundsInParent(window));
 
   int width = 0;
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshMultipleSnapWindowWidths)) {
     width = work_area.width() / 2;
   } else {
     width = std::max(kDefaultWidthSmallScreen, work_area.width() / 2);
   }
 
   width = std::min(width, GetMaxWidth(window));
   return std::max(width, GetMinWidth(window));
 }
 
 // Creates the list of possible width for the current screen configuration:
 // Returns a list with items from |kIdealWidth| which fit on the screen and
 // supplement it with the 'half of screen' size. Furthermore, add an entry for
 // 90% of the screen size if it is smaller than the biggest value in the
 // |kIdealWidth| list (to get a step between the values).
 std::vector<int> BuildIdealWidthList(aura::Window* window) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshMultipleSnapWindowWidths)) {
     return std::vector<int>(1u, GetDefaultWidth(window));
   }
 
   int minimum_width = GetMinWidth(window);
   int maximum_width = GetMaxWidth(window);
 
-  gfx::Rect work_area(ScreenAsh::GetDisplayWorkAreaBoundsInParent(window));
+  gfx::Rect work_area(ScreenUtil::GetDisplayWorkAreaBoundsInParent(window));
   int half_width = work_area.width() / 2;
   if (half_width < minimum_width || half_width > maximum_width)
     half_width = 0;
 
   std::vector<int> ideal_width_list;
   for (size_t i = 0; i < arraysize(kIdealWidth); i++) {
     if (kIdealWidth[i] >= minimum_width && kIdealWidth[i] <= maximum_width) {
       if (i && !ideal_width_list.size() && maximum_width != kIdealWidth[i])
         ideal_width_list.push_back(maximum_width);
       if (half_width > kIdealWidth[i])
@@ skipping 115 matching lines @@
 }
 
 void SnapSizer::SelectDefaultSizeAndDisableResize() {
   resize_disabled_ = true;
   size_index_ = 0;
   end_of_sequence_ = false;
   target_bounds_ = GetTargetBounds();
 }
 
 gfx::Rect SnapSizer::GetTargetBoundsForSize(size_t size_index) const {
-  gfx::Rect work_area(ScreenAsh::GetDisplayWorkAreaBoundsInParent(
+  gfx::Rect work_area(ScreenUtil::GetDisplayWorkAreaBoundsInParent(
       window_state_->window()));
   int y = work_area.y();
   int max_y = work_area.bottom();
   int width = 0;
   if (resize_disabled_) {
     width = GetDefaultWidth(window_state_->window());
   } else {
     DCHECK(size_index < usable_width_.size());
     width = usable_width_[size_index];
   }
@@ skipping 35 matching lines @@
   }
   num_moves_since_adjust_ = 0;
   last_adjust_x_ = x;
 }
 
 gfx::Rect SnapSizer::GetTargetBounds() const {
   return GetTargetBoundsForSize(size_index_);
 }
 
 bool SnapSizer::AlongEdge(int x) const {
-  gfx::Rect area(ScreenAsh::GetDisplayWorkAreaBoundsInParent(
+  gfx::Rect area(ScreenUtil::GetDisplayWorkAreaBoundsInParent(
       window_state_->window()));
   return (x <= area.x()) || (x >= area.right() - 1);
 }
 
 }  // namespace internal
 }  // namespace ash