[ash-md] Animates a window closed while in overview mode

ash/common/wm/overview/scoped_transform_overview_window.h

 // 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.
 
 #ifndef ASH_COMMON_WM_OVERVIEW_SCOPED_TRANSFORM_OVERVIEW_WINDOW_H_
 #define ASH_COMMON_WM_OVERVIEW_SCOPED_TRANSFORM_OVERVIEW_WINDOW_H_
 
 #include <memory>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/common/wm/overview/overview_animation_type.h"
 #include "base/macros.h"
+#include "base/memory/weak_ptr.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/transform.h"
 
 namespace gfx {
 class Rect;
 }
 
 namespace ash {
 
 class ScopedOverviewAnimationSettings;
@@ skipping 85 matching lines @@
 
   // Set's the opacity of the managed windows.
   void SetOpacity(float opacity);
 
   WmWindow* window() const { return window_; }
 
   // Closes the transient root of the window managed by |this|.
   void Close();
 
  private:
+  friend class WindowSelectorTest;
   class OverviewContentMask;
 
   // Shows the window if it was minimized.
   void ShowWindowIfMinimized();
 
+  // Closes the window managed by |this|.
+  void CloseWidget();
+
+  // Makes Close() execute synchronously when used in tests.
+  static void SetImmediateCloseForTests();
+
   // A weak pointer to the real window in the overview.
   WmWindow* window_;
 
   // Mask layer that hides the original window header.
   std::unique_ptr<OverviewContentMask> mask_;
 
   // If true, the window was minimized and should be restored if the window
   // was not selected.
   bool minimized_;
 
   // Tracks if this window was ignored by the shelf.
   bool ignored_by_shelf_;
 
   // True if the window has been transformed for overview mode.
   bool overview_started_;
 
   // The original transform of the window before entering overview mode.
   gfx::Transform original_transform_;
 
   // Keeps track of the original transform used when |this| has been positioned
   // during SelectorItem layout.
   gfx::Transform overview_transform_;
 
   // The original opacity of the window before entering overview mode.
   float original_opacity_;
 
+  base::WeakPtrFactory<ScopedTransformOverviewWindow> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(ScopedTransformOverviewWindow);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_OVERVIEW_SCOPED_TRANSFORM_OVERVIEW_WINDOW_H_