diff options
author | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-31 20:48:09 +0000 |
---|---|---|
committer | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-31 20:48:09 +0000 |
commit | f7992735c1bd8879a9084b632bf6598403b1b38d (patch) | |
tree | f07c9b3aa63055f245db61268bdbca35fa7c9d58 /ash/wm/app_list_controller.cc | |
parent | 167ed9d5a08fcc5a08fce241912682f7ade30874 (diff) | |
download | chromium_src-f7992735c1bd8879a9084b632bf6598403b1b38d.zip chromium_src-f7992735c1bd8879a9084b632bf6598403b1b38d.tar.gz chromium_src-f7992735c1bd8879a9084b632bf6598403b1b38d.tar.bz2 |
Animation changed to fade out on Launcher related bubbles.
BUG=137285
Review URL: https://chromiumcodereview.appspot.com/11341034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165221 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/app_list_controller.cc')
-rw-r--r-- | ash/wm/app_list_controller.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc index 437ba58..dadb881 100644 --- a/ash/wm/app_list_controller.cc +++ b/ash/wm/app_list_controller.cc @@ -205,7 +205,8 @@ void AppListController::ScheduleAnimation() { ui::ScopedLayerAnimationSettings animation(layer->GetAnimator()); animation.SetTransitionDuration( - base::TimeDelta::FromMilliseconds(kAnimationDurationMs)); + base::TimeDelta::FromMilliseconds( + is_visible_ ? 0 : kAnimationDurationMs)); animation.AddObserver(this); layer->SetOpacity(is_visible_ ? 1.0 : 0.0); |