Revert of Cros Tablet Window management - Split Screen part II

ash/wm/overview/scoped_overview_animation_settings.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/overview/scoped_overview_animation_settings.h"
 
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/time/time.h"
 #include "ui/aura/window.h"
@@ skipping 30 matching lines @@
       return base::TimeDelta::FromMilliseconds(kFadeInMilliseconds);
     case OVERVIEW_ANIMATION_EXIT_OVERVIEW_MODE_FADE_OUT:
       return base::TimeDelta::FromMilliseconds(kFadeOutMilliseconds);
     case OVERVIEW_ANIMATION_LAY_OUT_SELECTOR_ITEMS:
     case OVERVIEW_ANIMATION_RESTORE_WINDOW:
       return base::TimeDelta::FromMilliseconds(kTransitionMilliseconds);
     case OVERVIEW_ANIMATION_CLOSING_SELECTOR_ITEM:
       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();
 }
 
 class OverviewEnterMetricsReporter : public ui::AnimationMetricsReporter {
  public:
   OverviewEnterMetricsReporter() = default;
   ~OverviewEnterMetricsReporter() override = default;
 
@@ skipping 38 matching lines @@
     LAZY_INSTANCE_INITIALIZER;
 base::LazyInstance<OverviewExitMetricsReporter>::Leaky g_reporter_exit =
     LAZY_INSTANCE_INITIALIZER;
 base::LazyInstance<OverviewCloseMetricsReporter>::Leaky g_reporter_close =
     LAZY_INSTANCE_INITIALIZER;
 
 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:
       return g_reporter_enter.Pointer();
     case OVERVIEW_ANIMATION_EXIT_OVERVIEW_MODE_FADE_OUT:
     case OVERVIEW_ANIMATION_RESTORE_WINDOW:
       return g_reporter_exit.Pointer();
     case OVERVIEW_ANIMATION_CLOSING_SELECTOR_ITEM:
     case OVERVIEW_ANIMATION_CLOSE_SELECTOR_ITEM:
       return g_reporter_close.Pointer();
@@ skipping 28 matching lines @@
           ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS);
       break;
     case OVERVIEW_ANIMATION_LAY_OUT_SELECTOR_ITEMS:
     case OVERVIEW_ANIMATION_RESTORE_WINDOW:
       animation_settings_->SetPreemptionStrategy(
           ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
       animation_settings_->SetTweenType(gfx::Tween::EASE_OUT);
       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);
       break;
   }
   animation_settings_->SetTransitionDuration(
       GetAnimationDuration(animation_type));
   animation_settings_->SetAnimationMetricsReporter(
       GetMetricsReporter(animation_type));
 }
 
 ScopedOverviewAnimationSettings::~ScopedOverviewAnimationSettings() {}
 
 void ScopedOverviewAnimationSettings::AddObserver(
     ui::ImplicitAnimationObserver* observer) {
   animation_settings_->AddObserver(observer);
 }
 
 }  // namespace ash