Tweaks the pinned background tab title change animation per Nicholas's

request.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/3041006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52949 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 3 deletions

diff --git a/chrome/browser/views/tabs/tab.cc b/chrome/browser/views/tabs/tab.cc
index 17e5a14..b519ab2 100644
--- a/chrome/browser/views/tabs/tab.cc
+++ b/chrome/browser/views/tabs/tab.cc
@@ -58,9 +58,13 @@ Tab::TabImage Tab::tab_active = {0};
 Tab::TabImage Tab::tab_inactive = {0};
 
 // Durations for the various parts of the mini tab title animation.
-static const int kMiniTitleChangeAnimationDuration1MS = 1000;
-static const int kMiniTitleChangeAnimationDuration2MS = 500;
-static const int kMiniTitleChangeAnimationDuration3MS = 800;
+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;
 
 // Offset from the right edge for the start of the mini title change animation.
 static const int kMiniTitleChangeInitialXOffset = 6;
@@ -117,6 +121,10 @@ void Tab::StartMiniTabTitleAnimation() {
                                          Tween::ZERO));
     parts.push_back(MultiAnimation::Part(kMiniTitleChangeAnimationDuration3MS,
                                          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 MultiAnimation(parts));
     mini_title_animation_->SetContainer(animation_container());
     mini_title_animation_->set_delegate(this);