| 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 #include "chrome/browser/android/instantapps/instant_apps_settings.h" | 59 #include "chrome/browser/android/instantapps/instant_apps_settings.h" |
| 60 #include "chrome/browser/android/java_exception_reporter.h" | 60 #include "chrome/browser/android/java_exception_reporter.h" |
| 61 #include "chrome/browser/android/large_icon_bridge.h" | 61 #include "chrome/browser/android/large_icon_bridge.h" |
| 62 #include "chrome/browser/android/locale/special_locale_handler.h" | 62 #include "chrome/browser/android/locale/special_locale_handler.h" |
| 63 #include "chrome/browser/android/logo_bridge.h" | 63 #include "chrome/browser/android/logo_bridge.h" |
| 64 #include "chrome/browser/android/metrics/launch_metrics.h" | 64 #include "chrome/browser/android/metrics/launch_metrics.h" |
| 65 #include "chrome/browser/android/metrics/uma_session_stats.h" | 65 #include "chrome/browser/android/metrics/uma_session_stats.h" |
| 66 #include "chrome/browser/android/metrics/uma_utils.h" | 66 #include "chrome/browser/android/metrics/uma_utils.h" |
| 67 #include "chrome/browser/android/metrics/variations_session.h" | 67 #include "chrome/browser/android/metrics/variations_session.h" |
| 68 #include "chrome/browser/android/net/external_estimate_provider_android.h" | 68 #include "chrome/browser/android/net/external_estimate_provider_android.h" |
| 69 #include "chrome/browser/android/ntp/content_suggestions_notification_helper.h" |
| 69 #include "chrome/browser/android/ntp/most_visited_sites_bridge.h" | 70 #include "chrome/browser/android/ntp/most_visited_sites_bridge.h" |
| 70 #include "chrome/browser/android/ntp/ntp_snippets_bridge.h" | 71 #include "chrome/browser/android/ntp/ntp_snippets_bridge.h" |
| 71 #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h" | 72 #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h" |
| 72 #include "chrome/browser/android/offline_pages/background_scheduler_bridge.h" | 73 #include "chrome/browser/android/offline_pages/background_scheduler_bridge.h" |
| 73 #include "chrome/browser/android/offline_pages/downloads/offline_page_download_b
ridge.h" | 74 #include "chrome/browser/android/offline_pages/downloads/offline_page_download_b
ridge.h" |
| 74 #include "chrome/browser/android/offline_pages/offline_page_bridge.h" | 75 #include "chrome/browser/android/offline_pages/offline_page_bridge.h" |
| 75 #include "chrome/browser/android/omnibox/answers_image_bridge.h" | 76 #include "chrome/browser/android/omnibox/answers_image_bridge.h" |
| 76 #include "chrome/browser/android/omnibox/autocomplete_controller_android.h" | 77 #include "chrome/browser/android/omnibox/autocomplete_controller_android.h" |
| 77 #include "chrome/browser/android/omnibox/omnibox_prerender.h" | 78 #include "chrome/browser/android/omnibox/omnibox_prerender.h" |
| 78 #include "chrome/browser/android/password_ui_view_android.h" | 79 #include "chrome/browser/android/password_ui_view_android.h" |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 #if defined(ENABLE_MEDIA_ROUTER) | 261 #if defined(ENABLE_MEDIA_ROUTER) |
| 261 {"ChromeMediaRouter", media_router::MediaRouterAndroid::Register}, | 262 {"ChromeMediaRouter", media_router::MediaRouterAndroid::Register}, |
| 262 {"ChromeMediaRouterDialogController", | 263 {"ChromeMediaRouterDialogController", |
| 263 media_router::MediaRouterDialogControllerAndroid::Register}, | 264 media_router::MediaRouterDialogControllerAndroid::Register}, |
| 264 #endif | 265 #endif |
| 265 {"CompositorView", RegisterCompositorView}, | 266 {"CompositorView", RegisterCompositorView}, |
| 266 {"ConnectionInfoPopupAndroid", | 267 {"ConnectionInfoPopupAndroid", |
| 267 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid}, | 268 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid}, |
| 268 {"SecurityStateModel", RegisterSecurityStateModelAndroid}, | 269 {"SecurityStateModel", RegisterSecurityStateModelAndroid}, |
| 269 {"ConnectivityChecker", chrome::android::RegisterConnectivityChecker}, | 270 {"ConnectivityChecker", chrome::android::RegisterConnectivityChecker}, |
| 271 {"ContentSuggestionsNotificationHelper", |
| 272 ntp_snippets::ContentSuggestionsNotificationHelper::Register}, |
| 270 {"ContextMenuHelper", RegisterContextMenuHelper}, | 273 {"ContextMenuHelper", RegisterContextMenuHelper}, |
| 271 {"ContextualSearchManager", RegisterContextualSearchManager}, | 274 {"ContextualSearchManager", RegisterContextualSearchManager}, |
| 272 {"ContextualSearchSceneLayer", RegisterContextualSearchSceneLayer}, | 275 {"ContextualSearchSceneLayer", RegisterContextualSearchSceneLayer}, |
| 273 {"ContextualSearchTabHelper", RegisterContextualSearchTabHelper}, | 276 {"ContextualSearchTabHelper", RegisterContextualSearchTabHelper}, |
| 274 {"CookiesFetcher", RegisterCookiesFetcher}, | 277 {"CookiesFetcher", RegisterCookiesFetcher}, |
| 275 {"CreditCardScannerBridge", | 278 {"CreditCardScannerBridge", |
| 276 autofill::CreditCardScannerViewAndroid::Register}, | 279 autofill::CreditCardScannerViewAndroid::Register}, |
| 277 {"CtrSuppression", RegisterCtrSuppression}, | 280 {"CtrSuppression", RegisterCtrSuppression}, |
| 278 {"DataReductionPromoInfoBarDelegate", | 281 {"DataReductionPromoInfoBarDelegate", |
| 279 DataReductionPromoInfoBarDelegateAndroid::Register}, | 282 DataReductionPromoInfoBarDelegateAndroid::Register}, |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 435 #endif | 438 #endif |
| 436 }; | 439 }; |
| 437 | 440 |
| 438 bool RegisterBrowserJNI(JNIEnv* env) { | 441 bool RegisterBrowserJNI(JNIEnv* env) { |
| 439 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); | 442 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); |
| 440 return RegisterNativeMethods(env, kChromeRegisteredMethods, | 443 return RegisterNativeMethods(env, kChromeRegisteredMethods, |
| 441 arraysize(kChromeRegisteredMethods)); | 444 arraysize(kChromeRegisteredMethods)); |
| 442 } | 445 } |
| 443 | 446 |
| 444 } // namespace android | 447 } // namespace android |
| OLD | NEW |