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

Unified Diff: chrome/browser/ui/gtk/hover_controller_gtk.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
Index: chrome/browser/ui/gtk/hover_controller_gtk.cc
diff --git a/chrome/browser/ui/gtk/hover_controller_gtk.cc b/chrome/browser/ui/gtk/hover_controller_gtk.cc
index 0444cdb2187129724ff619b7c776433dfa90b65f..b698facab6e10cc0d42d4827ee95ec87f8b3382c 100644
--- a/chrome/browser/ui/gtk/hover_controller_gtk.cc
+++ b/chrome/browser/ui/gtk/hover_controller_gtk.cc
@@ -65,7 +65,7 @@ void HoverControllerGtk::Destroy() {
delete this;
}
-void HoverControllerGtk::AnimationProgressed(const ui::Animation* animation) {
+void HoverControllerGtk::AnimationProgressed(const gfx::Animation* animation) {
if (!button_)
return;
@@ -77,7 +77,7 @@ void HoverControllerGtk::AnimationProgressed(const ui::Animation* animation) {
animation->GetCurrentValue());
}
-void HoverControllerGtk::AnimationEnded(const ui::Animation* animation) {
+void HoverControllerGtk::AnimationEnded(const gfx::Animation* animation) {
if (!button_)
return;
if (animation != &throb_animation_)
@@ -87,7 +87,7 @@ void HoverControllerGtk::AnimationEnded(const ui::Animation* animation) {
gtk_chrome_button_set_hover_state(GTK_CHROME_BUTTON(button_), 0);
}
-void HoverControllerGtk::AnimationCanceled(const ui::Animation* animation) {
+void HoverControllerGtk::AnimationCanceled(const gfx::Animation* animation) {
AnimationEnded(animation);
}
« no previous file with comments | « chrome/browser/ui/gtk/hover_controller_gtk.h ('k') | chrome/browser/ui/gtk/infobars/translate_infobar_base_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698