Index: ash/wm/overview/scoped_overview_animation_settings.cc |
diff --git a/ash/wm/overview/scoped_overview_animation_settings.cc b/ash/wm/overview/scoped_overview_animation_settings.cc |
index 3cb6bcbcc8b047400752bc09ee76f5059fc0a8b4..e0cf9776e9cbe09039d7aafdd716cc5d22ce2735 100644 |
--- a/ash/wm/overview/scoped_overview_animation_settings.cc |
+++ b/ash/wm/overview/scoped_overview_animation_settings.cc |
@@ -20,22 +20,15 @@ const int kTransitionMilliseconds = 200; |
// The time duration for widgets to fade in. |
const int kFadeInMilliseconds = 80; |
-// The time duration for widgets to fade out. |
-const int kFadeOutMilliseconds = 100; |
- |
base::TimeDelta GetAnimationDuration(OverviewAnimationType animation_type) { |
switch (animation_type) { |
case OVERVIEW_ANIMATION_NONE: |
- case OVERVIEW_ANIMATION_SCROLL_SELECTOR_ITEM: |
return base::TimeDelta(); |
case OVERVIEW_ANIMATION_ENTER_OVERVIEW_MODE_FADE_IN: |
return base::TimeDelta::FromMilliseconds(kFadeInMilliseconds); |
- case OVERVIEW_ANIMATION_ENTER_OVERVIEW_MODE_FADE_OUT: |
- return base::TimeDelta::FromMilliseconds(kFadeOutMilliseconds); |
case OVERVIEW_ANIMATION_LAY_OUT_SELECTOR_ITEMS: |
case OVERVIEW_ANIMATION_RESTORE_WINDOW: |
case OVERVIEW_ANIMATION_HIDE_WINDOW: |
- case OVERVIEW_ANIMATION_CANCEL_SELECTOR_ITEM_SCROLL: |
return base::TimeDelta::FromMilliseconds(kTransitionMilliseconds); |
} |
NOTREACHED(); |
@@ -51,7 +44,6 @@ ScopedOverviewAnimationSettings::ScopedOverviewAnimationSettings( |
switch (animation_type) { |
case OVERVIEW_ANIMATION_NONE: |
- case OVERVIEW_ANIMATION_SCROLL_SELECTOR_ITEM: |
animation_settings_.SetPreemptionStrategy( |
ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS); |
break; |
@@ -63,10 +55,6 @@ ScopedOverviewAnimationSettings::ScopedOverviewAnimationSettings( |
animation_settings_.SetPreemptionStrategy( |
ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS); |
break; |
- case OVERVIEW_ANIMATION_ENTER_OVERVIEW_MODE_FADE_OUT: |
- animation_settings_.SetPreemptionStrategy( |
- ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS); |
- break; |
case OVERVIEW_ANIMATION_LAY_OUT_SELECTOR_ITEMS: |
case OVERVIEW_ANIMATION_RESTORE_WINDOW: |
animation_settings_.SetPreemptionStrategy( |
@@ -77,11 +65,6 @@ ScopedOverviewAnimationSettings::ScopedOverviewAnimationSettings( |
animation_settings_.SetPreemptionStrategy( |
ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET); |
break; |
- case OVERVIEW_ANIMATION_CANCEL_SELECTOR_ITEM_SCROLL: |
- animation_settings_.SetPreemptionStrategy( |
- ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET); |
- animation_settings_.SetTweenType(gfx::Tween::EASE_IN_OUT); |
- break; |
} |
animation_settings_.SetTransitionDuration( |
GetAnimationDuration(animation_type)); |