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/trace_event/trace_event.h" | 9 #include "base/trace_event/trace_event.h" |
| 10 #include "chrome/browser/android/accessibility/font_size_prefs_android.h" | 10 #include "chrome/browser/android/accessibility/font_size_prefs_android.h" |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 80 #include "chrome/browser/supervised_user/child_accounts/child_account_service_an droid.h" | 80 #include "chrome/browser/supervised_user/child_accounts/child_account_service_an droid.h" |
| 81 #include "chrome/browser/sync/profile_sync_service_android.h" | 81 #include "chrome/browser/sync/profile_sync_service_android.h" |
| 82 #include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android. h" | 82 #include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android. h" |
| 83 #include "chrome/browser/ui/android/autofill/autofill_dialog_result.h" | 83 #include "chrome/browser/ui/android/autofill/autofill_dialog_result.h" |
| 84 #include "chrome/browser/ui/android/autofill/autofill_logger_android.h" | 84 #include "chrome/browser/ui/android/autofill/autofill_logger_android.h" |
| 85 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h" | 85 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h" |
| 86 #include "chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.h" | 86 #include "chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.h" |
| 87 #include "chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h" | 87 #include "chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h" |
| 88 #include "chrome/browser/ui/android/autofill/password_generation_popup_view_andr oid.h" | 88 #include "chrome/browser/ui/android/autofill/password_generation_popup_view_andr oid.h" |
| 89 #include "chrome/browser/ui/android/chrome_http_auth_handler.h" | 89 #include "chrome/browser/ui/android/chrome_http_auth_handler.h" |
| 90 #include "chrome/browser/ui/android/connection_info_popup_android.h" | |
| 90 #include "chrome/browser/ui/android/context_menu_helper.h" | 91 #include "chrome/browser/ui/android/context_menu_helper.h" |
| 91 #include "chrome/browser/ui/android/infobars/account_chooser_infobar.h" | 92 #include "chrome/browser/ui/android/infobars/account_chooser_infobar.h" |
| 92 #include "chrome/browser/ui/android/infobars/app_banner_infobar.h" | 93 #include "chrome/browser/ui/android/infobars/app_banner_infobar.h" |
| 93 #include "chrome/browser/ui/android/infobars/confirm_infobar.h" | 94 #include "chrome/browser/ui/android/infobars/confirm_infobar.h" |
| 94 #include "chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.h" | 95 #include "chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.h" |
| 95 #include "chrome/browser/ui/android/infobars/download_overwrite_infobar.h" | 96 #include "chrome/browser/ui/android/infobars/download_overwrite_infobar.h" |
| 96 #include "chrome/browser/ui/android/infobars/generated_password_saved_infobar.h" | 97 #include "chrome/browser/ui/android/infobars/generated_password_saved_infobar.h" |
| 97 #include "chrome/browser/ui/android/infobars/infobar_android.h" | 98 #include "chrome/browser/ui/android/infobars/infobar_android.h" |
| 98 #include "chrome/browser/ui/android/infobars/infobar_container_android.h" | 99 #include "chrome/browser/ui/android/infobars/infobar_container_android.h" |
| 99 #include "chrome/browser/ui/android/infobars/save_password_infobar.h" | 100 #include "chrome/browser/ui/android/infobars/save_password_infobar.h" |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 113 #include "components/invalidation/android/component_jni_registrar.h" | 114 #include "components/invalidation/android/component_jni_registrar.h" |
| 114 #include "components/navigation_interception/component_jni_registrar.h" | 115 #include "components/navigation_interception/component_jni_registrar.h" |
| 115 #include "components/service_tab_launcher/component_jni_registrar.h" | 116 #include "components/service_tab_launcher/component_jni_registrar.h" |
| 116 #include "components/variations/android/component_jni_registrar.h" | 117 #include "components/variations/android/component_jni_registrar.h" |
| 117 #include "components/web_contents_delegate_android/component_jni_registrar.h" | 118 #include "components/web_contents_delegate_android/component_jni_registrar.h" |
| 118 | 119 |
| 119 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW) | 120 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW) |
| 120 #include "printing/printing_context_android.h" | 121 #include "printing/printing_context_android.h" |
| 121 #endif | 122 #endif |
| 122 | 123 |
| 124 bool RegisterCertificateViewer(JNIEnv* env); | |
|
Ted C
2015/04/27 19:04:01
I think you should just include the .h for the cer
tsergeant
2015/04/28 03:15:00
Done. There wasn't a .h file for the Android speci
| |
| 125 | |
| 123 namespace chrome { | 126 namespace chrome { |
| 124 namespace android { | 127 namespace android { |
| 125 | 128 |
| 126 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { | 129 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { |
| 127 // Register JNI for components we depend on. | 130 // Register JNI for components we depend on. |
| 128 {"AppMenuDragHelper", RegisterAppMenuDragHelper}, | 131 {"AppMenuDragHelper", RegisterAppMenuDragHelper}, |
| 129 {"Bookmarks", bookmarks::android::RegisterBookmarks}, | 132 {"Bookmarks", bookmarks::android::RegisterBookmarks}, |
| 130 {"DomDistiller", dom_distiller::android::RegisterDomDistiller}, | 133 {"DomDistiller", dom_distiller::android::RegisterDomDistiller}, |
| 131 {"ChromeDownloadDelegate", RegisterChromeDownloadDelegate}, | 134 {"ChromeDownloadDelegate", RegisterChromeDownloadDelegate}, |
| 132 {"GCMDriver", gcm::android::RegisterGCMDriverJni}, | 135 {"GCMDriver", gcm::android::RegisterGCMDriverJni}, |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 151 autofill::AutofillDialogControllerAndroid:: | 154 autofill::AutofillDialogControllerAndroid:: |
| 152 RegisterAutofillDialogControllerAndroid}, | 155 RegisterAutofillDialogControllerAndroid}, |
| 153 {"AutofillDialogResult", | 156 {"AutofillDialogResult", |
| 154 autofill::AutofillDialogResult::RegisterAutofillDialogResult}, | 157 autofill::AutofillDialogResult::RegisterAutofillDialogResult}, |
| 155 {"AutofillLoggerAndroid", autofill::AutofillLoggerAndroid::Register}, | 158 {"AutofillLoggerAndroid", autofill::AutofillLoggerAndroid::Register}, |
| 156 {"AutofillPopup", | 159 {"AutofillPopup", |
| 157 autofill::AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid}, | 160 autofill::AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid}, |
| 158 {"AutofillProfileBridge", autofill::RegisterAutofillProfileBridge}, | 161 {"AutofillProfileBridge", autofill::RegisterAutofillProfileBridge}, |
| 159 {"BookmarksBridge", BookmarksBridge::RegisterBookmarksBridge}, | 162 {"BookmarksBridge", BookmarksBridge::RegisterBookmarksBridge}, |
| 160 {"CardUnmaskPrompt", autofill::CardUnmaskPromptViewAndroid::Register}, | 163 {"CardUnmaskPrompt", autofill::CardUnmaskPromptViewAndroid::Register}, |
| 164 {"CertificateViewer", RegisterCertificateViewer}, | |
| 161 {"ChildAccountFeedbackReporter", RegisterChildAccountFeedbackReporter}, | 165 {"ChildAccountFeedbackReporter", RegisterChildAccountFeedbackReporter}, |
| 162 {"ChildAccountService", RegisterChildAccountService}, | 166 {"ChildAccountService", RegisterChildAccountService}, |
| 163 {"ChromeBrowserProvider", | 167 {"ChromeBrowserProvider", |
| 164 ChromeBrowserProvider::RegisterChromeBrowserProvider}, | 168 ChromeBrowserProvider::RegisterChromeBrowserProvider}, |
| 165 {"ChromeHttpAuthHandler", | 169 {"ChromeHttpAuthHandler", |
| 166 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler}, | 170 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler}, |
| 167 {"ChromeWebContentsDelegateAndroid", | 171 {"ChromeWebContentsDelegateAndroid", |
| 168 RegisterChromeWebContentsDelegateAndroid}, | 172 RegisterChromeWebContentsDelegateAndroid}, |
| 169 {"ChromiumApplication", ChromiumApplication::RegisterBindings}, | 173 {"ChromiumApplication", ChromiumApplication::RegisterBindings}, |
| 170 {"ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate}, | 174 {"ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate}, |
| 175 {"ConnectionInfoPopupAndroid", | |
| 176 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid}, | |
| 171 {"ContentViewUtil", RegisterContentViewUtil}, | 177 {"ContentViewUtil", RegisterContentViewUtil}, |
| 172 {"ContextMenuHelper", RegisterContextMenuHelper}, | 178 {"ContextMenuHelper", RegisterContextMenuHelper}, |
| 173 {"CookiesFetcher", RegisterCookiesFetcher}, | 179 {"CookiesFetcher", RegisterCookiesFetcher}, |
| 174 {"Credential", RegisterCredential}, | 180 {"Credential", RegisterCredential}, |
| 175 {"CreditCardScanner", autofill::CreditCardScannerViewAndroid::Register}, | 181 {"CreditCardScanner", autofill::CreditCardScannerViewAndroid::Register}, |
| 176 {"DataReductionProxyInfoBarDelegate", DataReductionProxyInfoBar::Register}, | 182 {"DataReductionProxyInfoBarDelegate", DataReductionProxyInfoBar::Register}, |
| 177 {"DataReductionProxySettings", DataReductionProxySettingsAndroid::Register}, | 183 {"DataReductionProxySettings", DataReductionProxySettingsAndroid::Register}, |
| 178 {"DevToolsServer", RegisterDevToolsServer}, | 184 {"DevToolsServer", RegisterDevToolsServer}, |
| 179 {"DomDistillerServiceFactory", | 185 {"DomDistillerServiceFactory", |
| 180 dom_distiller::android::DomDistillerServiceFactoryAndroid::Register}, | 186 dom_distiller::android::DomDistillerServiceFactoryAndroid::Register}, |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 268 }; | 274 }; |
| 269 | 275 |
| 270 bool RegisterBrowserJNI(JNIEnv* env) { | 276 bool RegisterBrowserJNI(JNIEnv* env) { |
| 271 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); | 277 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); |
| 272 return RegisterNativeMethods(env, kChromeRegisteredMethods, | 278 return RegisterNativeMethods(env, kChromeRegisteredMethods, |
| 273 arraysize(kChromeRegisteredMethods)); | 279 arraysize(kChromeRegisteredMethods)); |
| 274 } | 280 } |
| 275 | 281 |
| 276 } // namespace android | 282 } // namespace android |
| 277 } // namespace chrome | 283 } // namespace chrome |
| OLD | NEW |