[ash] Cleanup of ScopedOverviewAnimationSettings

ash/wm/overview/scoped_transform_overview_window.cc

 // Copyright 2013 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_transform_overview_window.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/root_window_controller.h"
 #include "ash/wm/overview/scoped_overview_animation_settings.h"
-#include "ash/wm/overview/scoped_overview_animation_settings_factory.h"
 #include "ash/wm/overview/window_selector_item.h"
 #include "ash/wm/window_mirror_view.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm_window.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 15 matching lines @@
 
 // Delay closing window to allow it to shrink and fade out.
 const int kCloseWindowDelayInMilliseconds = 150;
 
 aura::Window* GetTransientRoot(aura::Window* window) {
   while (window && ::wm::GetTransientParent(window))
     window = ::wm::GetTransientParent(window);
   return window;
 }
 
-std::unique_ptr<ScopedOverviewAnimationSettings>
-CreateScopedOverviewAnimationSettings(OverviewAnimationType animation_type,
-                                      aura::Window* window) {
-  return ScopedOverviewAnimationSettingsFactory::Get()
-      ->CreateOverviewAnimationSettings(animation_type, window);
-}
-
 // An iterator class that traverses an aura::Window and all of its transient
 // descendants.
 class TransientDescendantIterator {
  public:
   // Creates an empty iterator.
   TransientDescendantIterator();
 
   // Copy constructor required for iterator purposes.
   TransientDescendantIterator(const TransientDescendantIterator& other) =
       default;
@@ skipping 125 matching lines @@
   if (minimized_widget_) {
     // TODO(oshima): Use unminimize animation instead of hiding animation.
     minimized_widget_->CloseNow();
     minimized_widget_.reset();
     return;
   }
   ScopedAnimationSettings animation_settings_list;
   BeginScopedAnimation(OverviewAnimationType::OVERVIEW_ANIMATION_RESTORE_WINDOW,
                        &animation_settings_list);
   SetTransform(window()->GetRootWindow(), original_transform_);
-  std::unique_ptr<ScopedOverviewAnimationSettings> animation_settings =
-      CreateScopedOverviewAnimationSettings(
-          OverviewAnimationType::OVERVIEW_ANIMATION_LAY_OUT_SELECTOR_ITEMS,
-          window_);
+  ScopedOverviewAnimationSettings animation_settings(
+      OverviewAnimationType::OVERVIEW_ANIMATION_LAY_OUT_SELECTOR_ITEMS,
+      window_);
   wm::GetWindowState(window_)->set_ignored_by_shelf(ignored_by_shelf_);
   SetOpacity(original_opacity_);
 }
 
 void ScopedTransformOverviewWindow::BeginScopedAnimation(
     OverviewAnimationType animation_type,
     ScopedAnimationSettings* animation_settings) {
   for (auto* window : GetTransientTreeIterator(GetOverviewWindow())) {
     animation_settings->push_back(
-        CreateScopedOverviewAnimationSettings(animation_type, window));
+        base::MakeUnique<ScopedOverviewAnimationSettings>(animation_type,
+                                                          window));
   }
 }
 
 bool ScopedTransformOverviewWindow::Contains(const aura::Window* target) const {
   for (auto* window : GetTransientTreeIterator(window_)) {
     if (window->Contains(target))
       return true;
   }
   aura::Window* mirror = GetOverviewWindowForMinimizedState();
   return mirror && mirror->Contains(target);
@@ skipping 282 matching lines @@
   // In unit tests, the content view can have empty size.
   if (!preferred.IsEmpty()) {
     int inset = bounds.height() - preferred.height();
     bounds.Inset(0, 0, 0, inset);
   }
   minimized_widget_->SetBounds(bounds);
   minimized_widget_->Show();
 }
 
 }  // namespace ash