Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1557)

Unified Diff: ash/wm/custom_frame_view_ash.cc

Issue 10911172: Changes launcher so that when animating hidden the background doesn't (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/wm/shelf_layout_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/custom_frame_view_ash.cc
diff --git a/ash/wm/custom_frame_view_ash.cc b/ash/wm/custom_frame_view_ash.cc
index aa0186d3e3ae6ba7aa324b3732b2e703a92ce9f7..12c3542f23273a8998cd5d59fa99054513597ba4 100644
--- a/ash/wm/custom_frame_view_ash.cc
+++ b/ash/wm/custom_frame_view_ash.cc
@@ -10,6 +10,7 @@
#include "grit/ui_strings.h" // Accessibility names
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/compositor/layer_animator.h"
#include "ui/gfx/font.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/rect.h"
@@ -145,6 +146,8 @@ gfx::Size CustomFrameViewAsh::GetMinimumSize() {
// views::ButtonListener overrides:
void CustomFrameViewAsh::ButtonPressed(views::Button* sender,
const ui::Event& event) {
+ if (event.IsShiftDown())
+ ui::LayerAnimator::set_slow_animation_mode(true);
if (sender == maximize_button_) {
// The maximize button may move out from under the cursor.
ResetWindowControls();
@@ -156,6 +159,8 @@ void CustomFrameViewAsh::ButtonPressed(views::Button* sender,
} else if (sender == close_button_) {
frame_->Close();
}
+ if (event.IsShiftDown())
+ ui::LayerAnimator::set_slow_animation_mode(false);
}
////////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « no previous file | ash/wm/shelf_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698