diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-08 00:54:29 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-08 00:54:29 +0000 |
| commit | d84d7e11085d6c7cd5028ceeb5309baecab1e79f (patch) | |
| tree | 97a9ee529e10e2e8712d267d45c22440739fda2a /ash/launcher/launcher_view.cc | |
| parent | 20504aff17c993fc94bec8e7f54a5d5d83775295 (diff) | |
| download | chromium_src-d84d7e11085d6c7cd5028ceeb5309baecab1e79f.zip chromium_src-d84d7e11085d6c7cd5028ceeb5309baecab1e79f.tar.gz chromium_src-d84d7e11085d6c7cd5028ceeb5309baecab1e79f.tar.bz2 | |
Tweaks workspace2 animations based on input from Nicholas.
BUG=146892
TEST=none
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10910143
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155544 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher/launcher_view.cc')
| -rw-r--r-- | ash/launcher/launcher_view.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc index 7141bf9..53b65f4 100644 --- a/ash/launcher/launcher_view.cc +++ b/ash/launcher/launcher_view.cc @@ -25,6 +25,7 @@ #include "ui/base/models/simple_menu_model.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/layer.h" +#include "ui/compositor/layer_animator.h" #include "ui/views/animation/bounds_animator.h" #include "ui/views/border.h" #include "ui/views/controls/menu/menu_model_adapter.h" @@ -991,6 +992,8 @@ void LauncherView::ButtonPressed(views::Button* sender, if (view_index == -1) return; + if (event.IsShiftDown()) + ui::LayerAnimator::set_slow_animation_mode(true); tooltip_->Close(); switch (model_->items()[view_index].type) { case TYPE_TABBED: @@ -1022,6 +1025,8 @@ void LauncherView::ButtonPressed(views::Button* sender, delegate_->CreateNewTab(); break; } + if (event.IsShiftDown()) + ui::LayerAnimator::set_slow_animation_mode(false); } void LauncherView::ShowContextMenuForView(views::View* source, |