OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/android/mojo/chrome_service_registrar_android.h" | 5 #include "chrome/browser/android/mojo/chrome_service_registrar_android.h" |
6 | 6 |
7 #include "base/android/context_utils.h" | 7 #include "base/android/context_utils.h" |
8 #include "base/android/jni_android.h" | 8 #include "base/android/jni_android.h" |
9 #include "content/public/browser/android/service_registry_android.h" | 9 #include "content/public/browser/android/service_registry_android.h" |
| 10 #include "content/public/browser/web_contents.h" |
10 #include "jni/ChromeServiceRegistrar_jni.h" | 11 #include "jni/ChromeServiceRegistrar_jni.h" |
11 | 12 |
12 // static | 13 // static |
13 bool ChromeServiceRegistrarAndroid::Register(JNIEnv* env) { | 14 bool ChromeServiceRegistrarAndroid::Register(JNIEnv* env) { |
14 return RegisterNativesImpl(env); | 15 return RegisterNativesImpl(env); |
15 } | 16 } |
16 | 17 |
17 // static | 18 // static |
18 void ChromeServiceRegistrarAndroid::RegisterRenderFrameMojoServices( | 19 void ChromeServiceRegistrarAndroid::RegisterRenderFrameMojoServices( |
19 content::ServiceRegistry* registry) { | 20 content::ServiceRegistry* registry, |
| 21 content::RenderFrameHost* render_frame_host) { |
20 Java_ChromeServiceRegistrar_registerRenderFrameMojoServices( | 22 Java_ChromeServiceRegistrar_registerRenderFrameMojoServices( |
21 base::android::AttachCurrentThread(), | 23 base::android::AttachCurrentThread(), |
22 content::ServiceRegistryAndroid::Create(registry)->GetObj().obj(), | 24 content::ServiceRegistryAndroid::Create(registry)->GetObj().obj(), |
23 base::android::GetApplicationContext()); | 25 content::WebContents::FromRenderFrameHost(render_frame_host) |
| 26 ->GetJavaWebContents() |
| 27 .obj()); |
24 } | 28 } |
OLD | NEW |