| 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 "content/browser/android/java_interfaces_impl.h" | 5 #include "content/browser/android/java_interfaces_impl.h" |
| 6 | 6 |
| 7 #include <jni.h> | 7 #include <jni.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| 11 #include "base/android/context_utils.h" | |
| 12 #include "base/android/jni_android.h" | 11 #include "base/android/jni_android.h" |
| 13 #include "base/memory/singleton.h" | 12 #include "base/memory/singleton.h" |
| 14 #include "content/browser/frame_host/render_frame_host_impl.h" | 13 #include "content/browser/frame_host/render_frame_host_impl.h" |
| 15 #include "content/public/browser/browser_thread.h" | 14 #include "content/public/browser/browser_thread.h" |
| 16 #include "content/public/browser/web_contents.h" | 15 #include "content/public/browser/web_contents.h" |
| 17 #include "jni/InterfaceRegistrarImpl_jni.h" | 16 #include "jni/InterfaceRegistrarImpl_jni.h" |
| 18 #include "mojo/public/cpp/system/message_pipe.h" | 17 #include "mojo/public/cpp/system/message_pipe.h" |
| 19 #include "services/service_manager/public/cpp/interface_provider.h" | 18 #include "services/service_manager/public/cpp/interface_provider.h" |
| 20 | 19 |
| 21 namespace content { | 20 namespace content { |
| 22 | 21 |
| 23 namespace { | 22 namespace { |
| 24 | 23 |
| 25 class JavaInterfaceProviderHolder { | 24 class JavaInterfaceProviderHolder { |
| 26 public: | 25 public: |
| 27 JavaInterfaceProviderHolder() { | 26 JavaInterfaceProviderHolder() { |
| 28 service_manager::mojom::InterfaceProviderPtr provider; | 27 service_manager::mojom::InterfaceProviderPtr provider; |
| 29 JNIEnv* env = base::android::AttachCurrentThread(); | 28 JNIEnv* env = base::android::AttachCurrentThread(); |
| 30 Java_InterfaceRegistrarImpl_createInterfaceRegistryForContext( | 29 Java_InterfaceRegistrarImpl_createInterfaceRegistryForContext( |
| 31 env, mojo::MakeRequest(&provider).PassMessagePipe().release().value(), | 30 env, mojo::MakeRequest(&provider).PassMessagePipe().release().value()); |
| 32 base::android::GetApplicationContext()); | |
| 33 interface_provider_.Bind(std::move(provider)); | 31 interface_provider_.Bind(std::move(provider)); |
| 34 } | 32 } |
| 35 | 33 |
| 36 static JavaInterfaceProviderHolder* GetInstance() { | 34 static JavaInterfaceProviderHolder* GetInstance() { |
| 37 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 35 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 38 return base::Singleton<JavaInterfaceProviderHolder>::get(); | 36 return base::Singleton<JavaInterfaceProviderHolder>::get(); |
| 39 } | 37 } |
| 40 | 38 |
| 41 service_manager::InterfaceProvider* GetJavaInterfaces() { | 39 service_manager::InterfaceProvider* GetJavaInterfaces() { |
| 42 return &interface_provider_; | 40 return &interface_provider_; |
| (...skipping 21 matching lines...) Expand all Loading... |
| 64 void BindInterfaceRegistryForRenderFrameHost( | 62 void BindInterfaceRegistryForRenderFrameHost( |
| 65 service_manager::mojom::InterfaceProviderRequest request, | 63 service_manager::mojom::InterfaceProviderRequest request, |
| 66 RenderFrameHostImpl* render_frame_host) { | 64 RenderFrameHostImpl* render_frame_host) { |
| 67 JNIEnv* env = base::android::AttachCurrentThread(); | 65 JNIEnv* env = base::android::AttachCurrentThread(); |
| 68 Java_InterfaceRegistrarImpl_createInterfaceRegistryForRenderFrameHost( | 66 Java_InterfaceRegistrarImpl_createInterfaceRegistryForRenderFrameHost( |
| 69 env, request.PassMessagePipe().release().value(), | 67 env, request.PassMessagePipe().release().value(), |
| 70 render_frame_host->GetJavaRenderFrameHost().obj()); | 68 render_frame_host->GetJavaRenderFrameHost().obj()); |
| 71 } | 69 } |
| 72 | 70 |
| 73 } // namespace content | 71 } // namespace content |
| OLD | NEW |