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

ui/views/controls/button/text_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/text_button.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
-#include "ui/base/animation/throb_animation.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/focus_border.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "skia/ext/skia_utils_win.h"
 #include "ui/gfx/platform_font_win.h"
 #include "ui/native_theme/native_theme_win.h"
@@ skipping 315 matching lines @@
 
 void TextButtonBase::OnPaint(gfx::Canvas* canvas) {
   PaintButton(canvas, PB_NORMAL);
 }
 
 void TextButtonBase::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   if (multi_line_)
     UpdateTextSize();
 }
 
-const ui::Animation* TextButtonBase::GetAnimation() const {
+const gfx::Animation* TextButtonBase::GetAnimation() const {
   return hover_animation_.get();
 }
 
 void TextButtonBase::UpdateColor() {
   color_ = enabled() ? color_enabled_ : color_disabled_;
 }
 
 void TextButtonBase::UpdateTextSize() {
   int text_width = width();
   // If width is defined, use GetTextBounds.width() for maximum text width,
@@ skipping 204 matching lines @@
     case STATE_HOVERED:
       return ui::NativeTheme::kHovered;
     case STATE_PRESSED:
       return ui::NativeTheme::kPressed;
     default:
       NOTREACHED() << "Unknown state: " << state();
       return ui::NativeTheme::kNormal;
   }
 }
 
-const ui::Animation* TextButtonBase::GetThemeAnimation() const {
+const gfx::Animation* TextButtonBase::GetThemeAnimation() const {
 #if defined(OS_WIN)
   if (GetNativeTheme() == ui::NativeThemeWin::instance()) {
     return ui::NativeThemeWin::instance()->IsThemingActive() ?
         hover_animation_.get() : NULL;
   }
 #endif
   return hover_animation_.get();
 }
 
 ui::NativeTheme::State TextButtonBase::GetBackgroundThemeState(
@@ skipping 151 matching lines @@
   if (show_multiple_icon_states_) {
     if (has_hover_icon_ && (state() == STATE_HOVERED))
       return icon_hover_;
     if (has_pushed_icon_ && (state() == STATE_PRESSED))
       return icon_pushed_;
   }
   return icon_;
 }
 
 }  // namespace views