| 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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 #include "chrome/browser/media/android/cdm/media_drm_credential_manager.h" | 122 #include "chrome/browser/media/android/cdm/media_drm_credential_manager.h" |
| 123 #include "chrome/browser/media/android/remote/record_cast_action.h" | 123 #include "chrome/browser/media/android/remote/record_cast_action.h" |
| 124 #include "chrome/browser/media/android/remote/remote_media_player_bridge.h" | 124 #include "chrome/browser/media/android/remote/remote_media_player_bridge.h" |
| 125 #include "chrome/browser/media/android/router/media_router_android.h" | 125 #include "chrome/browser/media/android/router/media_router_android.h" |
| 126 #include "chrome/browser/media/android/router/media_router_dialog_controller_and
roid.h" | 126 #include "chrome/browser/media/android/router/media_router_dialog_controller_and
roid.h" |
| 127 #include "chrome/browser/net/spdyproxy/data_reduction_promo_infobar_delegate_and
roid.h" | 127 #include "chrome/browser/net/spdyproxy/data_reduction_promo_infobar_delegate_and
roid.h" |
| 128 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" | 128 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" |
| 129 #include "chrome/browser/notifications/notification_platform_bridge_android.h" | 129 #include "chrome/browser/notifications/notification_platform_bridge_android.h" |
| 130 #include "chrome/browser/password_manager/account_chooser_dialog_android.h" | 130 #include "chrome/browser/password_manager/account_chooser_dialog_android.h" |
| 131 #include "chrome/browser/password_manager/auto_signin_first_run_dialog_android.h
" | 131 #include "chrome/browser/password_manager/auto_signin_first_run_dialog_android.h
" |
| 132 #include "chrome/browser/payments/android/chrome_payments_jni_registrar.h" |
| 132 #include "chrome/browser/permissions/permission_dialog_delegate.h" | 133 #include "chrome/browser/permissions/permission_dialog_delegate.h" |
| 133 #include "chrome/browser/permissions/permission_update_infobar_delegate_android.
h" | 134 #include "chrome/browser/permissions/permission_update_infobar_delegate_android.
h" |
| 134 #include "chrome/browser/predictors/resource_prefetch_predictor_android.h" | 135 #include "chrome/browser/predictors/resource_prefetch_predictor_android.h" |
| 135 #include "chrome/browser/prerender/external_prerender_handler_android.h" | 136 #include "chrome/browser/prerender/external_prerender_handler_android.h" |
| 136 #include "chrome/browser/profiles/profile_android.h" | 137 #include "chrome/browser/profiles/profile_android.h" |
| 137 #include "chrome/browser/search_engines/template_url_service_android.h" | 138 #include "chrome/browser/search_engines/template_url_service_android.h" |
| 138 #include "chrome/browser/signin/oauth2_token_service_delegate_android.h" | 139 #include "chrome/browser/signin/oauth2_token_service_delegate_android.h" |
| 139 #include "chrome/browser/speech/tts_android.h" | 140 #include "chrome/browser/speech/tts_android.h" |
| 140 #include "chrome/browser/ssl/security_state_model_android.h" | 141 #include "chrome/browser/ssl/security_state_model_android.h" |
| 141 #include "chrome/browser/supervised_user/child_accounts/child_account_service_an
droid.h" | 142 #include "chrome/browser/supervised_user/child_accounts/child_account_service_an
droid.h" |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 {"ChromeBrowserProvider", | 267 {"ChromeBrowserProvider", |
| 267 ChromeBrowserProvider::RegisterChromeBrowserProvider}, | 268 ChromeBrowserProvider::RegisterChromeBrowserProvider}, |
| 268 {"ChromeFeatureList", chrome::android::RegisterChromeFeatureListJni}, | 269 {"ChromeFeatureList", chrome::android::RegisterChromeFeatureListJni}, |
| 269 {"ChromeHttpAuthHandler", | 270 {"ChromeHttpAuthHandler", |
| 270 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler}, | 271 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler}, |
| 271 #if defined(ENABLE_MEDIA_ROUTER) | 272 #if defined(ENABLE_MEDIA_ROUTER) |
| 272 {"ChromeMediaRouter", media_router::MediaRouterAndroidBridge::Register}, | 273 {"ChromeMediaRouter", media_router::MediaRouterAndroidBridge::Register}, |
| 273 {"ChromeMediaRouterDialogController", | 274 {"ChromeMediaRouterDialogController", |
| 274 media_router::MediaRouterDialogControllerAndroid::Register}, | 275 media_router::MediaRouterDialogControllerAndroid::Register}, |
| 275 #endif | 276 #endif |
| 277 {"ChromePayments", payments::android::RegisterChromePayments}, |
| 276 {"ChromeWebApkHost", ChromeWebApkHost::Register}, | 278 {"ChromeWebApkHost", ChromeWebApkHost::Register}, |
| 277 {"CompositorView", RegisterCompositorView}, | 279 {"CompositorView", RegisterCompositorView}, |
| 278 {"ConnectionInfoPopupAndroid", | 280 {"ConnectionInfoPopupAndroid", |
| 279 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid}, | 281 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid}, |
| 280 {"SecurityStateModel", RegisterSecurityStateModelAndroid}, | 282 {"SecurityStateModel", RegisterSecurityStateModelAndroid}, |
| 281 {"ConnectivityChecker", chrome::android::RegisterConnectivityChecker}, | 283 {"ConnectivityChecker", chrome::android::RegisterConnectivityChecker}, |
| 282 {"ContentSuggestionsNotificationHelper", | 284 {"ContentSuggestionsNotificationHelper", |
| 283 ntp_snippets::ContentSuggestionsNotificationHelper::Register}, | 285 ntp_snippets::ContentSuggestionsNotificationHelper::Register}, |
| 284 {"ContextMenuHelper", RegisterContextMenuHelper}, | 286 {"ContextMenuHelper", RegisterContextMenuHelper}, |
| 285 {"ContextualSearchContext", RegisterContextualSearchContext}, | 287 {"ContextualSearchContext", RegisterContextualSearchContext}, |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 455 #endif | 457 #endif |
| 456 }; | 458 }; |
| 457 | 459 |
| 458 bool RegisterBrowserJNI(JNIEnv* env) { | 460 bool RegisterBrowserJNI(JNIEnv* env) { |
| 459 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); | 461 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); |
| 460 return RegisterNativeMethods(env, kChromeRegisteredMethods, | 462 return RegisterNativeMethods(env, kChromeRegisteredMethods, |
| 461 arraysize(kChromeRegisteredMethods)); | 463 arraysize(kChromeRegisteredMethods)); |
| 462 } | 464 } |
| 463 | 465 |
| 464 } // namespace android | 466 } // namespace android |
| OLD | NEW |