| 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 ed0c523151874b48e1c4489dc9fee1013878d760..493f4e63612f782f4b339796828a40ca7929dc09 100644
|
| --- a/chrome/browser/android/chrome_jni_registrar.cc
|
| +++ b/chrome/browser/android/chrome_jni_registrar.cc
|
| @@ -12,11 +12,9 @@
|
| #include "chrome/browser/android/bookmarks/bookmarks_bridge.h"
|
| #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
|
| #include "chrome/browser/android/chromium_application.h"
|
| -#include "chrome/browser/android/content_view_util.h"
|
| #include "chrome/browser/android/dev_tools_server.h"
|
| #include "chrome/browser/android/dom_distiller/feedback_reporter_android.h"
|
| #include "chrome/browser/android/favicon_helper.h"
|
| -#include "chrome/browser/android/field_trial_helper.h"
|
| #include "chrome/browser/android/foreign_session_helper.h"
|
| #include "chrome/browser/android/intent_helper.h"
|
| #include "chrome/browser/android/most_visited_sites.h"
|
| @@ -31,10 +29,7 @@
|
| #include "chrome/browser/android/signin/account_management_screen_helper.h"
|
| #include "chrome/browser/android/signin/signin_manager_android.h"
|
| #include "chrome/browser/android/tab_android.h"
|
| -#include "chrome/browser/android/uma_bridge.h"
|
| #include "chrome/browser/android/uma_utils.h"
|
| -#include "chrome/browser/android/url_utilities.h"
|
| -#include "chrome/browser/android/voice_search_tab_helper.h"
|
| #include "chrome/browser/autofill/android/personal_data_manager_android.h"
|
| #include "chrome/browser/history/android/sqlite_cursor.h"
|
| #include "chrome/browser/invalidation/invalidation_controller_android.h"
|
| @@ -64,7 +59,6 @@
|
| #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h"
|
| #include "chrome/browser/ui/android/website_settings_popup_android.h"
|
| #include "components/autofill/core/browser/android/component_jni_registrar.h"
|
| -#include "components/dom_distiller/android/component_jni_registrar.h"
|
| #include "components/navigation_interception/component_jni_registrar.h"
|
| #include "components/web_contents_delegate_android/component_jni_registrar.h"
|
|
|
| @@ -72,14 +66,11 @@
|
| #include "printing/printing_context_android.h"
|
| #endif
|
|
|
| -bool RegisterCertificateViewer(JNIEnv* env);
|
| -
|
| namespace chrome {
|
| namespace android {
|
|
|
| -static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
|
| +static const base::android::RegistrationMethod kChromeRegisteredMethods[] = {
|
| // Register JNI for components we depend on.
|
| - { "DomDistiller", dom_distiller::android::RegisterDomDistiller },
|
| { "NavigationInterception",
|
| navigation_interception::RegisterNavigationInterceptionJni },
|
| { "WebContentsDelegateAndroid",
|
| @@ -103,7 +94,6 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
|
| autofill::AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid },
|
| { "AutoLoginDelegate", AutoLoginInfoBarDelegateAndroid::Register },
|
| { "BookmarksBridge", BookmarksBridge::RegisterBookmarksBridge },
|
| - { "CertificateViewer", RegisterCertificateViewer },
|
| { "ChromeBrowserProvider",
|
| ChromeBrowserProvider::RegisterChromeBrowserProvider },
|
| { "ChromeHttpAuthHandler",
|
| @@ -113,17 +103,11 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
|
| { "ChromiumApplication",
|
| ChromiumApplication::RegisterBindings },
|
| { "ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate },
|
| - { "ContentViewUtil", RegisterContentViewUtil },
|
| { "ContextMenuHelper", RegisterContextMenuHelper },
|
| { "DataReductionProxySettings", DataReductionProxySettingsAndroid::Register },
|
| - { "DevToolsServer", RegisterDevToolsServer },
|
| { "InvalidationController", invalidation::RegisterInvalidationController },
|
| - { "ExternalPrerenderRequestHandler",
|
| - prerender::ExternalPrerenderHandlerAndroid::
|
| - RegisterExternalPrerenderHandlerAndroid },
|
| { "FaviconHelper", FaviconHelper::RegisterFaviconHelper },
|
| { "FeedbackReporter", dom_distiller::android::RegisterFeedbackReporter },
|
| - { "FieldTrialHelper", RegisterFieldTrialHelper },
|
| { "ForeignSessionHelper",
|
| ForeignSessionHelper::RegisterForeignSessionHelper },
|
| { "InfoBarContainer", RegisterInfoBarContainer },
|
| @@ -134,9 +118,6 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
|
| { "MostVisitedSites", MostVisitedSites::Register },
|
| { "NativeInfoBar", RegisterNativeInfoBar },
|
| { "NavigationPopup", NavigationPopup::RegisterNavigationPopup },
|
| - { "NewTabPagePrefs",
|
| - NewTabPagePrefs::RegisterNewTabPagePrefs },
|
| - { "OmniboxPrerender", RegisterOmniboxPrerender },
|
| { "PasswordAuthenticationManager",
|
| PasswordAuthenticationManager::RegisterPasswordAuthenticationManager },
|
| { "PasswordUIViewAndroid",
|
| @@ -157,9 +138,6 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
|
| { "ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid },
|
| { "TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate },
|
| { "TtsPlatformImpl", TtsPlatformImplAndroid::Register },
|
| - { "UmaBridge", RegisterUmaBridge },
|
| - { "UrlUtilities", RegisterUrlUtilities },
|
| - { "VoiceSearchTabHelper", RegisterVoiceSearchTabHelper },
|
| { "WebsiteSettingsPopupAndroid",
|
| WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid },
|
| #if defined(ENABLE_PRINTING) && !defined(ENABLE_FULL_PRINTING)
|
|
|