| 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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 #include "chrome/browser/media/android/remote/record_cast_action.h" | 111 #include "chrome/browser/media/android/remote/record_cast_action.h" |
| 112 #include "chrome/browser/media/android/remote/remote_media_player_bridge.h" | 112 #include "chrome/browser/media/android/remote/remote_media_player_bridge.h" |
| 113 #include "chrome/browser/media/android/router/media_router_android.h" | 113 #include "chrome/browser/media/android/router/media_router_android.h" |
| 114 #include "chrome/browser/media/android/router/media_router_dialog_controller_and
roid.h" | 114 #include "chrome/browser/media/android/router/media_router_dialog_controller_and
roid.h" |
| 115 #include "chrome/browser/net/spdyproxy/data_reduction_promo_infobar_delegate_and
roid.h" | 115 #include "chrome/browser/net/spdyproxy/data_reduction_promo_infobar_delegate_and
roid.h" |
| 116 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" | 116 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" |
| 117 #include "chrome/browser/notifications/notification_platform_bridge_android.h" | 117 #include "chrome/browser/notifications/notification_platform_bridge_android.h" |
| 118 #include "chrome/browser/password_manager/account_chooser_dialog_android.h" | 118 #include "chrome/browser/password_manager/account_chooser_dialog_android.h" |
| 119 #include "chrome/browser/password_manager/auto_signin_first_run_dialog_android.h
" | 119 #include "chrome/browser/password_manager/auto_signin_first_run_dialog_android.h
" |
| 120 #include "chrome/browser/permissions/permission_update_infobar_delegate_android.
h" | 120 #include "chrome/browser/permissions/permission_update_infobar_delegate_android.
h" |
| 121 #include "chrome/browser/predictors/resource_prefetch_predictor_android.h" |
| 121 #include "chrome/browser/prerender/external_prerender_handler_android.h" | 122 #include "chrome/browser/prerender/external_prerender_handler_android.h" |
| 122 #include "chrome/browser/profiles/profile_android.h" | 123 #include "chrome/browser/profiles/profile_android.h" |
| 123 #include "chrome/browser/search_engines/template_url_service_android.h" | 124 #include "chrome/browser/search_engines/template_url_service_android.h" |
| 124 #include "chrome/browser/signin/oauth2_token_service_delegate_android.h" | 125 #include "chrome/browser/signin/oauth2_token_service_delegate_android.h" |
| 125 #include "chrome/browser/speech/tts_android.h" | 126 #include "chrome/browser/speech/tts_android.h" |
| 126 #include "chrome/browser/ssl/security_state_model_android.h" | 127 #include "chrome/browser/ssl/security_state_model_android.h" |
| 127 #include "chrome/browser/supervised_user/child_accounts/child_account_service_an
droid.h" | 128 #include "chrome/browser/supervised_user/child_accounts/child_account_service_an
droid.h" |
| 128 #include "chrome/browser/supervised_user/supervised_user_content_provider_androi
d.h" | 129 #include "chrome/browser/supervised_user/supervised_user_content_provider_androi
d.h" |
| 129 #include "chrome/browser/sync/profile_sync_service_android.h" | 130 #include "chrome/browser/sync/profile_sync_service_android.h" |
| 130 #include "chrome/browser/sync/sessions/sync_sessions_metrics_android.h" | 131 #include "chrome/browser/sync/sessions/sync_sessions_metrics_android.h" |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 326 {"PrefServiceBridge", PrefServiceBridge::RegisterPrefServiceBridge}, | 327 {"PrefServiceBridge", PrefServiceBridge::RegisterPrefServiceBridge}, |
| 327 {"ProfileAndroid", ProfileAndroid::RegisterProfileAndroid}, | 328 {"ProfileAndroid", ProfileAndroid::RegisterProfileAndroid}, |
| 328 {"ProfileDownloader", RegisterProfileDownloader}, | 329 {"ProfileDownloader", RegisterProfileDownloader}, |
| 329 {"ProfileSyncService", ProfileSyncServiceAndroid::Register}, | 330 {"ProfileSyncService", ProfileSyncServiceAndroid::Register}, |
| 330 {"RapporServiceBridge", rappor::RegisterRapporServiceBridge}, | 331 {"RapporServiceBridge", rappor::RegisterRapporServiceBridge}, |
| 331 {"RecentlyClosedBridge", RecentlyClosedTabsBridge::Register}, | 332 {"RecentlyClosedBridge", RecentlyClosedTabsBridge::Register}, |
| 332 {"RecordCastAction", remote_media::RegisterRecordCastAction}, | 333 {"RecordCastAction", remote_media::RegisterRecordCastAction}, |
| 333 {"ReaderModeSceneLayer", RegisterReaderModeSceneLayer}, | 334 {"ReaderModeSceneLayer", RegisterReaderModeSceneLayer}, |
| 334 {"RemoteMediaPlayerBridge", | 335 {"RemoteMediaPlayerBridge", |
| 335 remote_media::RemoteMediaPlayerBridge::RegisterRemoteMediaPlayerBridge}, | 336 remote_media::RemoteMediaPlayerBridge::RegisterRemoteMediaPlayerBridge}, |
| 337 {"ResourcePrefetchPredictorFactory", |
| 338 predictors::ResourcePrefetchPredictorAndroid::Register}, |
| 336 {"RevenueStats", RegisterRevenueStats}, | 339 {"RevenueStats", RegisterRevenueStats}, |
| 337 {"SafeBrowsingApiBridge", safe_browsing::RegisterSafeBrowsingApiBridge}, | 340 {"SafeBrowsingApiBridge", safe_browsing::RegisterSafeBrowsingApiBridge}, |
| 338 {"SceneLayer", chrome::android::RegisterSceneLayer}, | 341 {"SceneLayer", chrome::android::RegisterSceneLayer}, |
| 339 {"ScreenshotTask", RegisterScreenshotTask}, | 342 {"ScreenshotTask", RegisterScreenshotTask}, |
| 340 {"ServiceTabLauncher", ServiceTabLauncher::Register}, | 343 {"ServiceTabLauncher", ServiceTabLauncher::Register}, |
| 341 {"SessionTabHelper", RegisterSessionTabHelper}, | 344 {"SessionTabHelper", RegisterSessionTabHelper}, |
| 342 {"SigninInvestigator", SigninInvestigatorAndroid::Register}, | 345 {"SigninInvestigator", SigninInvestigatorAndroid::Register}, |
| 343 {"SigninManager", SigninManagerAndroid::Register}, | 346 {"SigninManager", SigninManagerAndroid::Register}, |
| 344 {"SingleTabModel", RegisterSingleTabModel}, | 347 {"SingleTabModel", RegisterSingleTabModel}, |
| 345 #if defined(ENABLE_SPELLCHECK) | 348 #if defined(ENABLE_SPELLCHECK) |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 390 }; | 393 }; |
| 391 | 394 |
| 392 bool RegisterBrowserJNI(JNIEnv* env) { | 395 bool RegisterBrowserJNI(JNIEnv* env) { |
| 393 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); | 396 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); |
| 394 return RegisterNativeMethods(env, kChromeRegisteredMethods, | 397 return RegisterNativeMethods(env, kChromeRegisteredMethods, |
| 395 arraysize(kChromeRegisteredMethods)); | 398 arraysize(kChromeRegisteredMethods)); |
| 396 } | 399 } |
| 397 | 400 |
| 398 } // namespace android | 401 } // namespace android |
| 399 } // namespace chrome | 402 } // namespace chrome |
| OLD | NEW |