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

Unified Diff: ash/wm/overview/scoped_overview_animation_settings.cc

Issue 2918403006: CrOS Tablet Window management - Split Screen part I (Closed)
Patch Set: Add unittests. Will split the CL into two CLs. Created 3 years, 6 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
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 f4c44f7979b118c3b2fe2ce5936aeca89fc7ee3b..bd73707aacdab8541986cebd6bdbc78bf4effe84 100644
--- a/ash/wm/overview/scoped_overview_animation_settings.cc
+++ b/ash/wm/overview/scoped_overview_animation_settings.cc
@@ -48,6 +48,8 @@ base::TimeDelta GetAnimationDuration(OverviewAnimationType animation_type) {
return base::TimeDelta::FromMilliseconds(kCloseScaleMilliseconds);
case OVERVIEW_ANIMATION_CLOSE_SELECTOR_ITEM:
return base::TimeDelta::FromMilliseconds(kCloseFadeOutMilliseconds);
+ case OVERVIEW_ANIMATION_DRAGGING_SELECTOR_ITEM:
+ return base::TimeDelta::FromMilliseconds(kTransitionMilliseconds);
}
NOTREACHED();
return base::TimeDelta();
@@ -106,6 +108,7 @@ ui::AnimationMetricsReporter* GetMetricsReporter(
OverviewAnimationType animation_type) {
switch (animation_type) {
case OVERVIEW_ANIMATION_NONE:
+ case OVERVIEW_ANIMATION_DRAGGING_SELECTOR_ITEM:
return nullptr;
case OVERVIEW_ANIMATION_ENTER_OVERVIEW_MODE_FADE_IN:
case OVERVIEW_ANIMATION_LAY_OUT_SELECTOR_ITEMS:
@@ -154,6 +157,7 @@ ScopedOverviewAnimationSettings::ScopedOverviewAnimationSettings(
break;
case OVERVIEW_ANIMATION_CLOSING_SELECTOR_ITEM:
case OVERVIEW_ANIMATION_CLOSE_SELECTOR_ITEM:
+ case OVERVIEW_ANIMATION_DRAGGING_SELECTOR_ITEM:
animation_settings_->SetPreemptionStrategy(
ui::LayerAnimator::ENQUEUE_NEW_ANIMATION);
animation_settings_->SetTweenType(gfx::Tween::EASE_OUT);
« no previous file with comments | « ash/wm/overview/overview_window_drag_controller.cc ('k') | ash/wm/overview/scoped_transform_overview_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698