| 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 #include "chrome/browser/android/feedback/connectivity_checker.h" | 49 #include "chrome/browser/android/feedback/connectivity_checker.h" |
| 50 #include "chrome/browser/android/feedback/screenshot_task.h" | 50 #include "chrome/browser/android/feedback/screenshot_task.h" |
| 51 #include "chrome/browser/android/find_in_page/find_in_page_bridge.h" | 51 #include "chrome/browser/android/find_in_page/find_in_page_bridge.h" |
| 52 #include "chrome/browser/android/foreign_session_helper.h" | 52 #include "chrome/browser/android/foreign_session_helper.h" |
| 53 #include "chrome/browser/android/history/browsing_history_bridge.h" | 53 #include "chrome/browser/android/history/browsing_history_bridge.h" |
| 54 #include "chrome/browser/android/history_report/history_report_jni_bridge.h" | 54 #include "chrome/browser/android/history_report/history_report_jni_bridge.h" |
| 55 #include "chrome/browser/android/instantapps/instant_apps_infobar_delegate.h" | 55 #include "chrome/browser/android/instantapps/instant_apps_infobar_delegate.h" |
| 56 #include "chrome/browser/android/instantapps/instant_apps_settings.h" | 56 #include "chrome/browser/android/instantapps/instant_apps_settings.h" |
| 57 #include "chrome/browser/android/large_icon_bridge.h" | 57 #include "chrome/browser/android/large_icon_bridge.h" |
| 58 #include "chrome/browser/android/locale/special_locale_handler.h" | 58 #include "chrome/browser/android/locale/special_locale_handler.h" |
| 59 #include "chrome/browser/android/location_settings_impl.h" |
| 59 #include "chrome/browser/android/logo_bridge.h" | 60 #include "chrome/browser/android/logo_bridge.h" |
| 60 #include "chrome/browser/android/metrics/launch_metrics.h" | 61 #include "chrome/browser/android/metrics/launch_metrics.h" |
| 61 #include "chrome/browser/android/metrics/uma_session_stats.h" | 62 #include "chrome/browser/android/metrics/uma_session_stats.h" |
| 62 #include "chrome/browser/android/metrics/uma_utils.h" | 63 #include "chrome/browser/android/metrics/uma_utils.h" |
| 63 #include "chrome/browser/android/metrics/variations_session.h" | 64 #include "chrome/browser/android/metrics/variations_session.h" |
| 64 #include "chrome/browser/android/net/external_estimate_provider_android.h" | 65 #include "chrome/browser/android/net/external_estimate_provider_android.h" |
| 65 #include "chrome/browser/android/ntp/content_suggestions_notification_helper.h" | 66 #include "chrome/browser/android/ntp/content_suggestions_notification_helper.h" |
| 66 #include "chrome/browser/android/ntp/most_visited_sites_bridge.h" | 67 #include "chrome/browser/android/ntp/most_visited_sites_bridge.h" |
| 67 #include "chrome/browser/android/ntp/ntp_snippets_bridge.h" | 68 #include "chrome/browser/android/ntp/ntp_snippets_bridge.h" |
| 68 #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h" | 69 #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h" |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 305 {"InvalidationServiceFactory", | 306 {"InvalidationServiceFactory", |
| 306 invalidation::InvalidationServiceFactoryAndroid::Register}, | 307 invalidation::InvalidationServiceFactoryAndroid::Register}, |
| 307 {"SimpleConfirmInfoBarBuilder", RegisterSimpleConfirmInfoBarBuilder}, | 308 {"SimpleConfirmInfoBarBuilder", RegisterSimpleConfirmInfoBarBuilder}, |
| 308 {"ShortcutHelper", ShortcutHelper::RegisterShortcutHelper}, | 309 {"ShortcutHelper", ShortcutHelper::RegisterShortcutHelper}, |
| 309 {"JavascriptAppModalDialog", | 310 {"JavascriptAppModalDialog", |
| 310 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog}, | 311 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog}, |
| 311 {"LargeIconBridge", LargeIconBridge::RegisterLargeIconBridge}, | 312 {"LargeIconBridge", LargeIconBridge::RegisterLargeIconBridge}, |
| 312 {"LaunchMetrics", metrics::RegisterLaunchMetrics}, | 313 {"LaunchMetrics", metrics::RegisterLaunchMetrics}, |
| 313 {"LayerTitleCache", RegisterLayerTitleCache}, | 314 {"LayerTitleCache", RegisterLayerTitleCache}, |
| 314 {"SpecialLocaleHandler", RegisterSpecialLocaleHandler}, | 315 {"SpecialLocaleHandler", RegisterSpecialLocaleHandler}, |
| 316 {"LocationSettingsImpl", LocationSettingsImpl::Register}, |
| 315 {"LogoBridge", RegisterLogoBridge}, | 317 {"LogoBridge", RegisterLogoBridge}, |
| 316 {"MediaDrmCredentialManager", | 318 {"MediaDrmCredentialManager", |
| 317 MediaDrmCredentialManager::RegisterMediaDrmCredentialManager}, | 319 MediaDrmCredentialManager::RegisterMediaDrmCredentialManager}, |
| 318 {"MostVisitedSites", MostVisitedSitesBridge::Register}, | 320 {"MostVisitedSites", MostVisitedSitesBridge::Register}, |
| 319 {"NativeInfoBar", RegisterNativeInfoBar}, | 321 {"NativeInfoBar", RegisterNativeInfoBar}, |
| 320 {"ExternalEstimateProviderAndroid", | 322 {"ExternalEstimateProviderAndroid", |
| 321 chrome::android::RegisterExternalEstimateProviderAndroid}, | 323 chrome::android::RegisterExternalEstimateProviderAndroid}, |
| 322 {"RecentTabsPagePrefs", RecentTabsPagePrefs::RegisterJni}, | 324 {"RecentTabsPagePrefs", RecentTabsPagePrefs::RegisterJni}, |
| 323 {"NotificationPlatformBridge", | 325 {"NotificationPlatformBridge", |
| 324 NotificationPlatformBridgeAndroid::RegisterNotificationPlatformBridge}, | 326 NotificationPlatformBridgeAndroid::RegisterNotificationPlatformBridge}, |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 432 #endif | 434 #endif |
| 433 }; | 435 }; |
| 434 | 436 |
| 435 bool RegisterBrowserJNI(JNIEnv* env) { | 437 bool RegisterBrowserJNI(JNIEnv* env) { |
| 436 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); | 438 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); |
| 437 return RegisterNativeMethods(env, kChromeRegisteredMethods, | 439 return RegisterNativeMethods(env, kChromeRegisteredMethods, |
| 438 arraysize(kChromeRegisteredMethods)); | 440 arraysize(kChromeRegisteredMethods)); |
| 439 } | 441 } |
| 440 | 442 |
| 441 } // namespace android | 443 } // namespace android |
| OLD | NEW |