Separate SwipeRefreshHandler and ContentViewCore

content/browser/web_contents/web_contents_view_android.cc

Index: content/browser/web_contents/web_contents_view_android.cc
diff --git a/content/browser/web_contents/web_contents_view_android.cc b/content/browser/web_contents/web_contents_view_android.cc
index 0dc8bf471cc26e6bdadcf88854b21981f2e4fa66..bd9c762ead42ed843dffd6a8be67ceb666a569c0 100644
--- a/content/browser/web_contents/web_contents_view_android.cc
+++ b/content/browser/web_contents/web_contents_view_android.cc
@@ -17,6 +17,7 @@
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/drop_data.h"
+#include "ui/android/overscroll_refresh_handler.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/android/device_display_info.h"
 #include "ui/gfx/android/java_bitmap.h"
@@ -111,6 +112,31 @@ void WebContentsViewAndroid::SetContentViewCore(
   }
 }
 
+void WebContentsViewAndroid::SetOverscrollRefreshHandler(
+    std::unique_ptr<ui::OverscrollRefreshHandler> overscroll_refresh_handler) {
+  overscroll_refresh_handler_ = std::move(overscroll_refresh_handler);
+  RenderWidgetHostViewAndroid* rwhv = static_cast<RenderWidgetHostViewAndroid*>(
+      web_contents_->GetRenderWidgetHostView());
+  if (rwhv)
+    rwhv->OnOverscrollRefreshHandlerSet();
+
+  if (web_contents_->ShowingInterstitialPage()) {
+    rwhv = static_cast<RenderWidgetHostViewAndroid*>(
+        web_contents_->GetInterstitialPage()
+            ->GetMainFrame()
+            ->GetRenderViewHost()
+            ->GetWidget()
+            ->GetView());
+    if (rwhv)
+      rwhv->OnOverscrollRefreshHandlerSet();
+  }
+}
+
+ui::OverscrollRefreshHandler*
+WebContentsViewAndroid::GetOverscrollRefreshHandler() const {
+  return overscroll_refresh_handler_.get();
+}
+
 gfx::NativeView WebContentsViewAndroid::GetNativeView() const {
   return const_cast<gfx::NativeView>(&view_);
 }