Separate SwipeRefreshHandler and ContentViewCore

content/browser/android/overscroll_controller_android.h

Index: content/browser/android/overscroll_controller_android.h
diff --git a/content/browser/android/overscroll_controller_android.h b/content/browser/android/overscroll_controller_android.h
index 199256c4fd62da39f9be8cd4bb916113d25519a8..3566a91ea28effd2ce8fd26ed563fa7af7a3156b 100644
--- a/content/browser/android/overscroll_controller_android.h
+++ b/content/browser/android/overscroll_controller_android.h
@@ -7,11 +7,13 @@
 
 #include <memory>
 
+#include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "content/common/input/input_event_ack_state.h"
 #include "ui/android/overscroll_glow.h"
 #include "ui/android/overscroll_refresh.h"
+#include "ui/android/overscroll_refresh_handler.h"

[boliu, 2016/12/06 00:58:16]

I think forward declare this in header and then include in cc should be fine
here

[rlanday, 2016/12/06 03:25:26]

Yep

 #include "ui/gfx/geometry/vector2d_f.h"
 
 namespace blink {
@@ -30,15 +32,15 @@ struct DidOverscrollParams;
 
 namespace content {
 
-class ContentViewCoreImpl;
-
 // Glue class for handling all inputs into Android-specific overscroll effects,
 // both the passive overscroll glow and the active overscroll pull-to-refresh.
 // Note that all input coordinates (both for events and overscroll) are in DIPs.
 class OverscrollControllerAndroid : public ui::OverscrollGlowClient {
  public:
-  explicit OverscrollControllerAndroid(ContentViewCoreImpl* content_view_core,
-                                       float dpi_scale);
+  OverscrollControllerAndroid(
+      ui::OverscrollRefreshHandler* overscroll_refresh_handler,
+      ui::WindowAndroidCompositor* compositor,
+      float dpi_scale);
   ~OverscrollControllerAndroid() override;
 
   // Returns true if |event| is consumed by an overscroll effect, in which