OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "content/browser/mojo/service_registrar_android.h" | 5 #include "content/browser/mojo/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/ServiceRegistrar_jni.h" | 11 #include "jni/ServiceRegistrar_jni.h" |
11 | 12 |
12 namespace content { | 13 namespace content { |
13 | 14 |
14 // static | 15 // static |
15 bool ServiceRegistrarAndroid::Register(JNIEnv* env) { | 16 bool ServiceRegistrarAndroid::Register(JNIEnv* env) { |
16 return RegisterNativesImpl(env); | 17 return RegisterNativesImpl(env); |
17 } | 18 } |
18 | 19 |
19 // static | 20 // static |
20 void ServiceRegistrarAndroid::RegisterProcessHostServices( | 21 void ServiceRegistrarAndroid::RegisterProcessHostServices( |
21 ServiceRegistryAndroid* registry) { | 22 ServiceRegistryAndroid* registry) { |
22 JNIEnv* env = base::android::AttachCurrentThread(); | 23 JNIEnv* env = base::android::AttachCurrentThread(); |
23 Java_ServiceRegistrar_registerProcessHostServices( | 24 Java_ServiceRegistrar_registerProcessHostServices( |
24 env, registry->GetObj().obj(), base::android::GetApplicationContext()); | 25 env, registry->GetObj().obj(), base::android::GetApplicationContext()); |
25 } | 26 } |
26 | 27 |
27 // static | 28 // static |
28 void ServiceRegistrarAndroid::RegisterFrameHostServices( | 29 void ServiceRegistrarAndroid::RegisterFrameHostServices( |
29 ServiceRegistryAndroid* registry) { | 30 ServiceRegistryAndroid* registry, RenderFrameHost* frame) { |
| 31 ScopedJavaLocalRef<jobject> java_web_contents; |
| 32 WebContents* contents = WebContents::FromRenderFrameHost(frame); |
| 33 if (contents) |
| 34 java_web_contents = contents->GetJavaWebContents(); |
| 35 |
30 JNIEnv* env = base::android::AttachCurrentThread(); | 36 JNIEnv* env = base::android::AttachCurrentThread(); |
31 Java_ServiceRegistrar_registerFrameHostServices( | 37 Java_ServiceRegistrar_registerFrameHostServices( |
32 env, registry->GetObj().obj(), base::android::GetApplicationContext()); | 38 env, registry->GetObj().obj(), |
| 39 base::android::GetApplicationContext(), |
| 40 java_web_contents.obj()); |
33 } | 41 } |
34 } // namespace content | 42 } // namespace content |
OLD | NEW |