Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: chrome/browser/android/mojo/chrome_interface_registrar_android.cc

Issue 2146753002: Android: Remove unneeded RegisterNatives() calls (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Android: Don't require RegisterNatives if there are none Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_interface_registrar_android.h" 5 #include "chrome/browser/android/mojo/chrome_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 "content/public/browser/web_contents.h"
11 #include "jni/ChromeInterfaceRegistrar_jni.h" 11 #include "jni/ChromeInterfaceRegistrar_jni.h"
12 #include "services/shell/public/cpp/interface_registry.h" 12 #include "services/shell/public/cpp/interface_registry.h"
13 13
14 // static 14 // static
15 bool ChromeInterfaceRegistrarAndroid::Register(JNIEnv* env) {
16 return RegisterNativesImpl(env);
17 }
18
19 // static
20 void ChromeInterfaceRegistrarAndroid::ExposeInterfacesToFrame( 15 void ChromeInterfaceRegistrarAndroid::ExposeInterfacesToFrame(
21 shell::InterfaceRegistry* registry, 16 shell::InterfaceRegistry* registry,
22 content::RenderFrameHost* render_frame_host) { 17 content::RenderFrameHost* render_frame_host) {
23 content::WebContents* web_contents = 18 content::WebContents* web_contents =
24 content::WebContents::FromRenderFrameHost(render_frame_host); 19 content::WebContents::FromRenderFrameHost(render_frame_host);
25 20
26 // Happens when, for example, showing the malware interstitial page. 21 // Happens when, for example, showing the malware interstitial page.
27 if (!web_contents) 22 if (!web_contents)
28 return; 23 return;
29 24
30 Java_ChromeInterfaceRegistrar_exposeInterfacesToFrame( 25 Java_ChromeInterfaceRegistrar_exposeInterfacesToFrame(
31 base::android::AttachCurrentThread(), 26 base::android::AttachCurrentThread(),
32 content::InterfaceRegistryAndroid::Create(registry)->GetObj().obj(), 27 content::InterfaceRegistryAndroid::Create(registry)->GetObj().obj(),
33 web_contents->GetJavaWebContents().obj()); 28 web_contents->GetJavaWebContents().obj());
34 } 29 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698