Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(216)

Unified Diff: ui/views/controls/button/text_button.cc

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/button/text_button.h ('k') | ui/views/controls/glow_hover_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/text_button.cc
diff --git a/ui/views/controls/button/text_button.cc b/ui/views/controls/button/text_button.cc
index a02d6b2b0fd4df970a492171aeb21539f9d4cc32..38e9691b19aafe85fc0020b9f0ac12a24d114e39 100644
--- a/ui/views/controls/button/text_button.cc
+++ b/ui/views/controls/button/text_button.cc
@@ -8,8 +8,8 @@
#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"
@@ -345,7 +345,7 @@ void TextButtonBase::OnBoundsChanged(const gfx::Rect& previous_bounds) {
UpdateTextSize();
}
-const ui::Animation* TextButtonBase::GetAnimation() const {
+const gfx::Animation* TextButtonBase::GetAnimation() const {
return hover_animation_.get();
}
@@ -570,7 +570,7 @@ ui::NativeTheme::State TextButtonBase::GetThemeState(
}
}
-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() ?
« no previous file with comments | « ui/views/controls/button/text_button.h ('k') | ui/views/controls/glow_hover_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698