| 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/interface_registrar_android.h" | 5 #include "content/browser/mojo/interface_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/interface_registry_android.h" | 9 #include "content/public/browser/android/interface_registry_android.h" |
| 10 #include "content/public/browser/web_contents.h" |
| 10 #include "jni/InterfaceRegistrar_jni.h" | 11 #include "jni/InterfaceRegistrar_jni.h" |
| 11 | 12 |
| 12 namespace content { | 13 namespace content { |
| 13 | 14 |
| 14 // static | 15 // static |
| 15 void InterfaceRegistrarAndroid::ExposeInterfacesToRenderer( | 16 void InterfaceRegistrarAndroid::ExposeInterfacesToRenderer( |
| 16 InterfaceRegistryAndroid* registry) { | 17 InterfaceRegistryAndroid* registry) { |
| 17 JNIEnv* env = base::android::AttachCurrentThread(); | 18 JNIEnv* env = base::android::AttachCurrentThread(); |
| 18 Java_InterfaceRegistrar_exposeInterfacesToRenderer( | 19 Java_InterfaceRegistrar_exposeInterfacesToRenderer( |
| 19 env, registry->GetObj(), base::android::GetApplicationContext()); | 20 env, registry->GetObj(), base::android::GetApplicationContext()); |
| 20 } | 21 } |
| 21 | 22 |
| 22 // static | 23 // static |
| 23 void InterfaceRegistrarAndroid::ExposeInterfacesToFrame( | 24 void InterfaceRegistrarAndroid::ExposeInterfacesToFrame( |
| 24 InterfaceRegistryAndroid* registry) { | 25 InterfaceRegistryAndroid* registry, RenderFrameHost* frame) { |
| 26 base::android::ScopedJavaLocalRef<jobject> java_web_contents; |
| 27 WebContents* contents = WebContents::FromRenderFrameHost(frame); |
| 28 if (contents) |
| 29 java_web_contents = contents->GetJavaWebContents(); |
| 30 |
| 25 JNIEnv* env = base::android::AttachCurrentThread(); | 31 JNIEnv* env = base::android::AttachCurrentThread(); |
| 26 Java_InterfaceRegistrar_exposeInterfacesToFrame( | 32 Java_InterfaceRegistrar_exposeInterfacesToFrame( |
| 27 env, registry->GetObj(), base::android::GetApplicationContext()); | 33 env, registry->GetObj(), |
| 34 base::android::GetApplicationContext(), |
| 35 java_web_contents); |
| 28 } | 36 } |
| 29 } // namespace content | 37 } // namespace content |
| OLD | NEW |