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

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

Issue 2528823002: Separate SwipeRefreshHandler and ContentViewCore (Closed)
Patch Set: Move web_contents_view_android.h header in web_contents_android.h into cc file, modify CreateRefres… Created 4 years, 1 month 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 9be39aeb0fdd6b73a22c14f772554df23fcdc7cb..841d439b0ade07744780bda2d3341c21c12eb27f 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,17 @@ ScopedJavaLocalRef<jstring> WebContentsAndroid::GetEncoding(
web_contents_->GetEncoding());
}
+void WebContentsAndroid::SetOverscrollRefreshHandler(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ jlong overscroll_refresh_handler_ptr) {
+ WebContentsViewAndroid* view =
+ static_cast<WebContentsViewAndroid*>(web_contents_->GetView());
+ view->SetOverscrollRefreshHandler(
+ reinterpret_cast<ui::OverscrollRefreshHandler*>(
Ted C 2016/11/29 00:06:08 I believe this is undefined behavior in C++ and so
rlanday 2016/11/29 00:46:25 Ah, interesting... Fixing this (maybe by adding @
+ overscroll_refresh_handler_ptr));
+}
+
void WebContentsAndroid::GetContentBitmap(
JNIEnv* env,
const JavaParamRef<jobject>& obj,

Powered by Google App Engine
This is Rietveld 408576698