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 "content/public/browser/web_contents.h" |
11 #include "jni/ChromeServiceRegistrar_jni.h" | 11 #include "jni/ChromeServiceRegistrar_jni.h" |
| 12 #include "services/shell/public/cpp/interface_registry.h" |
12 | 13 |
13 // static | 14 // static |
14 bool ChromeServiceRegistrarAndroid::Register(JNIEnv* env) { | 15 bool ChromeServiceRegistrarAndroid::Register(JNIEnv* env) { |
15 return RegisterNativesImpl(env); | 16 return RegisterNativesImpl(env); |
16 } | 17 } |
17 | 18 |
18 // static | 19 // static |
19 void ChromeServiceRegistrarAndroid::RegisterRenderFrameMojoServices( | 20 void ChromeServiceRegistrarAndroid::RegisterRenderFrameMojoInterfaces( |
20 content::ServiceRegistry* registry, | 21 shell::InterfaceRegistry* registry, |
21 content::RenderFrameHost* render_frame_host) { | 22 content::RenderFrameHost* render_frame_host) { |
22 content::WebContents* web_contents = | 23 content::WebContents* web_contents = |
23 content::WebContents::FromRenderFrameHost(render_frame_host); | 24 content::WebContents::FromRenderFrameHost(render_frame_host); |
24 | 25 |
25 // Happens when, for example, showing the malware interstitial page. | 26 // Happens when, for example, showing the malware interstitial page. |
26 if (!web_contents) | 27 if (!web_contents) |
27 return; | 28 return; |
28 | 29 |
29 Java_ChromeServiceRegistrar_registerRenderFrameMojoServices( | 30 Java_ChromeServiceRegistrar_registerRenderFrameMojoServices( |
30 base::android::AttachCurrentThread(), | 31 base::android::AttachCurrentThread(), |
31 content::ServiceRegistryAndroid::Create(registry)->GetObj().obj(), | 32 content::ServiceRegistryAndroid::Create(registry, |
| 33 nullptr)->GetObj().obj(), |
32 web_contents->GetJavaWebContents().obj()); | 34 web_contents->GetJavaWebContents().obj()); |
33 } | 35 } |
OLD | NEW |