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

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

Issue 2681933002: Add Java wrapper for RenderFrameHost (Closed)
Patch Set: Hold on to RFH main frame Created 3 years, 10 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 3beb56b79bd12456d919de368f5fdace3c017a25..d14133c93f06a5976861b856025da524a85c9f7e 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
@@ -129,6 +130,10 @@
#include "device/vr/vr_service.mojom.h" // nogncheck
#endif
+#if defined(OS_ANDROID)
+const char kRenderFrameHostAndroidKey[] = "render_frame_host_android";
boliu 2017/03/03 23:55:29 put this in anonymous namespace below
rwlbuis 2017/03/06 20:58:58 Done.
+#endif // OS_ANDROID
+
using base::TimeDelta;
namespace content {
@@ -3466,4 +3471,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