| 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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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/password_manager/account_chooser_dialog_android.h" | 119 #include "chrome/browser/password_manager/account_chooser_dialog_android.h" |
| 120 #include "chrome/browser/password_manager/auto_signin_first_run_dialog_android.h
" | 120 #include "chrome/browser/password_manager/auto_signin_first_run_dialog_android.h
" |
| 121 #include "chrome/browser/permissions/permission_update_infobar_delegate_android.
h" | 121 #include "chrome/browser/permissions/permission_update_infobar_delegate_android.
h" |
| 122 #include "chrome/browser/predictors/resource_prefetch_predictor_android.h" |
| 122 #include "chrome/browser/prerender/external_prerender_handler_android.h" | 123 #include "chrome/browser/prerender/external_prerender_handler_android.h" |
| 123 #include "chrome/browser/profiles/profile_android.h" | 124 #include "chrome/browser/profiles/profile_android.h" |
| 124 #include "chrome/browser/search_engines/template_url_service_android.h" | 125 #include "chrome/browser/search_engines/template_url_service_android.h" |
| 125 #include "chrome/browser/signin/oauth2_token_service_delegate_android.h" | 126 #include "chrome/browser/signin/oauth2_token_service_delegate_android.h" |
| 126 #include "chrome/browser/speech/tts_android.h" | 127 #include "chrome/browser/speech/tts_android.h" |
| 127 #include "chrome/browser/ssl/security_state_model_android.h" | 128 #include "chrome/browser/ssl/security_state_model_android.h" |
| 128 #include "chrome/browser/supervised_user/child_accounts/child_account_service_an
droid.h" | 129 #include "chrome/browser/supervised_user/child_accounts/child_account_service_an
droid.h" |
| 129 #include "chrome/browser/supervised_user/supervised_user_content_provider_androi
d.h" | 130 #include "chrome/browser/supervised_user/supervised_user_content_provider_androi
d.h" |
| 130 #include "chrome/browser/sync/profile_sync_service_android.h" | 131 #include "chrome/browser/sync/profile_sync_service_android.h" |
| 131 #include "chrome/browser/sync/sessions/sync_sessions_metrics_android.h" | 132 #include "chrome/browser/sync/sessions/sync_sessions_metrics_android.h" |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 329 {"PrefServiceBridge", PrefServiceBridge::RegisterPrefServiceBridge}, | 330 {"PrefServiceBridge", PrefServiceBridge::RegisterPrefServiceBridge}, |
| 330 {"ProfileAndroid", ProfileAndroid::RegisterProfileAndroid}, | 331 {"ProfileAndroid", ProfileAndroid::RegisterProfileAndroid}, |
| 331 {"ProfileDownloader", RegisterProfileDownloader}, | 332 {"ProfileDownloader", RegisterProfileDownloader}, |
| 332 {"ProfileSyncService", ProfileSyncServiceAndroid::Register}, | 333 {"ProfileSyncService", ProfileSyncServiceAndroid::Register}, |
| 333 {"RapporServiceBridge", rappor::RegisterRapporServiceBridge}, | 334 {"RapporServiceBridge", rappor::RegisterRapporServiceBridge}, |
| 334 {"RecentlyClosedBridge", RecentlyClosedTabsBridge::Register}, | 335 {"RecentlyClosedBridge", RecentlyClosedTabsBridge::Register}, |
| 335 {"RecordCastAction", remote_media::RegisterRecordCastAction}, | 336 {"RecordCastAction", remote_media::RegisterRecordCastAction}, |
| 336 {"ReaderModeSceneLayer", RegisterReaderModeSceneLayer}, | 337 {"ReaderModeSceneLayer", RegisterReaderModeSceneLayer}, |
| 337 {"RemoteMediaPlayerBridge", | 338 {"RemoteMediaPlayerBridge", |
| 338 remote_media::RemoteMediaPlayerBridge::RegisterRemoteMediaPlayerBridge}, | 339 remote_media::RemoteMediaPlayerBridge::RegisterRemoteMediaPlayerBridge}, |
| 340 {"ResourcePrefetchPredictor", |
| 341 predictors::RegisterResourcePrefetchPredictor}, |
| 339 {"RevenueStats", RegisterRevenueStats}, | 342 {"RevenueStats", RegisterRevenueStats}, |
| 340 {"SafeBrowsingApiBridge", safe_browsing::RegisterSafeBrowsingApiBridge}, | 343 {"SafeBrowsingApiBridge", safe_browsing::RegisterSafeBrowsingApiBridge}, |
| 341 {"SceneLayer", chrome::android::RegisterSceneLayer}, | 344 {"SceneLayer", chrome::android::RegisterSceneLayer}, |
| 342 {"ScreenshotTask", RegisterScreenshotTask}, | 345 {"ScreenshotTask", RegisterScreenshotTask}, |
| 343 {"ServiceTabLauncher", ServiceTabLauncher::Register}, | 346 {"ServiceTabLauncher", ServiceTabLauncher::Register}, |
| 344 {"SessionTabHelper", RegisterSessionTabHelper}, | 347 {"SessionTabHelper", RegisterSessionTabHelper}, |
| 345 {"SigninInvestigator", SigninInvestigatorAndroid::Register}, | 348 {"SigninInvestigator", SigninInvestigatorAndroid::Register}, |
| 346 {"SigninManager", SigninManagerAndroid::Register}, | 349 {"SigninManager", SigninManagerAndroid::Register}, |
| 347 {"SingleTabModel", RegisterSingleTabModel}, | 350 {"SingleTabModel", RegisterSingleTabModel}, |
| 348 #if defined(ENABLE_SPELLCHECK) | 351 #if defined(ENABLE_SPELLCHECK) |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 392 }; | 395 }; |
| 393 | 396 |
| 394 bool RegisterBrowserJNI(JNIEnv* env) { | 397 bool RegisterBrowserJNI(JNIEnv* env) { |
| 395 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); | 398 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); |
| 396 return RegisterNativeMethods(env, kChromeRegisteredMethods, | 399 return RegisterNativeMethods(env, kChromeRegisteredMethods, |
| 397 arraysize(kChromeRegisteredMethods)); | 400 arraysize(kChromeRegisteredMethods)); |
| 398 } | 401 } |
| 399 | 402 |
| 400 } // namespace android | 403 } // namespace android |
| 401 } // namespace chrome | 404 } // namespace chrome |
| OLD | NEW |