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

ui/views/controls/button/label_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/label_button.h"
 
 #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/sys_color_change_listener.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/focus_border.h"
 #include "ui/views/window/dialog_delegate.h"
 
 #if defined(OS_WIN)
 #include "ui/native_theme/native_theme_win.h"
 #endif
 
@@ skipping 318 matching lines @@
   switch (state()) {
     case STATE_NORMAL:   return ui::NativeTheme::kNormal;
     case STATE_HOVERED:  return ui::NativeTheme::kHovered;
     case STATE_PRESSED:  return ui::NativeTheme::kPressed;
     case STATE_DISABLED: return ui::NativeTheme::kDisabled;
     case STATE_COUNT:    NOTREACHED() << "Unknown state: " << state();
   }
   return ui::NativeTheme::kNormal;
 }
 
-const ui::Animation* LabelButton::GetThemeAnimation() const {
+const gfx::Animation* LabelButton::GetThemeAnimation() const {
 #if defined(OS_WIN)
   if (style() == STYLE_NATIVE_TEXTBUTTON &&
       GetNativeTheme() == ui::NativeThemeWin::instance()) {
     return ui::NativeThemeWin::instance()->IsThemingActive() ?
         hover_animation_.get() : NULL;
   }
 #endif
   return hover_animation_.get();
 }
 
 ui::NativeTheme::State LabelButton::GetBackgroundThemeState(
     ui::NativeTheme::ExtraParams* params) const {
   GetExtraParams(params);
   return ui::NativeTheme::kNormal;
 }
 
 ui::NativeTheme::State LabelButton::GetForegroundThemeState(
     ui::NativeTheme::ExtraParams* params) const {
   GetExtraParams(params);
   return ui::NativeTheme::kHovered;
 }
 
 }  // namespace views