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

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

Issue 11312029: Revert 165230 - Merge 164399 - Make MultiAnimation take time param and slow down tab highlight (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1271/src/
Patch Set: 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.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/animation/multi_animation_unittest.cc
===================================================================
--- ui/base/animation/multi_animation_unittest.cc (revision 165270)
+++ ui/base/animation/multi_animation_unittest.cc (working copy)
@@ -14,7 +14,7 @@
parts.push_back(MultiAnimation::Part(100, Tween::LINEAR));
parts.push_back(MultiAnimation::Part(100, Tween::EASE_OUT));
- MultiAnimation animation(parts, MultiAnimation::GetDefaultTimerInterval());
+ MultiAnimation animation(parts);
AnimationContainerElement* as_element =
static_cast<AnimationContainerElement*>(&animation);
as_element->SetStartTime(base::TimeTicks());
@@ -43,7 +43,7 @@
parts[0].start_time_ms = 100;
parts[0].end_time_ms = 400;
- MultiAnimation animation(parts, MultiAnimation::GetDefaultTimerInterval());
+ MultiAnimation animation(parts);
AnimationContainerElement* as_element =
static_cast<AnimationContainerElement*>(&animation);
as_element->SetStartTime(base::TimeTicks());
@@ -62,7 +62,7 @@
TEST(MultiAnimationTest, DontCycle) {
MultiAnimation::Parts parts;
parts.push_back(MultiAnimation::Part(200, Tween::LINEAR));
- MultiAnimation animation(parts, MultiAnimation::GetDefaultTimerInterval());
+ MultiAnimation animation(parts);
AnimationContainerElement* as_element =
static_cast<AnimationContainerElement*>(&animation);
as_element->SetStartTime(base::TimeTicks());
@@ -78,7 +78,7 @@
TEST(MultiAnimationTest, Cycle) {
MultiAnimation::Parts parts;
parts.push_back(MultiAnimation::Part(200, Tween::LINEAR));
- MultiAnimation animation(parts, MultiAnimation::GetDefaultTimerInterval());
+ MultiAnimation animation(parts);
AnimationContainerElement* as_element =
static_cast<AnimationContainerElement*>(&animation);
as_element->SetStartTime(base::TimeTicks());
« no previous file with comments | « ui/base/animation/multi_animation.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698