summaryrefslogtreecommitdiffstats
path: root/ash/wm/window_animations.cc
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-16 22:59:55 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-16 22:59:55 +0000
commit7d6fb2281a9d7b9c041cfbb0cdc72c74c6b09070 (patch)
tree7a410e0188f115aa519409303e359415f5e06e7d /ash/wm/window_animations.cc
parent6c95b099de26b58d2f5c4c37f52ce14865324d76 (diff)
downloadchromium_src-7d6fb2281a9d7b9c041cfbb0cdc72c74c6b09070.zip
chromium_src-7d6fb2281a9d7b9c041cfbb0cdc72c74c6b09070.tar.gz
chromium_src-7d6fb2281a9d7b9c041cfbb0cdc72c74c6b09070.tar.bz2
Fix Win Aura compile break caused by r127269.
Change bool to float. TBR=vollick BUG=no TEST=no Review URL: https://chromiumcodereview.appspot.com/9719007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127280 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_animations.cc')
-rw-r--r--ash/wm/window_animations.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
index b1a1a895..c10afde 100644
--- a/ash/wm/window_animations.cc
+++ b/ash/wm/window_animations.cc
@@ -389,7 +389,7 @@ void AddLayerAnimationsForMinimize(aura::Window* window, bool show) {
window->layer()->GetAnimator()->ScheduleAnimation(
new ui::LayerAnimationSequence(transition.release()));
- bool opacity = show ? 1.0f : 0.0f;
+ float opacity = show ? 1.0f : 0.0f;
window->layer()->GetAnimator()->ScheduleAnimation(
new ui::LayerAnimationSequence(
ui::LayerAnimationElement::CreateOpacityElement(opacity, duration)));