Chromium Code Reviews| 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 d756f1c30b2d71347ac2b59eb77f66eb2293d7d0..41f8919714533b357427611e929df9cbb643cae8 100644 |
| --- a/chrome/browser/android/chrome_jni_registrar.cc |
| +++ b/chrome/browser/android/chrome_jni_registrar.cc |
| @@ -54,6 +54,7 @@ |
| #include "chrome/browser/ui/android/autofill/autofill_dialog_result.h" |
| #include "chrome/browser/ui/android/autofill/autofill_logger_android.h" |
| #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h" |
| +#include "chrome/browser/ui/android/autofill/country_adapter_android.h" |
| #include "chrome/browser/ui/android/chrome_http_auth_handler.h" |
| #include "chrome/browser/ui/android/context_menu_helper.h" |
| #include "chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.h" |
| @@ -87,103 +88,101 @@ namespace chrome { |
| namespace android { |
| static base::android::RegistrationMethod kChromeRegisteredMethods[] = { |
| - // Register JNI for components we depend on. |
| - { "DomDistiller", dom_distiller::android::RegisterDomDistiller }, |
| - { "GCMDriver", gcm::android::RegisterGCMDriverJni }, |
| - { "NavigationInterception", |
| - navigation_interception::RegisterNavigationInterceptionJni }, |
| - { "WebContentsDelegateAndroid", |
| - web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni }, |
| - { "RegisterAuxiliaryProfileLoader", autofill::RegisterAutofillAndroidJni }, |
| - // Register JNI for chrome classes. |
| - { "AccessibilityUtils", AccessibilityUtil::Register }, |
| - { "AccountManagementScreenHelper", AccountManagementScreenHelper::Register }, |
| - { "AndroidProfileOAuth2TokenService", |
| - AndroidProfileOAuth2TokenService::Register }, |
| - { "AnswersImageBridge", RegisterAnswersImageBridge }, |
| - { "AppBannerManager", banners::RegisterAppBannerManager }, |
| - { "ApplicationLifetime", RegisterApplicationLifetimeAndroid }, |
| - { "AutocompleteControllerAndroid", RegisterAutocompleteControllerAndroid }, |
| - { "AutofillDialogControllerAndroid", |
| - autofill::AutofillDialogControllerAndroid:: |
| - RegisterAutofillDialogControllerAndroid }, |
| - { "AutofillDialogResult", |
| - autofill::AutofillDialogResult::RegisterAutofillDialogResult }, |
| - { "AutofillLoggerAndroid", |
| - autofill::AutofillLoggerAndroid::Register }, |
| - { "AutofillPopup", |
| - autofill::AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid }, |
| - { "AutoLoginDelegate", AutoLoginInfoBarDelegateAndroid::Register }, |
| - { "BookmarksBridge", BookmarksBridge::RegisterBookmarksBridge }, |
| - { "CertificateViewer", RegisterCertificateViewer }, |
| - { "ChromeBrowserProvider", |
| - ChromeBrowserProvider::RegisterChromeBrowserProvider }, |
| - { "ChromeHttpAuthHandler", |
| - ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler }, |
| - { "ChromeWebContentsDelegateAndroid", |
| - RegisterChromeWebContentsDelegateAndroid }, |
| - { "ChromiumApplication", |
| - ChromiumApplication::RegisterBindings }, |
| - { "ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate }, |
| - { "ContentViewUtil", RegisterContentViewUtil }, |
| - { "ContextMenuHelper", RegisterContextMenuHelper }, |
| - { "DataReductionProxyInfoBarDelegate", DataReductionProxyInfoBar::Register }, |
| - { "DataReductionProxySettings", DataReductionProxySettingsAndroid::Register }, |
| - { "DevToolsServer", RegisterDevToolsServer }, |
| - { "DomDistillerServiceFactory", |
| - dom_distiller::android::DomDistillerServiceFactoryAndroid::Register}, |
| - { "DomDistillerTabUtils", RegisterDomDistillerTabUtils }, |
| - { "ExternalPrerenderRequestHandler", |
| - prerender::ExternalPrerenderHandlerAndroid:: |
| - RegisterExternalPrerenderHandlerAndroid }, |
| - { "FaviconHelper", FaviconHelper::RegisterFaviconHelper }, |
| - { "FeedbackReporter", dom_distiller::android::RegisterFeedbackReporter }, |
| - { "ForeignSessionHelper", |
| - ForeignSessionHelper::RegisterForeignSessionHelper }, |
| - { "InfoBarContainer", RegisterInfoBarContainer }, |
| - { "ShortcutHelper", ShortcutHelper::RegisterShortcutHelper }, |
| - { "IntentHelper", RegisterIntentHelper }, |
| - { "InvalidationController", invalidation::RegisterInvalidationController }, |
| - { "JavascriptAppModalDialog", |
| - JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog }, |
| - { "LogoBridge", RegisterLogoBridge }, |
| - { "MostVisitedSites", MostVisitedSites::Register }, |
| - { "NativeInfoBar", RegisterNativeInfoBar }, |
| - { "NavigationPopup", NavigationPopup::RegisterNavigationPopup }, |
| - { "NewTabPagePrefs", |
| - NewTabPagePrefs::RegisterNewTabPagePrefs }, |
| - { "OmniboxPrerender", RegisterOmniboxPrerender }, |
| - { "OmniboxViewUtil", OmniboxViewUtil::RegisterOmniboxViewUtil }, |
| - { "PasswordAuthenticationManager", |
| - PasswordAuthenticationManager::RegisterPasswordAuthenticationManager }, |
| - { "PasswordUIViewAndroid", |
| - PasswordUIViewAndroid::RegisterPasswordUIViewAndroid }, |
| - { "PersonalDataManagerAndroid", |
| - autofill::PersonalDataManagerAndroid::Register }, |
| - { "ProfileAndroid", ProfileAndroid::RegisterProfileAndroid }, |
| - { "ProfileDownloaderAndroid", ProfileDownloaderAndroid::Register }, |
| - { "ProfileSyncService", ProfileSyncServiceAndroid::Register }, |
| - { "RecentlyClosedBridge", RecentlyClosedTabsBridge::Register }, |
| - { "SavePasswordInfoBar", RegisterSavePasswordInfoBar }, |
| - { "SigninManager", SigninManagerAndroid::Register }, |
| - { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor }, |
| - { "SSLClientCertificateRequest", RegisterSSLClientCertificateRequestAndroid }, |
| - { "StartupMetricUtils", RegisterStartupMetricUtils }, |
| - { "TabAndroid", TabAndroid::RegisterTabAndroid }, |
| - { "TabModelBase", RegisterTabModelBase}, |
| - { "TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register }, |
| - { "ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid }, |
| - { "TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate }, |
| - { "TtsPlatformImpl", TtsPlatformImplAndroid::Register }, |
| - { "UmaBridge", RegisterUmaBridge }, |
| - { "UrlUtilities", RegisterUrlUtilities }, |
| - { "Variations", variations::android::RegisterVariations }, |
| - { "VoiceSearchTabHelper", RegisterVoiceSearchTabHelper }, |
| - { "WebsiteSettingsPopupAndroid", |
| - WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid }, |
| + // Register JNI for components we depend on. |
| + {"DomDistiller", dom_distiller::android::RegisterDomDistiller}, |
|
Evan Stade
2014/08/01 01:21:57
git cl format got over-zealous here... I can rever
|
| + {"GCMDriver", gcm::android::RegisterGCMDriverJni}, |
| + {"NavigationInterception", |
| + navigation_interception::RegisterNavigationInterceptionJni}, |
| + {"WebContentsDelegateAndroid", |
| + web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni}, |
| + {"RegisterAuxiliaryProfileLoader", autofill::RegisterAutofillAndroidJni}, |
| + // Register JNI for chrome classes. |
| + {"AccessibilityUtils", AccessibilityUtil::Register}, |
| + {"AccountManagementScreenHelper", AccountManagementScreenHelper::Register}, |
| + {"AndroidProfileOAuth2TokenService", |
| + AndroidProfileOAuth2TokenService::Register}, |
| + {"AnswersImageBridge", RegisterAnswersImageBridge}, |
| + {"AppBannerManager", banners::RegisterAppBannerManager}, |
| + {"ApplicationLifetime", RegisterApplicationLifetimeAndroid}, |
| + {"AutocompleteControllerAndroid", RegisterAutocompleteControllerAndroid}, |
| + {"AutofillDialogControllerAndroid", |
| + autofill::AutofillDialogControllerAndroid:: |
| + RegisterAutofillDialogControllerAndroid}, |
| + {"AutofillDialogResult", |
| + autofill::AutofillDialogResult::RegisterAutofillDialogResult}, |
| + {"AutofillLoggerAndroid", autofill::AutofillLoggerAndroid::Register}, |
| + {"AutofillPopup", |
| + autofill::AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid}, |
| + {"AutoLoginDelegate", AutoLoginInfoBarDelegateAndroid::Register}, |
| + {"BookmarksBridge", BookmarksBridge::RegisterBookmarksBridge}, |
| + {"CertificateViewer", RegisterCertificateViewer}, |
| + {"ChromeBrowserProvider", |
| + ChromeBrowserProvider::RegisterChromeBrowserProvider}, |
| + {"ChromeHttpAuthHandler", |
| + ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler}, |
| + {"ChromeWebContentsDelegateAndroid", |
| + RegisterChromeWebContentsDelegateAndroid}, |
| + {"ChromiumApplication", ChromiumApplication::RegisterBindings}, |
| + {"ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate}, |
| + {"ContentViewUtil", RegisterContentViewUtil}, |
| + {"ContextMenuHelper", RegisterContextMenuHelper}, |
| + {"CountryAdapterAndroid", autofill::CountryAdapterAndroid::Register}, |
| + {"DataReductionProxyInfoBarDelegate", DataReductionProxyInfoBar::Register}, |
| + {"DataReductionProxySettings", DataReductionProxySettingsAndroid::Register}, |
| + {"DevToolsServer", RegisterDevToolsServer}, |
| + {"DomDistillerServiceFactory", |
| + dom_distiller::android::DomDistillerServiceFactoryAndroid::Register}, |
| + {"DomDistillerTabUtils", RegisterDomDistillerTabUtils}, |
| + {"ExternalPrerenderRequestHandler", |
| + prerender::ExternalPrerenderHandlerAndroid:: |
| + RegisterExternalPrerenderHandlerAndroid}, |
| + {"FaviconHelper", FaviconHelper::RegisterFaviconHelper}, |
| + {"FeedbackReporter", dom_distiller::android::RegisterFeedbackReporter}, |
| + {"ForeignSessionHelper", |
| + ForeignSessionHelper::RegisterForeignSessionHelper}, |
| + {"InfoBarContainer", RegisterInfoBarContainer}, |
| + {"ShortcutHelper", ShortcutHelper::RegisterShortcutHelper}, |
| + {"IntentHelper", RegisterIntentHelper}, |
| + {"InvalidationController", invalidation::RegisterInvalidationController}, |
| + {"JavascriptAppModalDialog", |
| + JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog}, |
| + {"LogoBridge", RegisterLogoBridge}, |
| + {"MostVisitedSites", MostVisitedSites::Register}, |
| + {"NativeInfoBar", RegisterNativeInfoBar}, |
| + {"NavigationPopup", NavigationPopup::RegisterNavigationPopup}, |
| + {"NewTabPagePrefs", NewTabPagePrefs::RegisterNewTabPagePrefs}, |
| + {"OmniboxPrerender", RegisterOmniboxPrerender}, |
| + {"OmniboxViewUtil", OmniboxViewUtil::RegisterOmniboxViewUtil}, |
| + {"PasswordAuthenticationManager", |
| + PasswordAuthenticationManager::RegisterPasswordAuthenticationManager}, |
| + {"PasswordUIViewAndroid", |
| + PasswordUIViewAndroid::RegisterPasswordUIViewAndroid}, |
| + {"PersonalDataManagerAndroid", |
| + autofill::PersonalDataManagerAndroid::Register}, |
| + {"ProfileAndroid", ProfileAndroid::RegisterProfileAndroid}, |
| + {"ProfileDownloaderAndroid", ProfileDownloaderAndroid::Register}, |
| + {"ProfileSyncService", ProfileSyncServiceAndroid::Register}, |
| + {"RecentlyClosedBridge", RecentlyClosedTabsBridge::Register}, |
| + {"SavePasswordInfoBar", RegisterSavePasswordInfoBar}, |
| + {"SigninManager", SigninManagerAndroid::Register}, |
| + {"SqliteCursor", SQLiteCursor::RegisterSqliteCursor}, |
| + {"SSLClientCertificateRequest", RegisterSSLClientCertificateRequestAndroid}, |
| + {"StartupMetricUtils", RegisterStartupMetricUtils}, |
| + {"TabAndroid", TabAndroid::RegisterTabAndroid}, |
| + {"TabModelBase", RegisterTabModelBase}, |
| + {"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register}, |
| + {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid}, |
| + {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate}, |
| + {"TtsPlatformImpl", TtsPlatformImplAndroid::Register}, |
| + {"UmaBridge", RegisterUmaBridge}, |
| + {"UrlUtilities", RegisterUrlUtilities}, |
| + {"Variations", variations::android::RegisterVariations}, |
| + {"VoiceSearchTabHelper", RegisterVoiceSearchTabHelper}, |
| + {"WebsiteSettingsPopupAndroid", |
| + WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid}, |
| #if defined(ENABLE_PRINTING) && !defined(ENABLE_FULL_PRINTING) |
| - { "PrintingContext", |
| - printing::PrintingContextAndroid::RegisterPrintingContext}, |
| + {"PrintingContext", |
| + printing::PrintingContextAndroid::RegisterPrintingContext}, |
| #endif |
| }; |