Move DIP translation from ui/aura to ui/compositor

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 "ash/ash_switches.h"
 #include "ash/launcher/launcher.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/time.h"
 #include "ui/aura/client/aura_constants.h"
-#include "ui/aura/dip_util.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_property.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animation_observer.h"
 #include "ui/gfx/compositor/layer_animation_sequence.h"
 #include "ui/gfx/compositor/layer_animator.h"
 #include "ui/gfx/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/interpolated_transform.h"
 #include "ui/gfx/screen.h"
@@ skipping 201 matching lines @@
 
   window->layer()->SetOpacity(kWindowAnimation_HideOpacity);
   window->layer()->SetTransform(end_transform);
 }
 
 // Show/Hide windows using a shrink animation.
 void AnimateShowWindow_Drop(aura::Window* window) {
   ui::Transform transform;
   transform.ConcatScale(kWindowAnimation_ScaleFactor,
                         kWindowAnimation_ScaleFactor);
-  gfx::Rect bounds = window->GetBoundsInPixel();
+  gfx::Rect bounds = window->bounds();
   transform.ConcatTranslate(
       kWindowAnimation_TranslateFactor * bounds.width(),
       kWindowAnimation_TranslateFactor * bounds.height());
   AnimateShowWindowCommon(window, transform, ui::Transform());
 }
 
 void AnimateHideWindow_Drop(aura::Window* window) {
   ui::Transform transform;
   transform.ConcatScale(kWindowAnimation_ScaleFactor,
                         kWindowAnimation_ScaleFactor);
-  gfx::Rect bounds = window->GetBoundsInPixel();
+  gfx::Rect bounds = window->bounds();
   transform.ConcatTranslate(
       kWindowAnimation_TranslateFactor * bounds.width(),
       kWindowAnimation_TranslateFactor * bounds.height());
   AnimateHideWindowCommon(window, transform);
 }
 
 // Show/Hide windows using a vertical Glenimation.
 void AnimateShowWindow_Vertical(aura::Window* window) {
   ui::Transform transform;
   transform.ConcatTranslate(0, kWindowAnimation_Vertical_TranslateY);
@@ skipping 13 matching lines @@
 
 void AnimateHideWindow_Fade(aura::Window* window) {
   AnimateHideWindowCommon(window, ui::Transform());
 }
 
 // Builds the transform used when switching workspaces for the specified
 // window.
 ui::Transform BuildWorkspaceSwitchTransform(aura::Window* window) {
   // Animations for transitioning workspaces scale all windows. To give the
   // effect of scaling from the center of the screen the windows are translated.
-  gfx::Rect bounds = window->GetBoundsInPixel();
-  gfx::Rect parent_bounds(window->parent()->GetBoundsInPixel());
+  gfx::Rect bounds = window->bounds();
+  gfx::Rect parent_bounds(window->parent()->bounds());
 
   float mid_x = static_cast<float>(parent_bounds.width()) / 2.0f;
   float initial_x =
       (static_cast<float>(bounds.x()) - mid_x) * kWorkspaceScale +
       mid_x;
   float mid_y = static_cast<float>(parent_bounds.height()) / 2.0f;
   float initial_y =
       (static_cast<float>(bounds.y()) - mid_y) * kWorkspaceScale +
       mid_y;
 
@@ skipping 63 matching lines @@
     gfx::Rect work_area =
         gfx::Screen::GetMonitorNearestWindow(window).work_area();
     target_bounds.SetRect(work_area.right(), work_area.bottom(), 0, 0);
   }
   return target_bounds;
 }
 
 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->GetBoundsInPixel();
-  gfx::Rect target_bounds =
-      aura::ConvertRectToPixel(window, GetMinimizeRectForWindow(window));
+  gfx::Rect bounds = window->bounds();
+  gfx::Rect target_bounds = GetMinimizeRectForWindow(window);
 
   float scale_x = static_cast<float>(target_bounds.height()) / bounds.width();
   float scale_y = static_cast<float>(target_bounds.width()) / bounds.height();
 
   scoped_ptr<ui::InterpolatedTransform> scale(
       new ui::InterpolatedScale(gfx::Point3f(1, 1, 1),
                                 gfx::Point3f(scale_x, scale_y, 1)));
 
   scoped_ptr<ui::InterpolatedTransform> translation(
       new ui::InterpolatedTranslation(
@@ skipping 126 matching lines @@
 }
 
 }  // namespace internal
 
 ui::ImplicitAnimationObserver* CreateHidingWindowAnimationObserver(
     aura::Window* window) {
   return new internal::HidingWindowAnimationObserver(window);
 }
 
 }  // namespace ash