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

Unified Diff: ui/base/animation/multi_animation.cc

Issue 11274063: Make MultiAnimation take time param and slow down tab highlight (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Bad var name Created 8 years, 2 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/base/animation/multi_animation.h ('k') | ui/base/animation/multi_animation_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/animation/multi_animation.cc
diff --git a/ui/base/animation/multi_animation.cc b/ui/base/animation/multi_animation.cc
index 5a0c1e1919d4174ad6368bf1b7369fec0edee6d6..2e9e4772db634bde00d53ae24abec7130ef16acc 100644
--- a/ui/base/animation/multi_animation.cc
+++ b/ui/base/animation/multi_animation.cc
@@ -10,7 +10,7 @@
namespace ui {
// Default interval, in ms.
-static const int kDefaultInterval = 20;
+static const int kDefaultTimerInterval = 20;
static int TotalTime(const MultiAnimation::Parts& parts) {
int time_ms = 0;
@@ -21,8 +21,9 @@ static int TotalTime(const MultiAnimation::Parts& parts) {
return time_ms;
}
-MultiAnimation::MultiAnimation(const Parts& parts)
- : Animation(base::TimeDelta::FromMilliseconds(kDefaultInterval)),
+MultiAnimation::MultiAnimation(const Parts& parts,
+ base::TimeDelta timer_interval)
+ : Animation(timer_interval),
parts_(parts),
cycle_time_ms_(TotalTime(parts)),
current_value_(0),
@@ -33,6 +34,11 @@ MultiAnimation::MultiAnimation(const Parts& parts)
MultiAnimation::~MultiAnimation() {}
+// static.
+base::TimeDelta MultiAnimation::GetDefaultTimerInterval() {
+ return base::TimeDelta::FromMilliseconds(kDefaultTimerInterval);
+}
+
double MultiAnimation::GetCurrentValue() const {
return current_value_;
}
« no previous file with comments | « ui/base/animation/multi_animation.h ('k') | ui/base/animation/multi_animation_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698