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

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

Issue 340403004: Java wrapper for DistilledPagePrefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Formatting changes, added test Created 6 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
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 e41096018a948b72cd8bfe3a413f91628ef2df94..c77906fe84954712adf13bd6266dc5e7ec64aa34 100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -38,6 +38,7 @@
#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/dom_distiller/dom_distiller_service_factory_android.h"
#include "chrome/browser/dom_distiller/tab_utils_android.h"
#include "chrome/browser/history/android/sqlite_cursor.h"
#include "chrome/browser/invalidation/invalidation_controller_android.h"
@@ -85,100 +86,99 @@ 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 },
- { "DataReductionProxySettings", DataReductionProxySettingsAndroid::Register },
- { "DevToolsServer", RegisterDevToolsServer },
- { "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},
+ {"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},
+ {"DataReductionProxySettings", DataReductionProxySettingsAndroid::Register},
+ {"DevToolsServer", RegisterDevToolsServer},
+ {"DomDistillerServiceFactory",
nyquist 2014/07/09 23:49:04 I don't think you want to change the style of this
sunangel 2014/07/10 14:31:52 Done.
nyquist 2014/07/10 15:59:58 But this line must still be there, no?
sunangel 2014/07/10 20:19:55 Yes sorry, base was incorrect. On 2014/07/10 15:59
+ 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
};

Powered by Google App Engine
This is Rietveld 408576698