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/font_size_prefs_android.h" | 10 #include "chrome/browser/android/accessibility/font_size_prefs_android.h" |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 54 #include "chrome/browser/prerender/external_prerender_handler_android.h" | 54 #include "chrome/browser/prerender/external_prerender_handler_android.h" |
| 55 #include "chrome/browser/profiles/profile_android.h" | 55 #include "chrome/browser/profiles/profile_android.h" |
| 56 #include "chrome/browser/search_engines/template_url_service_android.h" | 56 #include "chrome/browser/search_engines/template_url_service_android.h" |
| 57 #include "chrome/browser/signin/android_profile_oauth2_token_service.h" | 57 #include "chrome/browser/signin/android_profile_oauth2_token_service.h" |
| 58 #include "chrome/browser/speech/tts_android.h" | 58 #include "chrome/browser/speech/tts_android.h" |
| 59 #include "chrome/browser/sync/profile_sync_service_android.h" | 59 #include "chrome/browser/sync/profile_sync_service_android.h" |
| 60 #include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android. h" | 60 #include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android. h" |
| 61 #include "chrome/browser/ui/android/autofill/autofill_dialog_result.h" | 61 #include "chrome/browser/ui/android/autofill/autofill_dialog_result.h" |
| 62 #include "chrome/browser/ui/android/autofill/autofill_logger_android.h" | 62 #include "chrome/browser/ui/android/autofill/autofill_logger_android.h" |
| 63 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h" | 63 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h" |
| 64 #include "chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.h" | |
| 64 #include "chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h" | 65 #include "chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h" |
| 65 #include "chrome/browser/ui/android/autofill/password_generation_popup_view_andr oid.h" | 66 #include "chrome/browser/ui/android/autofill/password_generation_popup_view_andr oid.h" |
| 66 #include "chrome/browser/ui/android/chrome_http_auth_handler.h" | 67 #include "chrome/browser/ui/android/chrome_http_auth_handler.h" |
| 67 #include "chrome/browser/ui/android/context_menu_helper.h" | 68 #include "chrome/browser/ui/android/context_menu_helper.h" |
| 68 #include "chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android .h" | 69 #include "chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android .h" |
| 69 #include "chrome/browser/ui/android/infobars/confirm_infobar.h" | 70 #include "chrome/browser/ui/android/infobars/confirm_infobar.h" |
| 70 #include "chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.h" | 71 #include "chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.h" |
| 71 #include "chrome/browser/ui/android/infobars/generated_password_saved_infobar.h" | 72 #include "chrome/browser/ui/android/infobars/generated_password_saved_infobar.h" |
| 72 #include "chrome/browser/ui/android/infobars/infobar_android.h" | 73 #include "chrome/browser/ui/android/infobars/infobar_android.h" |
| 73 #include "chrome/browser/ui/android/infobars/infobar_container_android.h" | 74 #include "chrome/browser/ui/android/infobars/infobar_container_android.h" |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 153 {"FaviconHelper", FaviconHelper::RegisterFaviconHelper}, | 154 {"FaviconHelper", FaviconHelper::RegisterFaviconHelper}, |
| 154 {"FeatureUtilities", RegisterFeatureUtilities}, | 155 {"FeatureUtilities", RegisterFeatureUtilities}, |
| 155 {"FeedbackReporter", dom_distiller::android::RegisterFeedbackReporter}, | 156 {"FeedbackReporter", dom_distiller::android::RegisterFeedbackReporter}, |
| 156 {"FindInPageBridge", FindInPageBridge::RegisterFindInPageBridge}, | 157 {"FindInPageBridge", FindInPageBridge::RegisterFindInPageBridge}, |
| 157 {"FontSizePrefsAndroid", FontSizePrefsAndroid::Register}, | 158 {"FontSizePrefsAndroid", FontSizePrefsAndroid::Register}, |
| 158 {"ForeignSessionHelper", | 159 {"ForeignSessionHelper", |
| 159 ForeignSessionHelper::RegisterForeignSessionHelper}, | 160 ForeignSessionHelper::RegisterForeignSessionHelper}, |
| 160 {"GeneratedPasswordSavedInfoBarDelegate", | 161 {"GeneratedPasswordSavedInfoBarDelegate", |
| 161 RegisterGeneratedPasswordSavedInfoBarDelegate}, | 162 RegisterGeneratedPasswordSavedInfoBarDelegate}, |
| 162 {"InfoBarContainer", RegisterInfoBarContainer}, | 163 {"InfoBarContainer", RegisterInfoBarContainer}, |
| 164 {"CardUnmaskPrompt", autofill::CardUnmaskPromptViewAndroid::Register}, | |
|
Ted C
2014/12/10 22:04:59
reorder this one now
Evan Stade
2014/12/10 23:46:20
Done.
| |
| 163 {"InvalidationServiceFactory", | 165 {"InvalidationServiceFactory", |
| 164 invalidation::InvalidationServiceFactoryAndroid::Register}, | 166 invalidation::InvalidationServiceFactoryAndroid::Register}, |
| 165 {"ShortcutHelper", ShortcutHelper::RegisterShortcutHelper}, | 167 {"ShortcutHelper", ShortcutHelper::RegisterShortcutHelper}, |
| 166 {"IntentHelper", RegisterIntentHelper}, | 168 {"IntentHelper", RegisterIntentHelper}, |
| 167 {"JavascriptAppModalDialog", | 169 {"JavascriptAppModalDialog", |
| 168 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog}, | 170 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog}, |
| 169 {"LogoBridge", RegisterLogoBridge}, | 171 {"LogoBridge", RegisterLogoBridge}, |
| 170 {"MostVisitedSites", MostVisitedSites::Register}, | 172 {"MostVisitedSites", MostVisitedSites::Register}, |
| 171 {"NativeInfoBar", RegisterNativeInfoBar}, | 173 {"NativeInfoBar", RegisterNativeInfoBar}, |
| 172 {"NavigationPopup", NavigationPopup::RegisterNavigationPopup}, | 174 {"NavigationPopup", NavigationPopup::RegisterNavigationPopup}, |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 216 }; | 218 }; |
| 217 | 219 |
| 218 bool RegisterJni(JNIEnv* env) { | 220 bool RegisterJni(JNIEnv* env) { |
| 219 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); | 221 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); |
| 220 return RegisterNativeMethods(env, kChromeRegisteredMethods, | 222 return RegisterNativeMethods(env, kChromeRegisteredMethods, |
| 221 arraysize(kChromeRegisteredMethods)); | 223 arraysize(kChromeRegisteredMethods)); |
| 222 } | 224 } |
| 223 | 225 |
| 224 } // namespace android | 226 } // namespace android |
| 225 } // namespace chrome | 227 } // namespace chrome |
| OLD | NEW |