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

Unified Diff: views/controls/button/custom_button.cc

Issue 6154001: Move animation code to new ui/base/animation directory.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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 | « views/controls/button/custom_button.h ('k') | views/controls/button/image_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/button/custom_button.cc
===================================================================
--- views/controls/button/custom_button.cc (revision 70685)
+++ views/controls/button/custom_button.cc (working copy)
@@ -5,7 +5,7 @@
#include "views/controls/button/custom_button.h"
#include "app/keyboard_codes.h"
-#include "app/throb_animation.h"
+#include "ui/base/animation/throb_animation.h"
#include "views/screen.h"
namespace views {
@@ -120,7 +120,7 @@
is_throbbing_(false),
triggerable_event_flags_(MouseEvent::EF_LEFT_BUTTON_DOWN),
request_focus_on_press_(true) {
- hover_animation_.reset(new ThrobAnimation(this));
+ hover_animation_.reset(new ui::ThrobAnimation(this));
hover_animation_->SetSlideDuration(kHoverFadeDurationMs);
}
@@ -262,9 +262,9 @@
}
////////////////////////////////////////////////////////////////////////////////
-// CustomButton, AnimationDelegate implementation:
+// CustomButton, ui::AnimationDelegate implementation:
-void CustomButton::AnimationProgressed(const Animation* animation) {
+void CustomButton::AnimationProgressed(const ui::Animation* animation) {
SchedulePaint();
}
« no previous file with comments | « views/controls/button/custom_button.h ('k') | views/controls/button/image_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698