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

ui/base/animation/multi_animation.h

 // Copyright (c) 2011 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.
 
 #ifndef UI_BASE_ANIMATION_MULTI_ANIMATION_H_
 #define UI_BASE_ANIMATION_MULTI_ANIMATION_H_
 
 #include <vector>
 
 #include "ui/base/animation/animation.h"
@@ skipping 27 matching lines @@
           type(type) {}
 
     int time_ms;
     int start_time_ms;
     int end_time_ms;
     Tween::Type type;
   };
 
   typedef std::vector<Part> Parts;
 
-  explicit MultiAnimation(const Parts& parts);
+  MultiAnimation(const Parts& parts, base::TimeDelta timer_interval);
   virtual ~MultiAnimation();
 
+  // Default interval.
+  static base::TimeDelta GetDefaultTimerInterval();
+
   // Sets whether the animation continues after it reaches the end. If true, the
   // animation runs until explicitly stopped. The default is true.
   void set_continuous(bool continuous) { continuous_ = continuous; }
 
   // Returns the current value. The current value for a MultiAnimation is
   // determined from the tween type of the current part.
   virtual double GetCurrentValue() const OVERRIDE;
 
   // Returns the index of the current part.
   size_t current_part_index() const { return current_part_index_; }
@@ skipping 23 matching lines @@
 
   // See description above setter.
   bool continuous_;
 
   DISALLOW_COPY_AND_ASSIGN(MultiAnimation);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_ANIMATION_MULTI_ANIMATION_H_