| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 #include "chrome/browser/android/feature_utilities.h" | 54 #include "chrome/browser/android/feature_utilities.h" |
| 55 #include "chrome/browser/android/feedback/connectivity_checker.h" | 55 #include "chrome/browser/android/feedback/connectivity_checker.h" |
| 56 #include "chrome/browser/android/feedback/screenshot_task.h" | 56 #include "chrome/browser/android/feedback/screenshot_task.h" |
| 57 #include "chrome/browser/android/find_in_page/find_in_page_bridge.h" | 57 #include "chrome/browser/android/find_in_page/find_in_page_bridge.h" |
| 58 #include "chrome/browser/android/foreign_session_helper.h" | 58 #include "chrome/browser/android/foreign_session_helper.h" |
| 59 #include "chrome/browser/android/history/browsing_history_bridge.h" | 59 #include "chrome/browser/android/history/browsing_history_bridge.h" |
| 60 #include "chrome/browser/android/history_report/history_report_jni_bridge.h" | 60 #include "chrome/browser/android/history_report/history_report_jni_bridge.h" |
| 61 #include "chrome/browser/android/instantapps/instant_apps_infobar_delegate.h" | 61 #include "chrome/browser/android/instantapps/instant_apps_infobar_delegate.h" |
| 62 #include "chrome/browser/android/instantapps/instant_apps_settings.h" | 62 #include "chrome/browser/android/instantapps/instant_apps_settings.h" |
| 63 #include "chrome/browser/android/large_icon_bridge.h" | 63 #include "chrome/browser/android/large_icon_bridge.h" |
| 64 #include "chrome/browser/android/locale/locale_manager.h" |
| 64 #include "chrome/browser/android/locale/special_locale_handler.h" | 65 #include "chrome/browser/android/locale/special_locale_handler.h" |
| 65 #include "chrome/browser/android/location_settings_impl.h" | 66 #include "chrome/browser/android/location_settings_impl.h" |
| 66 #include "chrome/browser/android/logo_bridge.h" | 67 #include "chrome/browser/android/logo_bridge.h" |
| 67 #include "chrome/browser/android/metrics/launch_metrics.h" | 68 #include "chrome/browser/android/metrics/launch_metrics.h" |
| 68 #include "chrome/browser/android/metrics/uma_session_stats.h" | 69 #include "chrome/browser/android/metrics/uma_session_stats.h" |
| 69 #include "chrome/browser/android/metrics/uma_utils.h" | 70 #include "chrome/browser/android/metrics/uma_utils.h" |
| 70 #include "chrome/browser/android/metrics/variations_session.h" | 71 #include "chrome/browser/android/metrics/variations_session.h" |
| 71 #include "chrome/browser/android/net/external_estimate_provider_android.h" | 72 #include "chrome/browser/android/net/external_estimate_provider_android.h" |
| 72 #include "chrome/browser/android/ntp/content_suggestions_notification_helper.h" | 73 #include "chrome/browser/android/ntp/content_suggestions_notification_helper.h" |
| 73 #include "chrome/browser/android/ntp/most_visited_sites_bridge.h" | 74 #include "chrome/browser/android/ntp/most_visited_sites_bridge.h" |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 {"InstantAppsInfobarDelegate", RegisterInstantAppsInfoBarDelegate}, | 333 {"InstantAppsInfobarDelegate", RegisterInstantAppsInfoBarDelegate}, |
| 333 {"InstantAppsSettings", RegisterInstantAppsSettings}, | 334 {"InstantAppsSettings", RegisterInstantAppsSettings}, |
| 334 {"InvalidationServiceFactory", | 335 {"InvalidationServiceFactory", |
| 335 invalidation::InvalidationServiceFactoryAndroid::Register}, | 336 invalidation::InvalidationServiceFactoryAndroid::Register}, |
| 336 {"JavascriptAppModalDialog", | 337 {"JavascriptAppModalDialog", |
| 337 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog}, | 338 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog}, |
| 338 {"LargeIconBridge", LargeIconBridge::RegisterLargeIconBridge}, | 339 {"LargeIconBridge", LargeIconBridge::RegisterLargeIconBridge}, |
| 339 {"LaunchMetrics", metrics::RegisterLaunchMetrics}, | 340 {"LaunchMetrics", metrics::RegisterLaunchMetrics}, |
| 340 {"LayerTitleCache", RegisterLayerTitleCache}, | 341 {"LayerTitleCache", RegisterLayerTitleCache}, |
| 341 {"LoadingPredictor", predictors::RegisterLoadingPredictor}, | 342 {"LoadingPredictor", predictors::RegisterLoadingPredictor}, |
| 343 {"LocaleManager", RegisterLocaleManager}, |
| 342 {"LocationSettingsImpl", LocationSettingsImpl::Register}, | 344 {"LocationSettingsImpl", LocationSettingsImpl::Register}, |
| 343 {"LogoBridge", RegisterLogoBridge}, | 345 {"LogoBridge", RegisterLogoBridge}, |
| 344 {"MediaDrmCredentialManager", | 346 {"MediaDrmCredentialManager", |
| 345 MediaDrmCredentialManager::RegisterMediaDrmCredentialManager}, | 347 MediaDrmCredentialManager::RegisterMediaDrmCredentialManager}, |
| 346 {"MostVisitedSitesBridge", MostVisitedSitesBridge::Register}, | 348 {"MostVisitedSitesBridge", MostVisitedSitesBridge::Register}, |
| 347 {"NativeInfoBar", RegisterNativeInfoBar}, | 349 {"NativeInfoBar", RegisterNativeInfoBar}, |
| 348 {"ExternalEstimateProviderAndroid", | 350 {"ExternalEstimateProviderAndroid", |
| 349 chrome::android::RegisterExternalEstimateProviderAndroid}, | 351 chrome::android::RegisterExternalEstimateProviderAndroid}, |
| 350 {"RecentTabsPagePrefs", RecentTabsPagePrefs::RegisterJni}, | 352 {"RecentTabsPagePrefs", RecentTabsPagePrefs::RegisterJni}, |
| 351 {"NotificationPlatformBridge", | 353 {"NotificationPlatformBridge", |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 466 #endif | 468 #endif |
| 467 }; | 469 }; |
| 468 | 470 |
| 469 bool RegisterBrowserJNI(JNIEnv* env) { | 471 bool RegisterBrowserJNI(JNIEnv* env) { |
| 470 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); | 472 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); |
| 471 return RegisterNativeMethods(env, kChromeRegisteredMethods, | 473 return RegisterNativeMethods(env, kChromeRegisteredMethods, |
| 472 arraysize(kChromeRegisteredMethods)); | 474 arraysize(kChromeRegisteredMethods)); |
| 473 } | 475 } |
| 474 | 476 |
| 475 } // namespace android | 477 } // namespace android |
| OLD | NEW |