Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/android/chrome_jni_registrar.h" | 5 #include "chrome/browser/android/chrome_jni_registrar.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_registrar.h" | 8 #include "base/android/jni_registrar.h" |
| 9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
| 10 #include "chrome/browser/android/accessibility_util.h" | 10 #include "chrome/browser/android/accessibility_util.h" |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 31 #include "chrome/browser/android/recently_closed_tabs_bridge.h" | 31 #include "chrome/browser/android/recently_closed_tabs_bridge.h" |
| 32 #include "chrome/browser/android/shortcut_helper.h" | 32 #include "chrome/browser/android/shortcut_helper.h" |
| 33 #include "chrome/browser/android/signin/account_management_screen_helper.h" | 33 #include "chrome/browser/android/signin/account_management_screen_helper.h" |
| 34 #include "chrome/browser/android/signin/signin_manager_android.h" | 34 #include "chrome/browser/android/signin/signin_manager_android.h" |
| 35 #include "chrome/browser/android/tab_android.h" | 35 #include "chrome/browser/android/tab_android.h" |
| 36 #include "chrome/browser/android/uma_bridge.h" | 36 #include "chrome/browser/android/uma_bridge.h" |
| 37 #include "chrome/browser/android/uma_utils.h" | 37 #include "chrome/browser/android/uma_utils.h" |
| 38 #include "chrome/browser/android/url_utilities.h" | 38 #include "chrome/browser/android/url_utilities.h" |
| 39 #include "chrome/browser/android/voice_search_tab_helper.h" | 39 #include "chrome/browser/android/voice_search_tab_helper.h" |
| 40 #include "chrome/browser/autofill/android/personal_data_manager_android.h" | 40 #include "chrome/browser/autofill/android/personal_data_manager_android.h" |
| 41 #include "chrome/browser/dom_distiller/dom_distiller_service_factory_android.h" | |
| 41 #include "chrome/browser/dom_distiller/tab_utils_android.h" | 42 #include "chrome/browser/dom_distiller/tab_utils_android.h" |
| 42 #include "chrome/browser/history/android/sqlite_cursor.h" | 43 #include "chrome/browser/history/android/sqlite_cursor.h" |
| 43 #include "chrome/browser/invalidation/invalidation_controller_android.h" | 44 #include "chrome/browser/invalidation/invalidation_controller_android.h" |
| 44 #include "chrome/browser/lifetime/application_lifetime_android.h" | 45 #include "chrome/browser/lifetime/application_lifetime_android.h" |
| 45 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" | 46 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" |
| 46 #include "chrome/browser/prerender/external_prerender_handler_android.h" | 47 #include "chrome/browser/prerender/external_prerender_handler_android.h" |
| 47 #include "chrome/browser/profiles/profile_android.h" | 48 #include "chrome/browser/profiles/profile_android.h" |
| 48 #include "chrome/browser/search_engines/template_url_service_android.h" | 49 #include "chrome/browser/search_engines/template_url_service_android.h" |
| 49 #include "chrome/browser/signin/android_profile_oauth2_token_service.h" | 50 #include "chrome/browser/signin/android_profile_oauth2_token_service.h" |
| 50 #include "chrome/browser/speech/tts_android.h" | 51 #include "chrome/browser/speech/tts_android.h" |
| (...skipping 27 matching lines...) Expand all Loading... | |
| 78 #if defined(ENABLE_PRINTING) && !defined(ENABLE_FULL_PRINTING) | 79 #if defined(ENABLE_PRINTING) && !defined(ENABLE_FULL_PRINTING) |
| 79 #include "printing/printing_context_android.h" | 80 #include "printing/printing_context_android.h" |
| 80 #endif | 81 #endif |
| 81 | 82 |
| 82 bool RegisterCertificateViewer(JNIEnv* env); | 83 bool RegisterCertificateViewer(JNIEnv* env); |
| 83 | 84 |
| 84 namespace chrome { | 85 namespace chrome { |
| 85 namespace android { | 86 namespace android { |
| 86 | 87 |
| 87 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { | 88 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { |
| 88 // Register JNI for components we depend on. | 89 // Register JNI for components we depend on. |
| 89 { "DomDistiller", dom_distiller::android::RegisterDomDistiller }, | 90 {"DomDistiller", dom_distiller::android::RegisterDomDistiller}, |
| 90 { "GCMDriver", gcm::android::RegisterGCMDriverJni }, | 91 {"GCMDriver", gcm::android::RegisterGCMDriverJni}, |
| 91 { "NavigationInterception", | 92 {"NavigationInterception", |
| 92 navigation_interception::RegisterNavigationInterceptionJni }, | 93 navigation_interception::RegisterNavigationInterceptionJni}, |
| 93 { "WebContentsDelegateAndroid", | 94 {"WebContentsDelegateAndroid", |
| 94 web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni }, | 95 web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni}, |
| 95 { "RegisterAuxiliaryProfileLoader", autofill::RegisterAutofillAndroidJni }, | 96 {"RegisterAuxiliaryProfileLoader", autofill::RegisterAutofillAndroidJni}, |
| 96 // Register JNI for chrome classes. | 97 // Register JNI for chrome classes. |
| 97 { "AccessibilityUtils", AccessibilityUtil::Register }, | 98 {"AccessibilityUtils", AccessibilityUtil::Register}, |
| 98 { "AccountManagementScreenHelper", AccountManagementScreenHelper::Register }, | 99 {"AccountManagementScreenHelper", AccountManagementScreenHelper::Register}, |
| 99 { "AndroidProfileOAuth2TokenService", | 100 {"AndroidProfileOAuth2TokenService", |
| 100 AndroidProfileOAuth2TokenService::Register }, | 101 AndroidProfileOAuth2TokenService::Register}, |
| 101 { "AnswersImageBridge", RegisterAnswersImageBridge }, | 102 {"AnswersImageBridge", RegisterAnswersImageBridge}, |
| 102 { "AppBannerManager", banners::RegisterAppBannerManager }, | 103 {"AppBannerManager", banners::RegisterAppBannerManager}, |
| 103 { "ApplicationLifetime", RegisterApplicationLifetimeAndroid }, | 104 {"ApplicationLifetime", RegisterApplicationLifetimeAndroid}, |
| 104 { "AutocompleteControllerAndroid", RegisterAutocompleteControllerAndroid }, | 105 {"AutocompleteControllerAndroid", RegisterAutocompleteControllerAndroid}, |
| 105 { "AutofillDialogControllerAndroid", | 106 {"AutofillDialogControllerAndroid", |
| 106 autofill::AutofillDialogControllerAndroid:: | 107 autofill::AutofillDialogControllerAndroid:: |
| 107 RegisterAutofillDialogControllerAndroid }, | 108 RegisterAutofillDialogControllerAndroid}, |
| 108 { "AutofillDialogResult", | 109 {"AutofillDialogResult", |
| 109 autofill::AutofillDialogResult::RegisterAutofillDialogResult }, | 110 autofill::AutofillDialogResult::RegisterAutofillDialogResult}, |
| 110 { "AutofillLoggerAndroid", | 111 {"AutofillLoggerAndroid", autofill::AutofillLoggerAndroid::Register}, |
| 111 autofill::AutofillLoggerAndroid::Register }, | 112 {"AutofillPopup", |
| 112 { "AutofillPopup", | 113 autofill::AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid}, |
| 113 autofill::AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid }, | 114 {"AutoLoginDelegate", AutoLoginInfoBarDelegateAndroid::Register}, |
| 114 { "AutoLoginDelegate", AutoLoginInfoBarDelegateAndroid::Register }, | 115 {"BookmarksBridge", BookmarksBridge::RegisterBookmarksBridge}, |
| 115 { "BookmarksBridge", BookmarksBridge::RegisterBookmarksBridge }, | 116 {"CertificateViewer", RegisterCertificateViewer}, |
| 116 { "CertificateViewer", RegisterCertificateViewer }, | 117 {"ChromeBrowserProvider", |
| 117 { "ChromeBrowserProvider", | 118 ChromeBrowserProvider::RegisterChromeBrowserProvider}, |
| 118 ChromeBrowserProvider::RegisterChromeBrowserProvider }, | 119 {"ChromeHttpAuthHandler", |
| 119 { "ChromeHttpAuthHandler", | 120 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler}, |
| 120 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler }, | 121 {"ChromeWebContentsDelegateAndroid", |
| 121 { "ChromeWebContentsDelegateAndroid", | 122 RegisterChromeWebContentsDelegateAndroid}, |
| 122 RegisterChromeWebContentsDelegateAndroid }, | 123 {"ChromiumApplication", ChromiumApplication::RegisterBindings}, |
| 123 { "ChromiumApplication", | 124 {"ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate}, |
| 124 ChromiumApplication::RegisterBindings }, | 125 {"ContentViewUtil", RegisterContentViewUtil}, |
| 125 { "ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate }, | 126 {"ContextMenuHelper", RegisterContextMenuHelper}, |
| 126 { "ContentViewUtil", RegisterContentViewUtil }, | 127 {"DataReductionProxySettings", DataReductionProxySettingsAndroid::Register}, |
| 127 { "ContextMenuHelper", RegisterContextMenuHelper }, | 128 {"DevToolsServer", RegisterDevToolsServer}, |
| 128 { "DataReductionProxySettings", DataReductionProxySettingsAndroid::Register }, | 129 {"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
| |
| 129 { "DevToolsServer", RegisterDevToolsServer }, | 130 dom_distiller::android::DomDistillerServiceFactoryAndroid::Register}, |
| 130 { "DomDistillerTabUtils", RegisterDomDistillerTabUtils }, | 131 {"DomDistillerTabUtils", RegisterDomDistillerTabUtils}, |
| 131 { "ExternalPrerenderRequestHandler", | 132 {"ExternalPrerenderRequestHandler", |
| 132 prerender::ExternalPrerenderHandlerAndroid:: | 133 prerender::ExternalPrerenderHandlerAndroid:: |
| 133 RegisterExternalPrerenderHandlerAndroid }, | 134 RegisterExternalPrerenderHandlerAndroid}, |
| 134 { "FaviconHelper", FaviconHelper::RegisterFaviconHelper }, | 135 {"FaviconHelper", FaviconHelper::RegisterFaviconHelper}, |
| 135 { "FeedbackReporter", dom_distiller::android::RegisterFeedbackReporter }, | 136 {"FeedbackReporter", dom_distiller::android::RegisterFeedbackReporter}, |
| 136 { "ForeignSessionHelper", | 137 {"ForeignSessionHelper", |
| 137 ForeignSessionHelper::RegisterForeignSessionHelper }, | 138 ForeignSessionHelper::RegisterForeignSessionHelper}, |
| 138 { "InfoBarContainer", RegisterInfoBarContainer }, | 139 {"InfoBarContainer", RegisterInfoBarContainer}, |
| 139 { "ShortcutHelper", ShortcutHelper::RegisterShortcutHelper }, | 140 {"ShortcutHelper", ShortcutHelper::RegisterShortcutHelper}, |
| 140 { "IntentHelper", RegisterIntentHelper }, | 141 {"IntentHelper", RegisterIntentHelper}, |
| 141 { "InvalidationController", invalidation::RegisterInvalidationController }, | 142 {"InvalidationController", invalidation::RegisterInvalidationController}, |
| 142 { "JavascriptAppModalDialog", | 143 {"JavascriptAppModalDialog", |
| 143 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog }, | 144 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog}, |
| 144 { "LogoBridge", RegisterLogoBridge }, | 145 {"LogoBridge", RegisterLogoBridge}, |
| 145 { "MostVisitedSites", MostVisitedSites::Register }, | 146 {"MostVisitedSites", MostVisitedSites::Register}, |
| 146 { "NativeInfoBar", RegisterNativeInfoBar }, | 147 {"NativeInfoBar", RegisterNativeInfoBar}, |
| 147 { "NavigationPopup", NavigationPopup::RegisterNavigationPopup }, | 148 {"NavigationPopup", NavigationPopup::RegisterNavigationPopup}, |
| 148 { "NewTabPagePrefs", | 149 {"NewTabPagePrefs", NewTabPagePrefs::RegisterNewTabPagePrefs}, |
| 149 NewTabPagePrefs::RegisterNewTabPagePrefs }, | 150 {"OmniboxPrerender", RegisterOmniboxPrerender}, |
| 150 { "OmniboxPrerender", RegisterOmniboxPrerender }, | 151 {"OmniboxViewUtil", OmniboxViewUtil::RegisterOmniboxViewUtil}, |
| 151 { "OmniboxViewUtil", OmniboxViewUtil::RegisterOmniboxViewUtil }, | 152 {"PasswordAuthenticationManager", |
| 152 { "PasswordAuthenticationManager", | 153 PasswordAuthenticationManager::RegisterPasswordAuthenticationManager}, |
| 153 PasswordAuthenticationManager::RegisterPasswordAuthenticationManager }, | 154 {"PasswordUIViewAndroid", |
| 154 { "PasswordUIViewAndroid", | 155 PasswordUIViewAndroid::RegisterPasswordUIViewAndroid}, |
| 155 PasswordUIViewAndroid::RegisterPasswordUIViewAndroid }, | 156 {"PersonalDataManagerAndroid", |
| 156 { "PersonalDataManagerAndroid", | 157 autofill::PersonalDataManagerAndroid::Register}, |
| 157 autofill::PersonalDataManagerAndroid::Register }, | 158 {"ProfileAndroid", ProfileAndroid::RegisterProfileAndroid}, |
| 158 { "ProfileAndroid", ProfileAndroid::RegisterProfileAndroid }, | 159 {"ProfileDownloaderAndroid", ProfileDownloaderAndroid::Register}, |
| 159 { "ProfileDownloaderAndroid", ProfileDownloaderAndroid::Register }, | 160 {"ProfileSyncService", ProfileSyncServiceAndroid::Register}, |
| 160 { "ProfileSyncService", ProfileSyncServiceAndroid::Register }, | 161 {"RecentlyClosedBridge", RecentlyClosedTabsBridge::Register}, |
| 161 { "RecentlyClosedBridge", RecentlyClosedTabsBridge::Register }, | 162 {"SavePasswordInfoBar", RegisterSavePasswordInfoBar}, |
| 162 { "SavePasswordInfoBar", RegisterSavePasswordInfoBar }, | 163 {"SigninManager", SigninManagerAndroid::Register}, |
| 163 { "SigninManager", SigninManagerAndroid::Register }, | 164 {"SqliteCursor", SQLiteCursor::RegisterSqliteCursor}, |
| 164 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor }, | 165 {"SSLClientCertificateRequest", RegisterSSLClientCertificateRequestAndroid}, |
| 165 { "SSLClientCertificateRequest", RegisterSSLClientCertificateRequestAndroid }, | 166 {"StartupMetricUtils", RegisterStartupMetricUtils}, |
| 166 { "StartupMetricUtils", RegisterStartupMetricUtils }, | 167 {"TabAndroid", TabAndroid::RegisterTabAndroid}, |
| 167 { "TabAndroid", TabAndroid::RegisterTabAndroid }, | 168 {"TabModelBase", RegisterTabModelBase}, |
| 168 { "TabModelBase", RegisterTabModelBase}, | 169 {"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register}, |
| 169 { "TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register }, | 170 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid}, |
| 170 { "ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid }, | 171 {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate}, |
| 171 { "TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate }, | 172 {"TtsPlatformImpl", TtsPlatformImplAndroid::Register}, |
| 172 { "TtsPlatformImpl", TtsPlatformImplAndroid::Register }, | 173 {"UmaBridge", RegisterUmaBridge}, |
| 173 { "UmaBridge", RegisterUmaBridge }, | 174 {"UrlUtilities", RegisterUrlUtilities}, |
| 174 { "UrlUtilities", RegisterUrlUtilities }, | 175 {"Variations", variations::android::RegisterVariations}, |
| 175 { "Variations", variations::android::RegisterVariations }, | 176 {"VoiceSearchTabHelper", RegisterVoiceSearchTabHelper}, |
| 176 { "VoiceSearchTabHelper", RegisterVoiceSearchTabHelper }, | 177 {"WebsiteSettingsPopupAndroid", |
| 177 { "WebsiteSettingsPopupAndroid", | 178 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid}, |
| 178 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid }, | |
| 179 #if defined(ENABLE_PRINTING) && !defined(ENABLE_FULL_PRINTING) | 179 #if defined(ENABLE_PRINTING) && !defined(ENABLE_FULL_PRINTING) |
| 180 { "PrintingContext", | 180 {"PrintingContext", |
| 181 printing::PrintingContextAndroid::RegisterPrintingContext}, | 181 printing::PrintingContextAndroid::RegisterPrintingContext}, |
| 182 #endif | 182 #endif |
| 183 }; | 183 }; |
| 184 | 184 |
| 185 bool RegisterJni(JNIEnv* env) { | 185 bool RegisterJni(JNIEnv* env) { |
| 186 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); | 186 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); |
| 187 return RegisterNativeMethods(env, kChromeRegisteredMethods, | 187 return RegisterNativeMethods(env, kChromeRegisteredMethods, |
| 188 arraysize(kChromeRegisteredMethods)); | 188 arraysize(kChromeRegisteredMethods)); |
| 189 } | 189 } |
| 190 | 190 |
| 191 } // namespace android | 191 } // namespace android |
| 192 } // namespace chrome | 192 } // namespace chrome |
| OLD | NEW |