Separate SwipeRefreshHandler and ContentViewCore

content/browser/web_contents/web_contents_view_android.cc

 // Copyright (c) 2012 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 "content/browser/web_contents/web_contents_view_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "cc/layers/layer.h"
@@ skipping 93 matching lines @@
         web_contents_->GetInterstitialPage()
             ->GetMainFrame()
             ->GetRenderViewHost()
             ->GetWidget()
             ->GetView());
     if (rwhv)
       rwhv->SetContentViewCore(content_view_core_);
   }
 }
 
+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());

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

need to update interstitial as well, see the ShowingInterstitialPage block in
SetContentViewCore above

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

Ah, ok

+  if (rwhv) {
+    rwhv->OnSetOverscrollRefreshHandler();
+  }
+}
+
+ui::OverscrollRefreshHandler*
+WebContentsViewAndroid::GetOverscrollRefreshHandler() const {
+  return overscroll_refresh_handler_.get();
+}
+
 gfx::NativeView WebContentsViewAndroid::GetNativeView() const {
   return const_cast<gfx::NativeView>(&view_);
 }
 
 gfx::NativeView WebContentsViewAndroid::GetContentNativeView() const {
   RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView();
   if (rwhv)
     return rwhv->GetNativeView();
 
   // TODO(sievers): This should return null.
@@ skipping 240 matching lines @@
 // This is called when we the renderer asks us to take focus back (i.e., it has
 // iterated past the last focusable element on the page).
 void WebContentsViewAndroid::TakeFocus(bool reverse) {
   if (web_contents_->GetDelegate() &&
       web_contents_->GetDelegate()->TakeFocus(web_contents_, reverse))
     return;
   web_contents_->GetRenderWidgetHostView()->Focus();
 }
 
 } // namespace content