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

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2681933002: Add Java wrapper for RenderFrameHost (Closed)
Patch Set: Try to address all review comments Created 3 years, 9 months 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/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index ff676db56414b28a6a8986670d5def976e6e88b8..2481839cd3bf16ea70edcfcf529392175d85ede9 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -112,8 +112,9 @@
#include "url/gurl.h"
#if defined(OS_ANDROID)
-#include "content/public/browser/android/java_interfaces.h"
+#include "content/browser/frame_host/render_frame_host_android.h"
#include "content/browser/media/android/media_player_renderer.h"
+#include "content/public/browser/android/java_interfaces.h"
#include "media/base/audio_renderer_sink.h"
#include "media/base/video_renderer_sink.h"
#include "media/mojo/services/mojo_renderer_service.h" // nogncheck
@@ -135,6 +136,10 @@ namespace content {
namespace {
+#if defined(OS_ANDROID)
+const char kRenderFrameHostAndroidKey[] = "render_frame_host_android";
+#endif // OS_ANDROID
+
// The next value to use for the accessibility reset token.
int g_next_accessibility_reset_token = 1;
@@ -3464,4 +3469,18 @@ RenderFrameHostImpl::TakeNavigationHandleForCommit(
entry_id_for_data_nav, false); // started_from_context_menu
}
+#if defined(OS_ANDROID)
+base::android::ScopedJavaLocalRef<jobject>
+RenderFrameHostImpl::GetJavaRenderFrameHost() {
+ RenderFrameHostAndroid* render_frame_host_android =
+ static_cast<RenderFrameHostAndroid*>(
+ GetUserData(kRenderFrameHostAndroidKey));
+ if (!render_frame_host_android) {
+ render_frame_host_android = new RenderFrameHostAndroid(this);
+ SetUserData(kRenderFrameHostAndroidKey, render_frame_host_android);
+ }
+ return render_frame_host_android->GetJavaObject();
+}
+#endif
+
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698