diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-26 20:47:21 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-26 20:47:21 +0000 |
| commit | 6c76c41189e78aadd38d2830d11a9b2711a50850 (patch) | |
| tree | 3f18fd78ac5c23708be35dacb5bea11f4b129ea4 /ash | |
| parent | d93587c57a36a15683e0a431f8c015e6e6ceafcf (diff) | |
| download | chromium_src-6c76c41189e78aadd38d2830d11a9b2711a50850.zip chromium_src-6c76c41189e78aadd38d2830d11a9b2711a50850.tar.gz chromium_src-6c76c41189e78aadd38d2830d11a9b2711a50850.tar.bz2 | |
Make MultiAnimation take time param and slow down tab highlight
BUG=157981
TEST=None
Review URL: https://codereview.chromium.org/11274063
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/launcher/tabbed_launcher_button.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ash/launcher/tabbed_launcher_button.cc b/ash/launcher/tabbed_launcher_button.cc index 9ab491f..7bd5682 100644 --- a/ash/launcher/tabbed_launcher_button.cc +++ b/ash/launcher/tabbed_launcher_button.cc @@ -68,7 +68,9 @@ void TabbedLauncherButton::IconView::SetTabImage(const gfx::ImageSkia& image) { animation_parts.push_back(ui::MultiAnimation::Part(500, ui::Tween::ZERO)); animation_parts.push_back( ui::MultiAnimation::Part(200, ui::Tween::EASE_OUT)); - animation_.reset(new ui::MultiAnimation(animation_parts)); + animation_.reset(new ui::MultiAnimation( + animation_parts, + ui::MultiAnimation::GetDefaultTimerInterval())); animation_->set_continuous(false); animation_->set_delegate(this); animation_->Start(); |