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" | 11 #include "base/android/context_utils.h" |
12 #include "base/android/jni_android.h" | 12 #include "base/android/jni_android.h" |
13 #include "base/memory/singleton.h" | 13 #include "base/memory/singleton.h" |
14 #include "content/public/browser/browser_thread.h" | 14 #include "content/public/browser/browser_thread.h" |
15 #include "content/public/browser/web_contents.h" | 15 #include "content/public/browser/web_contents.h" |
16 #include "jni/InterfaceRegistrarImpl_jni.h" | 16 #include "jni/InterfaceRegistrarImpl_jni.h" |
17 #include "mojo/public/cpp/system/message_pipe.h" | 17 #include "mojo/public/cpp/system/message_pipe.h" |
18 #include "services/service_manager/public/cpp/interface_provider.h" | 18 #include "services/service_manager/public/cpp/interface_provider.h" |
19 | 19 |
20 namespace content { | 20 namespace content { |
21 | 21 |
22 namespace { | 22 namespace { |
23 | 23 |
24 class JavaInterfaceProviderHolder { | 24 class JavaInterfaceProviderHolder { |
25 public: | 25 public: |
26 JavaInterfaceProviderHolder() { | 26 JavaInterfaceProviderHolder() { |
27 service_manager::mojom::InterfaceProviderPtr provider; | 27 service_manager::mojom::InterfaceProviderPtr provider; |
28 JNIEnv* env = base::android::AttachCurrentThread(); | 28 JNIEnv* env = base::android::AttachCurrentThread(); |
29 Java_InterfaceRegistrarImpl_createInterfaceRegistryForContext( | 29 Java_InterfaceRegistrarImpl_createInterfaceRegistryForContext( |
30 env, mojo::GetProxy(&provider).PassMessagePipe().release().value(), | 30 env, mojo::MakeRequest(&provider).PassMessagePipe().release().value(), |
31 base::android::GetApplicationContext()); | 31 base::android::GetApplicationContext()); |
32 interface_provider_.Bind(std::move(provider)); | 32 interface_provider_.Bind(std::move(provider)); |
33 } | 33 } |
34 | 34 |
35 static JavaInterfaceProviderHolder* GetInstance() { | 35 static JavaInterfaceProviderHolder* GetInstance() { |
36 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 36 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
37 return base::Singleton<JavaInterfaceProviderHolder>::get(); | 37 return base::Singleton<JavaInterfaceProviderHolder>::get(); |
38 } | 38 } |
39 | 39 |
40 service_manager::InterfaceProvider* GetJavaInterfaces() { | 40 service_manager::InterfaceProvider* GetJavaInterfaces() { |
(...skipping 13 matching lines...) Expand all Loading... |
54 void BindInterfaceRegistryForWebContents( | 54 void BindInterfaceRegistryForWebContents( |
55 service_manager::mojom::InterfaceProviderRequest request, | 55 service_manager::mojom::InterfaceProviderRequest request, |
56 WebContents* web_contents) { | 56 WebContents* web_contents) { |
57 JNIEnv* env = base::android::AttachCurrentThread(); | 57 JNIEnv* env = base::android::AttachCurrentThread(); |
58 Java_InterfaceRegistrarImpl_createInterfaceRegistryForWebContents( | 58 Java_InterfaceRegistrarImpl_createInterfaceRegistryForWebContents( |
59 env, request.PassMessagePipe().release().value(), | 59 env, request.PassMessagePipe().release().value(), |
60 web_contents->GetJavaWebContents().obj()); | 60 web_contents->GetJavaWebContents().obj()); |
61 } | 61 } |
62 | 62 |
63 } // namespace content | 63 } // namespace content |
OLD | NEW |