| 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/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 #include "chrome/browser/invalidation/invalidation_service_factory_android.h" | 109 #include "chrome/browser/invalidation/invalidation_service_factory_android.h" |
| 110 #include "chrome/browser/lifetime/application_lifetime_android.h" | 110 #include "chrome/browser/lifetime/application_lifetime_android.h" |
| 111 #include "chrome/browser/media/android/cdm/media_drm_credential_manager.h" | 111 #include "chrome/browser/media/android/cdm/media_drm_credential_manager.h" |
| 112 #include "chrome/browser/media/android/remote/record_cast_action.h" | 112 #include "chrome/browser/media/android/remote/record_cast_action.h" |
| 113 #include "chrome/browser/media/android/remote/remote_media_player_bridge.h" | 113 #include "chrome/browser/media/android/remote/remote_media_player_bridge.h" |
| 114 #include "chrome/browser/media/android/router/media_router_android.h" | 114 #include "chrome/browser/media/android/router/media_router_android.h" |
| 115 #include "chrome/browser/media/android/router/media_router_dialog_controller_and
roid.h" | 115 #include "chrome/browser/media/android/router/media_router_dialog_controller_and
roid.h" |
| 116 #include "chrome/browser/net/spdyproxy/data_reduction_promo_infobar_delegate_and
roid.h" | 116 #include "chrome/browser/net/spdyproxy/data_reduction_promo_infobar_delegate_and
roid.h" |
| 117 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" | 117 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" |
| 118 #include "chrome/browser/notifications/notification_platform_bridge_android.h" | 118 #include "chrome/browser/notifications/notification_platform_bridge_android.h" |
| 119 #include "chrome/browser/page_load_metrics/observers/android_page_load_metrics_o
bserver.h" |
| 119 #include "chrome/browser/password_manager/account_chooser_dialog_android.h" | 120 #include "chrome/browser/password_manager/account_chooser_dialog_android.h" |
| 120 #include "chrome/browser/password_manager/auto_signin_first_run_dialog_android.h
" | 121 #include "chrome/browser/password_manager/auto_signin_first_run_dialog_android.h
" |
| 121 #include "chrome/browser/password_manager/credential_android.h" | 122 #include "chrome/browser/password_manager/credential_android.h" |
| 122 #include "chrome/browser/permissions/permission_update_infobar_delegate_android.
h" | 123 #include "chrome/browser/permissions/permission_update_infobar_delegate_android.
h" |
| 123 #include "chrome/browser/platform_util.h" | 124 #include "chrome/browser/platform_util.h" |
| 124 #include "chrome/browser/prerender/external_prerender_handler_android.h" | 125 #include "chrome/browser/prerender/external_prerender_handler_android.h" |
| 125 #include "chrome/browser/profiles/profile_android.h" | 126 #include "chrome/browser/profiles/profile_android.h" |
| 126 #include "chrome/browser/push_messaging/push_messaging_service_observer_android.
h" | 127 #include "chrome/browser/push_messaging/push_messaging_service_observer_android.
h" |
| 127 #include "chrome/browser/search_engines/template_url_service_android.h" | 128 #include "chrome/browser/search_engines/template_url_service_android.h" |
| 128 #include "chrome/browser/signin/oauth2_token_service_delegate_android.h" | 129 #include "chrome/browser/signin/oauth2_token_service_delegate_android.h" |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 327 OAuth2TokenServiceDelegateAndroid::Register}, | 328 OAuth2TokenServiceDelegateAndroid::Register}, |
| 328 {"OfflinePageBridge", offline_pages::android::RegisterOfflinePageBridge}, | 329 {"OfflinePageBridge", offline_pages::android::RegisterOfflinePageBridge}, |
| 329 {"OfflinePageDownloadBridge", | 330 {"OfflinePageDownloadBridge", |
| 330 offline_pages::android::OfflinePageDownloadBridge::Register}, | 331 offline_pages::android::OfflinePageDownloadBridge::Register}, |
| 331 {"OmniboxPrerender", RegisterOmniboxPrerender}, | 332 {"OmniboxPrerender", RegisterOmniboxPrerender}, |
| 332 {"OmniboxUrlEmphasizer", | 333 {"OmniboxUrlEmphasizer", |
| 333 OmniboxUrlEmphasizer::RegisterOmniboxUrlEmphasizer}, | 334 OmniboxUrlEmphasizer::RegisterOmniboxUrlEmphasizer}, |
| 334 {"OmniboxViewUtil", OmniboxViewUtil::RegisterOmniboxViewUtil}, | 335 {"OmniboxViewUtil", OmniboxViewUtil::RegisterOmniboxViewUtil}, |
| 335 {"OverlayPanelContent", RegisterOverlayPanelContent}, | 336 {"OverlayPanelContent", RegisterOverlayPanelContent}, |
| 336 {"PlatformUtil", platform_util::RegisterPlatformUtil}, | 337 {"PlatformUtil", platform_util::RegisterPlatformUtil}, |
| 338 {"PageLoadMetrics", RegisterPageLoadMetricsBindings}, |
| 337 {"PartnerBookmarksReader", | 339 {"PartnerBookmarksReader", |
| 338 PartnerBookmarksReader::RegisterPartnerBookmarksReader}, | 340 PartnerBookmarksReader::RegisterPartnerBookmarksReader}, |
| 339 {"PasswordGenerationPopup", | 341 {"PasswordGenerationPopup", |
| 340 autofill::PasswordGenerationPopupViewAndroid::Register}, | 342 autofill::PasswordGenerationPopupViewAndroid::Register}, |
| 341 {"PasswordUIViewAndroid", | 343 {"PasswordUIViewAndroid", |
| 342 PasswordUIViewAndroid::RegisterPasswordUIViewAndroid}, | 344 PasswordUIViewAndroid::RegisterPasswordUIViewAndroid}, |
| 343 {"PermissionUpdateInfoBarDelegate", | 345 {"PermissionUpdateInfoBarDelegate", |
| 344 PermissionUpdateInfoBarDelegate::RegisterPermissionUpdateInfoBarDelegate}, | 346 PermissionUpdateInfoBarDelegate::RegisterPermissionUpdateInfoBarDelegate}, |
| 345 {"PersonalDataManagerAndroid", | 347 {"PersonalDataManagerAndroid", |
| 346 autofill::PersonalDataManagerAndroid::Register}, | 348 autofill::PersonalDataManagerAndroid::Register}, |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 409 }; | 411 }; |
| 410 | 412 |
| 411 bool RegisterBrowserJNI(JNIEnv* env) { | 413 bool RegisterBrowserJNI(JNIEnv* env) { |
| 412 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); | 414 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); |
| 413 return RegisterNativeMethods(env, kChromeRegisteredMethods, | 415 return RegisterNativeMethods(env, kChromeRegisteredMethods, |
| 414 arraysize(kChromeRegisteredMethods)); | 416 arraysize(kChromeRegisteredMethods)); |
| 415 } | 417 } |
| 416 | 418 |
| 417 } // namespace android | 419 } // namespace android |
| 418 } // namespace chrome | 420 } // namespace chrome |
| OLD | NEW |