Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(433)

Unified Diff: content/browser/web_contents/web_contents_android.cc

Issue 2528823002: Separate SwipeRefreshHandler and ContentViewCore (Closed)
Patch Set: Fix non-Android compile issue Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/web_contents/web_contents_android.cc
diff --git a/content/browser/web_contents/web_contents_android.cc b/content/browser/web_contents/web_contents_android.cc
index 2d82f680c463f248e4ce78a9815d40ed4f180fcf..9ebd06c97ae75104605c65dd40191495f4e6cdcc 100644
--- a/content/browser/web_contents/web_contents_android.cc
+++ b/content/browser/web_contents/web_contents_android.cc
@@ -23,6 +23,7 @@
#include "content/browser/media/android/media_web_contents_observer_android.h"
#include "content/browser/renderer_host/render_view_host_impl.h"
#include "content/browser/web_contents/web_contents_impl.h"
+#include "content/browser/web_contents/web_contents_view_android.h"
#include "content/common/devtools_messages.h"
#include "content/common/frame_messages.h"
#include "content/common/input_messages.h"
@@ -616,6 +617,19 @@ ScopedJavaLocalRef<jstring> WebContentsAndroid::GetEncoding(
web_contents_->GetEncoding());
}
+void WebContentsAndroid::SetOverscrollRefreshHandler(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ const base::android::JavaParamRef<jobject>& overscroll_refresh_handler) {
+ WebContentsViewAndroid* view =
+ static_cast<WebContentsViewAndroid*>(web_contents_->GetView());
+ auto native_overscroll_refresh_handler =
+ base::MakeUnique<ui::OverscrollRefreshHandler>(
+ overscroll_refresh_handler);
+ view->SetOverscrollRefreshHandler(
+ std::move(native_overscroll_refresh_handler));
boliu 2016/12/03 01:05:28 nit: you can write these two statements in one, wh
rlanday 2016/12/05 19:53:56 Ok
+}
+
void WebContentsAndroid::GetContentBitmap(
JNIEnv* env,
const JavaParamRef<jobject>& obj,

Powered by Google App Engine
This is Rietveld 408576698