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

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/tabs/tab.h"
 
 #include <limits>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
@@ skipping 178 matching lines @@
 static const double kSelectedTabThrobScale = .5;
 
 // Durations for the various parts of the mini tab title animation.
 static const int kMiniTitleChangeAnimationDuration1MS = 1600;
 static const int kMiniTitleChangeAnimationStart1MS = 0;
 static const int kMiniTitleChangeAnimationEnd1MS = 1900;
 static const int kMiniTitleChangeAnimationDuration2MS = 0;
 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;
 
 // Radius of the radial gradient used for mini title change animation.
 static const int kMiniTitleChangeGradientRadius = 20;
 
 // Colors of the gradient used during the mini title change animation.
 static const SkColor kMiniTitleChangeGradientColor1 = SK_ColorWHITE;
 static const SkColor kMiniTitleChangeGradientColor2 =
@@ skipping 32 matching lines @@
     parts.push_back(
         ui::MultiAnimation::Part(kMiniTitleChangeAnimationDuration2MS,
                                  ui::Tween::ZERO));
     parts.push_back(
         ui::MultiAnimation::Part(kMiniTitleChangeAnimationDuration3MS,
                                  ui::Tween::EASE_IN));
     parts[0].start_time_ms = kMiniTitleChangeAnimationStart1MS;
     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,
-        base::TimeDelta::FromMilliseconds(
-            kMiniTitleChangeAnimationIntervalMS)));
+    mini_title_animation_.reset(new ui::MultiAnimation(parts));
     mini_title_animation_->SetContainer(animation_container());
     mini_title_animation_->set_delegate(this);
   }
   mini_title_animation_->Start();
 }
 
 void Tab::StopMiniTabTitleAnimation() {
   if (mini_title_animation_.get())
     mini_title_animation_->Stop();
 }
@@ skipping 581 matching lines @@
       rb.GetImageSkiaNamed(IDR_TAB_ACTIVE_RIGHT_SEARCH);
   tab_active_search_.l_width = tab_active_search_.image_l->width();
   tab_active_search_.r_width = tab_active_search_.image_r->width();
 
   tab_inactive_.image_l = rb.GetImageSkiaNamed(IDR_TAB_INACTIVE_LEFT);
   tab_inactive_.image_c = rb.GetImageSkiaNamed(IDR_TAB_INACTIVE_CENTER);
   tab_inactive_.image_r = rb.GetImageSkiaNamed(IDR_TAB_INACTIVE_RIGHT);
   tab_inactive_.l_width = tab_inactive_.image_l->width();
   tab_inactive_.r_width = tab_inactive_.image_r->width();
 }