[Cleanup] Screen cleanup

ash/wm/overview/scoped_transform_overview_window.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/scoped_transform_overview_window.h"
 
-#include "ash/screen_ash.h"
+#include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/wm/overview/scoped_window_copy.h"
 #include "ash/wm/window_state.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/animation/tween.h"
 #include "ui/views/corewm/window_animations.h"
 #include "ui/views/corewm/window_util.h"
@@ skipping 114 matching lines @@
       return true;
     window = GetModalTransientParent(window);
   }
   return false;
 }
 
 gfx::Rect ScopedTransformOverviewWindow::GetBoundsInScreen() const {
   gfx::Rect bounds;
   aura::Window* window = window_;
   while (window) {
-    bounds.Union(ScreenAsh::ConvertRectToScreen(window->parent(),
+    bounds.Union(ScreenUtil::ConvertRectToScreen(window->parent(),
                                                 window->GetTargetBounds()));
     window = GetModalTransientParent(window);
   }
   return bounds;
 }
 
 void ScopedTransformOverviewWindow::RestoreWindow() {
   if (minimized_ && window_->GetProperty(aura::client::kShowStateKey) ==
       ui::SHOW_STATE_MINIMIZED) {
     window_->Show();
@@ skipping 85 matching lines @@
     const gfx::Transform& transform,
     bool animate) {
   gfx::Point origin(GetBoundsInScreen().origin());
   aura::Window* window = window_;
   while (views::corewm::GetTransientParent(window))
     window = views::corewm::GetTransientParent(window);
   for (ScopedVector<ScopedWindowCopy>::const_iterator iter =
       window_copies_.begin(); iter != window_copies_.end(); ++iter) {
     SetTransformOnWindow(
         (*iter)->GetWindow(),
-        TranslateTransformOrigin(ScreenAsh::ConvertRectToScreen(
+        TranslateTransformOrigin(ScreenUtil::ConvertRectToScreen(
             (*iter)->GetWindow()->parent(),
             (*iter)->GetWindow()->GetTargetBounds()).origin() - origin,
             transform),
         animate);
   }
   SetTransformOnWindowAndAllTransientChildren(
       window,
-      TranslateTransformOrigin(ScreenAsh::ConvertRectToScreen(
+      TranslateTransformOrigin(ScreenUtil::ConvertRectToScreen(
           window->parent(), window->GetTargetBounds()).origin() - origin,
           transform),
       animate);
 }
 
 void ScopedTransformOverviewWindow::PrepareForOverview() {
   DCHECK(!overview_started_);
   overview_started_ = true;
   ash::wm::GetWindowState(window_)->set_ignored_by_shelf(true);
   RestoreWindow();
 }
 
 }  // namespace ash