Merge 164399 - Make MultiAnimation take time param and slow down tab highlight

chrome/browser/ui/views/tabs/tab.cc

Index: chrome/browser/ui/views/tabs/tab.cc
===================================================================
--- chrome/browser/ui/views/tabs/tab.cc	(revision 165229)
+++ chrome/browser/ui/views/tabs/tab.cc	(working copy)
@@ -196,6 +196,7 @@
 static const int kMiniTitleChangeAnimationDuration3MS = 550;
 static const int kMiniTitleChangeAnimationStart3MS = 150;
 static const int kMiniTitleChangeAnimationEnd3MS = 800;
+static const int kMiniTitleChangeAnimationIntervalMS = 40;
 
 // Offset from the right edge for the start of the mini title change animation.
 static const int kMiniTitleChangeInitialXOffset = 6;
@@ -248,7 +249,10 @@
     parts[0].end_time_ms = kMiniTitleChangeAnimationEnd1MS;
     parts[2].start_time_ms = kMiniTitleChangeAnimationStart3MS;
     parts[2].end_time_ms = kMiniTitleChangeAnimationEnd3MS;
-    mini_title_animation_.reset(new ui::MultiAnimation(parts));
+    mini_title_animation_.reset(new ui::MultiAnimation(
+        parts,
+        base::TimeDelta::FromMilliseconds(
+            kMiniTitleChangeAnimationIntervalMS)));
     mini_title_animation_->SetContainer(animation_container());
     mini_title_animation_->set_delegate(this);
   }