chrome/browser/android/chrome_jni_registrar.cc - Issue 2191033002: Split ServiceRegistryAndroid into InterfaceRegistryAndroid and InterfaceProviderAndroid

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/android/chrome_jni_registrar.cc

Issue 2191033002: Split ServiceRegistryAndroid into InterfaceRegistryAndroid and InterfaceProviderAndroid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 4 years, 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java_sources.gni ('k') | chrome/browser/android/mojo/chrome_interface_registrar_android.h » ('j') | content/public/browser/android/interface_provider_android.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/chrome_jni_registrar.cc

diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc

index 0cc1eb4518eae55dd6b09888d1b13e5ada93e10f..5ef9cf5d666199353340e814766a07a3eb35a3f1 100644

--- a/chrome/browser/android/chrome_jni_registrar.cc

+++ b/chrome/browser/android/chrome_jni_registrar.cc

@@ -61,7 +61,7 @@

#include "chrome/browser/android/metrics/uma_session_stats.h"

#include "chrome/browser/android/metrics/uma_utils.h"

#include "chrome/browser/android/metrics/variations_session.h"

-#include "chrome/browser/android/mojo/chrome_service_registrar_android.h"

+#include "chrome/browser/android/mojo/chrome_interface_registrar_android.h"

#include "chrome/browser/android/net/external_estimate_provider_android.h"

#include "chrome/browser/android/ntp/most_visited_sites_bridge.h"

#include "chrome/browser/android/ntp/new_tab_page_prefs.h"

@@ -253,12 +253,12 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {

{"ChromeFeatureList", RegisterChromeFeatureListJni},

{"ChromeHttpAuthHandler",

ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler},

+ {"ChromeInterfaceRegistrar", ChromeInterfaceRegistrarAndroid::Register},

#if defined(ENABLE_MEDIA_ROUTER)

{"ChromeMediaRouter", media_router::MediaRouterAndroid::Register},

{"ChromeMediaRouterDialogController",

media_router::MediaRouterDialogControllerAndroid::Register},

#endif

- {"ChromeServiceRegistrar", ChromeServiceRegistrarAndroid::Register},

{"CompositorView", RegisterCompositorView},

{"ConfirmInfoBar", RegisterConfirmInfoBar},

{"ConnectionInfoPopupAndroid",