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

ui/views/controls/button/custom_button.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 "ui/views/controls/button/custom_button.h"
 
 #include "ui/base/accessibility/accessible_view_state.h"
-#include "ui/base/animation/throb_animation.h"
 #include "ui/base/events/event.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 // How long the hover animation takes if uninterrupted.
 static const int kHoverFadeDurationMs = 150;
 
 // static
 const char CustomButton::kViewClassName[] = "CustomButton";
@@ skipping 249 matching lines @@
   }
 }
 
 void CustomButton::VisibilityChanged(View* starting_from, bool visible) {
   if (state_ == STATE_DISABLED)
     return;
   SetState(visible && IsMouseHovered() ? STATE_HOVERED : STATE_NORMAL);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// CustomButton, ui::AnimationDelegate implementation:
+// CustomButton, gfx::AnimationDelegate implementation:
 
-void CustomButton::AnimationProgressed(const ui::Animation* animation) {
+void CustomButton::AnimationProgressed(const gfx::Animation* animation) {
   SchedulePaint();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CustomButton, protected:
 
 CustomButton::CustomButton(ButtonListener* listener)
     : Button(listener),
       state_(STATE_NORMAL),
       animate_on_state_change_(true),
       is_throbbing_(false),
       triggerable_event_flags_(ui::EF_LEFT_MOUSE_BUTTON),
       request_focus_on_press_(true) {
-  hover_animation_.reset(new ui::ThrobAnimation(this));
+  hover_animation_.reset(new gfx::ThrobAnimation(this));
   hover_animation_->SetSlideDuration(kHoverFadeDurationMs);
 }
 
 void CustomButton::StateChanged() {
 }
 
 bool CustomButton::IsTriggerableEvent(const ui::Event& event) {
   return event.type() == ui::ET_GESTURE_TAP_DOWN ||
          event.type() == ui::ET_GESTURE_TAP ||
          (event.IsMouseEvent() &&
@@ skipping 12 matching lines @@
   if (!details.is_add && state_ != STATE_DISABLED)
     SetState(STATE_NORMAL);
 }
 
 void CustomButton::OnBlur() {
   if (IsHotTracked())
     SetState(STATE_NORMAL);
 }
 
 }  // namespace views