[ash] Cleanup of ScopedOverviewAnimationSettings

ash/wm/overview/window_grid.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/window_grid.h"
 
 #include <algorithm>
 #include <functional>
 #include <set>
 #include <utility>
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/wm_shelf.h"
 #include "ash/wm/overview/cleanup_animation_observer.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.h"
 #include "ash/wm/overview/window_selector_delegate.h"
 #include "ash/wm/overview/window_selector_item.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm_window.h"
 #include "base/command_line.h"
 #include "base/i18n/string_search.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ skipping 11 matching lines @@
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/coordinate_conversion.h"
 #include "ui/wm/core/shadow.h"
 #include "ui/wm/core/shadow_types.h"
 #include "ui/wm/core/window_animations.h"
 
 namespace ash {
 namespace {
 
-using Windows = aura::Window::Windows;
-
-// A comparator for locating a given target window.
-struct WindowSelectorItemComparator {
-  explicit WindowSelectorItemComparator(const aura::Window* target_window)
-      : target(target_window) {}
-
-  bool operator()(std::unique_ptr<WindowSelectorItem>& window) const {
-    return window->GetWindow() == target;
-  }
-
-  const aura::Window* target;
-};
-
 // Time it takes for the selector widget to move to the next target. The same
 // time is used for fading out shield widget when the overview mode is opened
 // or closed.
 const int kOverviewSelectorTransitionMilliseconds = 250;
 
 // The color and opacity of the screen shield in overview.
 const SkColor kShieldColor = SkColorSetARGB(255, 0, 0, 0);
 const float kShieldOpacity = 0.7f;
 
 // The color and opacity of the overview selector.
@@ skipping 473 matching lines @@
         selector_shadow_.reset();
       }
     }
   }
 }
 
 void WindowGrid::WindowClosing(WindowSelectorItem* window) {
   if (!selection_widget_ || SelectedWindow() != window)
     return;
   aura::Window* selection_widget_window = selection_widget_->GetNativeWindow();
-  std::unique_ptr<ScopedOverviewAnimationSettings> animation_settings_label =
-      ScopedOverviewAnimationSettingsFactory::Get()
-          ->CreateOverviewAnimationSettings(
-              OverviewAnimationType::OVERVIEW_ANIMATION_CLOSING_SELECTOR_ITEM,
-              selection_widget_window);
+  ScopedOverviewAnimationSettings animation_settings_label(
+      OverviewAnimationType::OVERVIEW_ANIMATION_CLOSING_SELECTOR_ITEM,
+      selection_widget_window);
   selection_widget_->SetOpacity(0.f);
 }
 
 void WindowGrid::OnWindowDestroying(aura::Window* window) {
   window_observer_.Remove(window);
   window_state_observer_.Remove(wm::GetWindowState(window));
   auto iter = std::find_if(window_list_.begin(), window_list_.end(),
-                           WindowSelectorItemComparator(window));
-
+                           [window](std::unique_ptr<WindowSelectorItem>& item) {
+                             return item->GetWindow() == window;
+                           });
   DCHECK(iter != window_list_.end());
 
   size_t removed_index = iter - window_list_.begin();
   window_list_.erase(iter);
 
   if (empty()) {
     // If the grid is now empty, notify the window selector so that it erases us
     // from its grid list.
     window_selector_->OnGridEmpty(this);
     return;
@@ skipping 14 matching lines @@
 
 void WindowGrid::OnWindowBoundsChanged(aura::Window* window,
                                        const gfx::Rect& old_bounds,
                                        const gfx::Rect& new_bounds) {
   // During preparation, window bounds can change. Ignore bounds
   // change notifications in this case; we'll reposition soon.
   if (!prepared_for_overview_)
     return;
 
   auto iter = std::find_if(window_list_.begin(), window_list_.end(),
-                           WindowSelectorItemComparator(window));
+                           [window](std::unique_ptr<WindowSelectorItem>& item) {
+                             return item->GetWindow() == window;
+                           });
   DCHECK(iter != window_list_.end());
 
   // Immediately finish any active bounds animation.
   window->layer()->GetAnimator()->StopAnimatingProperty(
       ui::LayerAnimationElement::BOUNDS);
   PositionWindows(false);
 }
 
 void WindowGrid::OnPostWindowStateTypeChange(wm::WindowState* window_state,
                                              wm::WindowStateType old_type) {
@@ skipping 214 matching lines @@
         *min_right = left;
       if (*max_right < left)
         *max_right = left;
     }
     *max_bottom = top + height;
   }
   return windows_fit;
 }
 
 }  // namespace ash