[Cleanup] Screen cleanup

ash/wm/dock/docked_window_layout_manager.cc

 // Copyright (c) 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/dock/docked_window_layout_manager.h"
 
 #include "ash/ash_switches.h"
-#include "ash/screen_ash.h"
+#include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_properties.h"
@@ skipping 285 matching lines @@
   CompareWindowPos(aura::Window* dragged_window, float delta)
       : dragged_window_(dragged_window),
         delta_(delta / 2) {}
 
   bool operator()(WindowWithHeight window_with_height1,
                   WindowWithHeight window_with_height2) {
     // Use target coordinates since animations may be active when windows are
     // reordered.
     aura::Window* win1(window_with_height1.window());
     aura::Window* win2(window_with_height2.window());
-    gfx::Rect win1_bounds = ScreenAsh::ConvertRectToScreen(
+    gfx::Rect win1_bounds = ScreenUtil::ConvertRectToScreen(
         win1->parent(), win1->GetTargetBounds());
-    gfx::Rect win2_bounds = ScreenAsh::ConvertRectToScreen(
+    gfx::Rect win2_bounds = ScreenUtil::ConvertRectToScreen(
         win2->parent(), win2->GetTargetBounds());
     win1_bounds.set_height(window_with_height1.height_);
     win2_bounds.set_height(window_with_height2.height_);
     // If one of the windows is the |dragged_window_| attempt to make an
     // earlier swap between the windows than just based on their centers.
     // This is possible if the dragged window is at least as tall as the other
     // window.
     if (win1 == dragged_window_)
       return compare_two_windows(win1_bounds, win2_bounds);
     if (win2 == dragged_window_)
@@ skipping 48 matching lines @@
     if (docked_layout_manager_->shelf() &&
         docked_layout_manager_->shelf()->shelf_widget())
       docked_layout_manager_->shelf()->shelf_widget()->GetNativeView()
           ->RemoveObserver(this);
   }
 
   // aura::WindowObserver:
   virtual void OnWindowBoundsChanged(aura::Window* window,
                                      const gfx::Rect& old_bounds,
                                      const gfx::Rect& new_bounds) OVERRIDE {
-    shelf_bounds_in_screen_ = ScreenAsh::ConvertRectToScreen(
+    shelf_bounds_in_screen_ = ScreenUtil::ConvertRectToScreen(
         window->parent(), new_bounds);
     docked_layout_manager_->OnShelfBoundsChanged();
   }
 
   const gfx::Rect& shelf_bounds_in_screen() const {
     return shelf_bounds_in_screen_;
   }
 
  private:
   DockedWindowLayoutManager* docked_layout_manager_;
@@ skipping 746 matching lines @@
   }
   UpdateDockedWidth(new_width);
   // Sort windows by their center positions and fan out overlapping
   // windows.
   std::sort(visible_windows->begin(), visible_windows->end(),
             CompareWindowPos(is_dragged_from_dock_ ? dragged_window_ : NULL,
                              delta));
   for (std::vector<WindowWithHeight>::iterator iter = visible_windows->begin();
        iter != visible_windows->end(); ++iter) {
     aura::Window* window = iter->window();
-    gfx::Rect bounds = ScreenAsh::ConvertRectToScreen(
+    gfx::Rect bounds = ScreenUtil::ConvertRectToScreen(
         window->parent(), window->GetTargetBounds());
     // A window is extended or shrunk to be as close as possible to the ideal
     // docked area width. Windows that were resized by a user are kept at their
     // existing size.
     // This also enforces the min / max restrictions on the docked area width.
     bounds.set_width(GetWindowWidthCloseTo(
         window,
         wm::GetWindowState(window)->bounds_changed_by_user() ?
             bounds.width() : ideal_docked_width));
     DCHECK_LE(bounds.width(), ideal_docked_width);
@@ skipping 26 matching lines @@
       case DOCKED_ALIGNMENT_NONE:
         break;
     }
     if (window == dragged_window_) {
       dragged_bounds_ = bounds;
       continue;
     }
     // If the following asserts it is probably because not all the children
     // have been removed when dock was closed.
     DCHECK_NE(alignment_, DOCKED_ALIGNMENT_NONE);
-    bounds = ScreenAsh::ConvertRectFromScreen(dock_container_, bounds);
+    bounds = ScreenUtil::ConvertRectFromScreen(dock_container_, bounds);
     if (bounds != window->GetTargetBounds()) {
       ui::Layer* layer = window->layer();
       ui::ScopedLayerAnimationSettings slide_settings(layer->GetAnimator());
       slide_settings.SetPreemptionStrategy(
           ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
       slide_settings.SetTransitionDuration(
           base::TimeDelta::FromMilliseconds(kSlideDurationMs));
       SetChildBoundsDirect(window, bounds);
     }
   }
@@ skipping 89 matching lines @@
 void DockedWindowLayoutManager::OnKeyboardBoundsChanging(
     const gfx::Rect& keyboard_bounds) {
   // This bounds change will have caused a change to the Shelf which does not
   // propagate automatically to this class, so manually recalculate bounds.
   Relayout();
   UpdateDockBounds(DockedWindowLayoutManagerObserver::KEYBOARD_BOUNDS_CHANGING);
 }
 
 }  // namespace internal
 }  // namespace ash