Move two utility functions from ash/screen_util.h to ui/wm/core/coordinate_conversion.h

ash/wm/window_animations.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/window_animations.h"
 
 #include <math.h>
 #include <algorithm>
 #include <utility>
 #include <vector>
 
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm/window_animation_types.h"
 #include "ash/common/wm/workspace_controller.h"
 #include "ash/common/wm_window.h"
-#include "ash/screen_util.h"
 #include "ash/wm/window_util.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "base/time/time.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/class_property.h"
 #include "ui/compositor/compositor_observer.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/layer_tree_owner.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/interpolated_transform.h"
 #include "ui/gfx/transform.h"
+#include "ui/wm/core/coordinate_conversion.h"
 #include "ui/wm/core/window_util.h"
 
 namespace ash {
 namespace {
 
 const int kLayerAnimationsForMinimizeDurationMS = 200;
 
 // Durations for the cross-fade animation, in milliseconds.
 const float kCrossFadeDurationMinMs = 200.f;
 const float kCrossFadeDurationMaxMs = 400.f;
@@ skipping 38 matching lines @@
 
 }  // namespace
 
 const int kCrossFadeDurationMS = 200;
 
 void AddLayerAnimationsForMinimize(aura::Window* window, bool show) {
   // Recalculate the transform at restore time since the launcher item may have
   // moved while the window was minimized.
   gfx::Rect bounds = window->bounds();
   gfx::Rect target_bounds = GetMinimizeAnimationTargetBoundsInScreen(window);
-  target_bounds =
-      ScreenUtil::ConvertRectFromScreen(window->parent(), target_bounds);
+  ::wm::ConvertRectFromScreen(window->parent(), &target_bounds);
 
   float scale_x = static_cast<float>(target_bounds.width()) / bounds.width();
   float scale_y = static_cast<float>(target_bounds.height()) / bounds.height();
 
   std::unique_ptr<ui::InterpolatedTransform> scale =
       base::MakeUnique<ui::InterpolatedScale>(
           gfx::Point3F(1, 1, 1), gfx::Point3F(scale_x, scale_y, 1));
 
   std::unique_ptr<ui::InterpolatedTransform> translation =
       base::MakeUnique<ui::InterpolatedTranslation>(
@@ skipping 344 matching lines @@
     case SHELF_ALIGNMENT_LEFT:
       return gfx::Rect(work_area.x(), work_area.y(), 0, 0);
     case SHELF_ALIGNMENT_RIGHT:
       return gfx::Rect(work_area.right(), work_area.y(), 0, 0);
   }
   NOTREACHED();
   return gfx::Rect();
 }
 
 }  // namespace ash