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 4bbf922ca0f2243819dacf25b6edde7e2b3a3726..77574aecce02f866b9333b9b9565872c5081bf10 100644 |
--- a/chrome/browser/android/chrome_jni_registrar.cc |
+++ b/chrome/browser/android/chrome_jni_registrar.cc |
@@ -10,7 +10,6 @@ |
#include "base/trace_event/trace_event.h" |
#include "chrome/browser/after_startup_task_utils_android.h" |
#include "chrome/browser/android/accessibility/font_size_prefs_android.h" |
-#include "chrome/browser/android/accessibility_util.h" |
#include "chrome/browser/android/appmenu/app_menu_drag_helper.h" |
#include "chrome/browser/android/background_sync_launcher_android.h" |
#include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h" |
@@ -144,7 +143,6 @@ |
#include "chrome/browser/ui/android/infobars/autofill_save_card_infobar.h" |
#include "chrome/browser/ui/android/infobars/confirm_infobar.h" |
#include "chrome/browser/ui/android/infobars/download_overwrite_infobar.h" |
-#include "chrome/browser/ui/android/infobars/generated_password_saved_infobar.h" |
#include "chrome/browser/ui/android/infobars/grouped_permission_infobar.h" |
#include "chrome/browser/ui/android/infobars/infobar_android.h" |
#include "chrome/browser/ui/android/infobars/infobar_container_android.h" |
@@ -162,12 +160,10 @@ |
#include "chrome/browser/ui/android/toolbar/toolbar_model_android.h" |
#include "chrome/browser/ui/android/usb_chooser_dialog_android.h" |
#include "chrome/browser/ui/android/website_settings_popup_android.h" |
-#include "components/bookmarks/common/android/component_jni_registrar.h" |
#include "components/dom_distiller/android/component_jni_registrar.h" |
#include "components/gcm_driver/android/component_jni_registrar.h" |
#include "components/gcm_driver/instance_id/android/component_jni_registrar.h" |
#include "components/invalidation/impl/android/component_jni_registrar.h" |
-#include "components/navigation_interception/component_jni_registrar.h" |
#include "components/policy/core/browser/android/component_jni_registrar.h" |
#include "components/safe_json/android/component_jni_registrar.h" |
#include "components/signin/core/browser/android/component_jni_registrar.h" |
@@ -186,21 +182,17 @@ namespace android { |
static base::android::RegistrationMethod kChromeRegisteredMethods[] = { |
// Register JNI for components we depend on. |
{"AppMenuDragHelper", RegisterAppMenuDragHelper}, |
- {"Bookmarks", bookmarks::android::RegisterBookmarks}, |
{"DomDistiller", dom_distiller::android::RegisterDomDistiller}, |
{"ChromeDownloadDelegate", RegisterChromeDownloadDelegate}, |
{"GCMDriver", gcm::android::RegisterGCMDriverJni}, |
{"InstanceID", instance_id::android::RegisterInstanceIDJni}, |
{"Invalidation", invalidation::android::RegisterInvalidationJni}, |
- {"NavigationInterception", |
- navigation_interception::RegisterNavigationInterceptionJni}, |
{"Policy", policy::android::RegisterPolicy}, |
{"SafeJson", safe_json::android::RegisterSafeJsonJni}, |
{"Signin", signin::android::RegisterSigninJni}, |
{"WebContentsDelegateAndroid", |
web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni}, |
// Register JNI for chrome classes. |
- {"AccessibilityUtils", AccessibilityUtil::Register}, |
{"AccountChooserDialogAndroid", RegisterAccountChooserDialogAndroid}, |
{"AutoSigninFirstRunDialogAndroid", |
RegisterAutoSigninFirstRunDialogAndroid}, |
@@ -210,30 +202,23 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = { |
AddToHomescreenDialogHelper::RegisterAddToHomescreenDialogHelper}, |
{"AfterStartupTaskUtils", RegisterAfterStartupTaskUtilsJNI}, |
{"AnswersImageBridge", RegisterAnswersImageBridge}, |
- {"AppBannerInfoBarAndroid", RegisterAppBannerInfoBarAndroid}, |
{"AppBannerInfoBarDelegateAndroid", |
banners::RegisterAppBannerInfoBarDelegateAndroid}, |
{"AppBannerManagerAndroid", banners::AppBannerManagerAndroid::Register}, |
- {"ApplicationLifetime", RegisterApplicationLifetimeAndroid}, |
{"AutocompleteControllerAndroid", RegisterAutocompleteControllerAndroid}, |
{"AutofillSaveCardInfoBar", AutofillSaveCardInfoBar::Register}, |
{"AutofillKeyboardAccessory", autofill::AutofillKeyboardAccessoryView:: |
RegisterAutofillKeyboardAccessoryView}, |
- {"AutofillLoggerAndroid", autofill::AutofillLoggerAndroid::Register}, |
{"AutofillPopup", |
autofill::AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid}, |
{"AutofillProfileBridge", autofill::RegisterAutofillProfileBridge}, |
- {"AutoSigninSnackbarController", RegisterAutoSigninSnackbarController}, |
{"BackgroundSchedulerBridge", |
offline_pages::android::RegisterBackgroundSchedulerBridge}, |
- {"BackgroundSyncLauncherAndroid", |
- BackgroundSyncLauncherAndroid::RegisterLauncher}, |
{"BluetoothChooserAndroid", BluetoothChooserAndroid::Register}, |
{"BookmarkBridge", BookmarkBridge::RegisterBookmarkBridge}, |
{"BrowsingDataCounterBridge", BrowsingDataCounterBridge::Register}, |
{"CardUnmaskPrompt", autofill::CardUnmaskPromptViewAndroid::Register}, |
{"CertificateViewer", RegisterCertificateViewer}, |
- {"ChildAccountFeedbackReporter", RegisterChildAccountFeedbackReporter}, |
{"ChildAccountService", RegisterChildAccountService}, |
{"ChromeApplication", ChromeApplication::RegisterBindings}, |
{"ChromeBrowserProvider", |
@@ -246,9 +231,7 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = { |
{"ChromeMediaRouterDialogController", |
media_router::MediaRouterDialogControllerAndroid::Register}, |
#endif |
- {"ChromeServiceRegistrar", ChromeServiceRegistrarAndroid::Register}, |
{"CompositorView", RegisterCompositorView}, |
- {"ConfirmInfoBar", RegisterConfirmInfoBar}, |
{"ConnectionInfoPopupAndroid", |
ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid}, |
{"SecurityStateModel", RegisterSecurityStateModelAndroid}, |
@@ -258,7 +241,6 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = { |
{"ContextualSearchSceneLayer", RegisterContextualSearchSceneLayer}, |
{"ContextualSearchTabHelper", RegisterContextualSearchTabHelper}, |
{"CookiesFetcher", RegisterCookiesFetcher}, |
- {"Credential", RegisterCredential}, |
{"CreditCardScanner", autofill::CreditCardScannerViewAndroid::Register}, |
{"DataReductionPromoInfoBarDelegate", |
DataReductionPromoInfoBarDelegateAndroid::Register}, |
@@ -272,21 +254,16 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = { |
{"DownloadController", DownloadController::RegisterDownloadController}, |
{"DownloadManagerService", |
DownloadManagerService::RegisterDownloadManagerService}, |
- {"DownloadOverwriteInfoBarDelegate", |
- RegisterDownloadOverwriteInfoBarDelegate}, |
{"ExternalDataUseObserverBridge", RegisterExternalDataUseObserver}, |
{"ExternalPrerenderRequestHandler", |
prerender::ExternalPrerenderHandlerAndroid:: |
RegisterExternalPrerenderHandlerAndroid}, |
{"FaviconHelper", FaviconHelper::RegisterFaviconHelper}, |
{"FeatureUtilities", RegisterFeatureUtilities}, |
- {"DomDistillerUIUtils", dom_distiller::android::RegisterUIHandle}, |
{"FindInPageBridge", FindInPageBridge::RegisterFindInPageBridge}, |
{"FontSizePrefsAndroid", FontSizePrefsAndroid::Register}, |
{"ForeignSessionHelper", |
ForeignSessionHelper::RegisterForeignSessionHelper}, |
- {"GeneratedPasswordSavedInfoBarDelegate", |
- RegisterGeneratedPasswordSavedInfoBarDelegate}, |
{"GroupedPermissionInfoBar", GroupedPermissionInfoBar::Register}, |
{"HistoryReportJniBridge", history_report::RegisterHistoryReportJniBridge}, |
{"InfoBarContainer", RegisterInfoBarContainer}, |
@@ -294,14 +271,12 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = { |
invalidation::InvalidationServiceFactoryAndroid::Register}, |
{"SimpleConfirmInfoBarBuilder", RegisterSimpleConfirmInfoBarBuilder}, |
{"ShortcutHelper", ShortcutHelper::RegisterShortcutHelper}, |
- {"IntentHelper", RegisterIntentHelper}, |
{"JavaExceptionReporter", RegisterJavaExceptionReporterJni}, |
{"JavascriptAppModalDialog", |
JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog}, |
{"LargeIconBridge", LargeIconBridge::RegisterLargeIconBridge}, |
{"LaunchMetrics", metrics::RegisterLaunchMetrics}, |
{"LayerTitleCache", chrome::android::RegisterLayerTitleCache}, |
- {"LocationSettings", LocationSettingsImpl::Register}, |
{"LogoBridge", RegisterLogoBridge}, |
{"MediaDrmCredentialManager", |
MediaDrmCredentialManager::RegisterMediaDrmCredentialManager}, |
@@ -313,7 +288,6 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = { |
{"NotificationPlatformBridge", |
NotificationPlatformBridgeAndroid::RegisterNotificationPlatformBridge}, |
{"NTPSnippetsBridge", NTPSnippetsBridge::Register}, |
- {"NTPSnippetsLauncher", NTPSnippetsLauncher::Register}, |
{"OAuth2TokenServiceDelegateAndroid", |
OAuth2TokenServiceDelegateAndroid::Register}, |
{"OfflinePageBridge", offline_pages::android::RegisterOfflinePageBridge}, |
@@ -322,7 +296,6 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = { |
OmniboxUrlEmphasizer::RegisterOmniboxUrlEmphasizer}, |
{"OmniboxViewUtil", OmniboxViewUtil::RegisterOmniboxViewUtil}, |
{"OverlayPanelContent", RegisterOverlayPanelContent}, |
- {"PlatformUtil", platform_util::RegisterPlatformUtil}, |
{"PartnerBookmarksReader", |
PartnerBookmarksReader::RegisterPartnerBookmarksReader}, |
{"PasswordGenerationPopup", |
@@ -339,8 +312,6 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = { |
{"ProfileAndroid", ProfileAndroid::RegisterProfileAndroid}, |
{"ProfileDownloader", RegisterProfileDownloader}, |
{"ProfileSyncService", ProfileSyncServiceAndroid::Register}, |
- {"PushMessagingServiceObserver", |
- PushMessagingServiceObserverAndroid::RegisterJni}, |
{"RapporServiceBridge", rappor::RegisterRapporServiceBridge}, |
{"RecentlyClosedBridge", RecentlyClosedTabsBridge::Register}, |
{"RecordCastAction", remote_media::RegisterRecordCastAction}, |
@@ -349,7 +320,6 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = { |
remote_media::RemoteMediaPlayerBridge::RegisterRemoteMediaPlayerBridge}, |
{"RevenueStats", RegisterRevenueStats}, |
{"SafeBrowsingApiBridge", safe_browsing::RegisterSafeBrowsingApiBridge}, |
- {"SavePasswordInfoBar", SavePasswordInfoBar::Register}, |
{"SceneLayer", chrome::android::RegisterSceneLayer}, |
{"ScreenshotTask", RegisterScreenshotTask}, |
{"ServiceTabLauncher", ServiceTabLauncher::Register}, |
@@ -378,11 +348,9 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = { |
{"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate}, |
{"TtsPlatformImpl", TtsPlatformImplAndroid::Register}, |
{"UmaSessionStats", RegisterUmaSessionStats}, |
- {"UpdatePasswordInfoBar", UpdatePasswordInfoBar::Register}, |
{"UrlUtilities", RegisterUrlUtilities}, |
{"UsbChooserDialogAndroid", UsbChooserDialogAndroid::Register}, |
{"Variations", variations::android::RegisterVariations}, |
- {"VariationsSeedBridge", variations::android::RegisterVariationsSeedBridge}, |
{"VariationsSession", chrome::android::RegisterVariationsSession}, |
{"WarmupManager", RegisterWarmupManager}, |
{"WebappRegistry", WebappRegistry::RegisterWebappRegistry}, |