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

Unified Diff: chrome/browser/android/mojo/chrome_service_registrar_android.cc

Issue 1902913002: Provide web contents to Chrome's mojo services (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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: chrome/browser/android/mojo/chrome_service_registrar_android.cc
diff --git a/chrome/browser/android/mojo/chrome_service_registrar_android.cc b/chrome/browser/android/mojo/chrome_service_registrar_android.cc
index c7749ada85ae04f7d19494f5d49ba627ff896300..80b48f45070acb3de68290c431187c809c1f7a95 100644
--- a/chrome/browser/android/mojo/chrome_service_registrar_android.cc
+++ b/chrome/browser/android/mojo/chrome_service_registrar_android.cc
@@ -7,6 +7,7 @@
#include "base/android/context_utils.h"
#include "base/android/jni_android.h"
#include "content/public/browser/android/service_registry_android.h"
+#include "content/public/browser/web_contents.h"
#include "jni/ChromeServiceRegistrar_jni.h"
// static
@@ -16,9 +17,12 @@ bool ChromeServiceRegistrarAndroid::Register(JNIEnv* env) {
// static
void ChromeServiceRegistrarAndroid::RegisterRenderFrameMojoServices(
- content::ServiceRegistry* registry) {
+ content::ServiceRegistry* registry,
+ content::RenderFrameHost* render_frame_host) {
Java_ChromeServiceRegistrar_registerRenderFrameMojoServices(
base::android::AttachCurrentThread(),
content::ServiceRegistryAndroid::Create(registry)->GetObj().obj(),
- base::android::GetApplicationContext());
+ content::WebContents::FromRenderFrameHost(render_frame_host)
+ ->GetJavaWebContents()
+ .obj());
}
« no previous file with comments | « chrome/browser/android/mojo/chrome_service_registrar_android.h ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698