Refactor GestureNavigation to eliminate code redundancy

content/browser/web_contents/web_contents_view_aura.h

Index: content/browser/web_contents/web_contents_view_aura.h
diff --git a/content/browser/web_contents/web_contents_view_aura.h b/content/browser/web_contents/web_contents_view_aura.h
index 999e535336eee05280ba1acb708d482ec677bc2c..43ea6e507fbcaaa8c8317298874998b0eb32a02b 100644
--- a/content/browser/web_contents/web_contents_view_aura.h
+++ b/content/browser/web_contents/web_contents_view_aura.h
@@ -15,7 +15,6 @@
 #include "content/common/content_export.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_observer.h"
-#include "ui/compositor/layer_animation_observer.h"
 #include "ui/wm/public/drag_drop_delegate.h"
 
 namespace aura {
@@ -29,6 +28,7 @@ class DropTargetEvent;
 namespace content {
 class GestureNavSimple;
 class OverscrollNavigationOverlay;
+class OverscrollWindowAnimation;
 class RenderWidgetHostImpl;
 class RenderWidgetHostViewAura;
 class ShadowLayerDelegate;
@@ -41,7 +41,6 @@ class WebContentsViewAura
     : public WebContentsView,
       public RenderViewHostDelegateView,
       public OverscrollControllerDelegate,
-      public ui::ImplicitAnimationObserver,
       public aura::WindowDelegate,
       public aura::client::DragDropDelegate,
       public aura::WindowObserver {
@@ -52,6 +51,10 @@ class WebContentsViewAura
   CONTENT_EXPORT void SetTouchEditableForTest(
       TouchEditableImplAura* touch_editable);
 
+  // TODO remove or use delegate.
+  // Dismisses the overlay with a fade out animation.
+  void DismissOverlay();
+
  private:
   class WindowObserver;
 
@@ -63,29 +66,15 @@ class WebContentsViewAura
 
   void InstallOverscrollControllerDelegate(RenderWidgetHostViewAura* view);
 
-  // Creates and sets up the overlay window that will be displayed during the
-  // overscroll gesture.
-  void PrepareOverscrollWindow();
-
   // Sets up the content window in preparation for starting an overscroll
   // gesture.
   void PrepareContentWindowForOverscroll();
 
-  // Resets any in-progress animation for the overscroll gesture. Note that this
-  // doesn't immediately reset the internal states; that happens after an
-  // animation.
-  void ResetOverscrollTransform();
-
   // Completes the navigation in response to a completed overscroll gesture.
   // The navigation happens after an animation (either the overlay window
   // animates in, or the content window animates out).
   void CompleteOverscrollNavigation(OverscrollMode mode);
 
-  // Returns the window that should be animated for the overscroll gesture.
-  // (note that during the overscroll gesture, either the overlay window or the
-  // content window can be animated).
-  aura::Window* GetWindowToAnimateForOverscroll();
-
   // Returns the amount the animating window should be translated in response to
   // the overscroll gesture.
   gfx::Vector2dF GetTranslationForOverscroll(float delta_x, float delta_y);
@@ -151,9 +140,6 @@ class WebContentsViewAura
   void OnOverscrollModeChange(OverscrollMode old_mode,
                               OverscrollMode new_mode) override;
 
-  // Overridden from ui::ImplicitAnimationObserver:
-  void OnImplicitAnimationsCompleted() override;
-
   // Overridden from aura::WindowDelegate:
   gfx::Size GetMinimumSize() const override;
   gfx::Size GetMaximumSize() const override;
@@ -193,10 +179,6 @@ class WebContentsViewAura
 
   scoped_ptr<aura::Window> window_;
 
-  // The window that shows the screenshot of the history page during an
-  // overscroll navigation gesture.
-  scoped_ptr<aura::Window> overscroll_window_;
-
   scoped_ptr<WindowObserver> window_observer_;
 
   // The WebContentsImpl whose contents we display.
@@ -216,8 +198,6 @@ class WebContentsViewAura
   // pointers.
   void* current_rvh_for_drag_;
 
-  bool overscroll_change_brightness_;
-
   // The overscroll gesture currently in progress.
   OverscrollMode current_overscroll_gesture_;
 
@@ -229,8 +209,6 @@ class WebContentsViewAura
   // navigation triggered by the overscroll gesture.
   scoped_ptr<OverscrollNavigationOverlay> navigation_overlay_;
 
-  scoped_ptr<ShadowLayerDelegate> overscroll_shadow_;
-
   scoped_ptr<TouchEditableImplAura> touch_editable_;
   scoped_ptr<GestureNavSimple> gesture_nav_simple_;
 
@@ -238,6 +216,9 @@ class WebContentsViewAura
   // initialization phase while the content (and its dimensions) are not known.
   bool is_or_was_visible_;
 
+  // The animation controller for overscroll navigation.
+  scoped_ptr<OverscrollWindowAnimation> overscroll_window_animation_;
+
   DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
 };