[Cleanup] Screen cleanup

ash/wm/caption_buttons/alternate_frame_size_button.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/caption_buttons/alternate_frame_size_button.h"
 
 #include "ash/metrics/user_metrics_recorder.h"
-#include "ash/screen_ash.h"
+#include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/touch/touch_uma.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/workspace/phantom_window_controller.h"
 #include "ash/wm/workspace/snap_sizer.h"
 #include "ui/gfx/vector2d.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
@@ skipping 165 matching lines @@
       phantom_window_controller_.reset(
           new internal::PhantomWindowController(frame_->GetNativeWindow()));
     }
 
     using internal::SnapSizer;
     SnapSizer snap_sizer(wm::GetWindowState(frame_->GetNativeWindow()),
                          gfx::Point(),
                          snap_type_ == SNAP_LEFT ?
                              SnapSizer::LEFT_EDGE : SnapSizer::RIGHT_EDGE,
                          SnapSizer::OTHER_INPUT);
-    phantom_window_controller_->Show(ScreenAsh::ConvertRectToScreen(
+    phantom_window_controller_->Show(ScreenUtil::ConvertRectToScreen(
           frame_->GetNativeView()->parent(),
           snap_sizer.target_bounds()));
   } else {
     phantom_window_controller_.reset();
   }
 }
 
 bool AlternateFrameSizeButton::CommitSnap(const ui::LocatedEvent& event) {
   // The position of |event| may be different than the position of the previous
   // event.
@@ skipping 19 matching lines @@
 void AlternateFrameSizeButton::SetButtonsToNormalMode(
     AlternateFrameSizeButtonDelegate::Animate animate) {
   in_snap_mode_ = false;
   snap_type_ = SNAP_NONE;
   set_buttons_to_snap_mode_timer_.Stop();
   delegate_->SetButtonsToNormal(animate);
   phantom_window_controller_.reset();
 }
 
 }  // namespace ash