[Cleanup] Screen cleanup

ash/wm/gestures/system_pinch_handler.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/gestures/system_pinch_handler.h"
 
-#include "ash/screen_ash.h"
+#include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/snap_sizer.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/events/event_constants.h"
@@ skipping 89 matching lines @@
   }
 
   return SYSTEM_GESTURE_PROCESSED;
 }
 
 gfx::Rect SystemPinchHandler::GetPhantomWindowScreenBounds(
     aura::Window* window,
     const gfx::Point& point) {
   if (pinch_factor_ > kPinchThresholdForMaximize) {
     phantom_state_ = PHANTOM_WINDOW_MAXIMIZED;
-    return ScreenAsh::ConvertRectToScreen(
+    return ScreenUtil::ConvertRectToScreen(
         target_->parent(),
-        ScreenAsh::GetMaximizedWindowBoundsInParent(target_));
+        ScreenUtil::GetMaximizedWindowBoundsInParent(target_));
   }
 
   if (pinch_factor_ < kPinchThresholdForMinimize) {
     wm::WindowState* window_state = wm::GetWindowState(window);
     if (window_state->IsMaximizedOrFullscreen()) {
       if (window_state->HasRestoreBounds()) {
         phantom_state_ = PHANTOM_WINDOW_MINIMIZED;
         return  window_state->GetRestoreBoundsInScreen();
       }
       return window->bounds();
     }
 
     gfx::Rect rect = GetMinimizeAnimationTargetBoundsInScreen(target_);
     if (!rect.IsEmpty())
       rect.Inset(-8, -8);
     phantom_state_ = PHANTOM_WINDOW_MINIMIZED;
     return rect;
   }
 
   phantom_state_ = PHANTOM_WINDOW_NORMAL;
   return window->bounds();
 }
 
 }  // namespace internal
 }  // namespace ash