ui/base/animation -> ui/gfx/animation

ash/wm/gestures/long_press_affordance_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/long_press_affordance_handler.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/shell.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell_window_ids.h"
@@ skipping 147 matching lines @@
         point.y() - (kAffordanceOuterRadius + kAffordanceGlowWidth),
         GetPreferredSize().width(),
         GetPreferredSize().height()));
     widget_->Show();
     widget_->GetNativeView()->layer()->SetOpacity(kAffordanceOpacityStartValue);
   }
 
   virtual ~LongPressAffordanceView() {
   }
 
-  void UpdateWithGrowAnimation(ui::Animation* animation) {
+  void UpdateWithGrowAnimation(gfx::Animation* animation) {
     // Update the portion of the circle filled so far and re-draw.
     current_angle_ = animation->CurrentValueBetween(kAffordanceAngleStartValue,
         kAffordanceAngleEndValue);
     current_scale_ = animation->CurrentValueBetween(kAffordanceScaleStartValue,
         kAffordanceScaleEndValue);
     widget_->GetNativeView()->layer()->SetOpacity(
         animation->CurrentValueBetween(kAffordanceOpacityStartValue,
             kAffordanceOpacityEndValue));
     SchedulePaint();
   }
 
-  void UpdateWithShrinkAnimation(ui::Animation* animation) {
+  void UpdateWithShrinkAnimation(gfx::Animation* animation) {
     current_scale_ = animation->CurrentValueBetween(kAffordanceScaleEndValue,
         kAffordanceShrinkScaleEndValue);
     widget_->GetNativeView()->layer()->SetOpacity(
         animation->CurrentValueBetween(kAffordanceOpacityEndValue,
             kAffordanceOpacityStartValue));
     SchedulePaint();
   }
 
  private:
   // Overridden from views::View.
@@ skipping 38 matching lines @@
   int current_angle_;
   double current_scale_;
 
   DISALLOW_COPY_AND_ASSIGN(LongPressAffordanceView);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // LongPressAffordanceHandler, public
 
 LongPressAffordanceHandler::LongPressAffordanceHandler()
-    : ui::LinearAnimation(kAffordanceFrameRateHz, this),
+    : gfx::LinearAnimation(kAffordanceFrameRateHz, this),
       tap_down_touch_id_(-1),
       tap_down_display_id_(0),
       current_animation_type_(NONE) {}
 
 LongPressAffordanceHandler::~LongPressAffordanceHandler() {}
 
 void LongPressAffordanceHandler::ProcessEvent(aura::Window* target,
                                               ui::LocatedEvent* event,
                                               int touch_id) {
   // Once we have a touch id, we are only interested in event of that touch id.
@@ skipping 94 matching lines @@
       NOTREACHED();
       break;
   }
 }
 
 bool LongPressAffordanceHandler::ShouldSendCanceledFromStop() {
   return false;
 }
 
 void LongPressAffordanceHandler::AnimationEnded(
-    const ui::Animation* animation) {
+    const gfx::Animation* animation) {
   switch (current_animation_type_) {
     case GROW_ANIMATION:
       current_animation_type_ = SHRINK_ANIMATION;
       timer_.Start(FROM_HERE,
           base::TimeDelta::FromMilliseconds(kAffordanceDelayBeforeShrinkMs),
           this, &LongPressAffordanceHandler::StartAnimation);
       break;
     case SHRINK_ANIMATION:
       current_animation_type_ = NONE;
       // fall through to reset the view.
     default:
       view_.reset();
       tap_down_touch_id_ = -1;
       tap_down_display_id_ = 0;
       break;
   }
 }
 
 }  // namespace internal
 }  // namespace ash