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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 #include "chrome/browser/android/history_report/history_report_jni_bridge.h" | 50 #include "chrome/browser/android/history_report/history_report_jni_bridge.h" |
51 #include "chrome/browser/android/intent_helper.h" | 51 #include "chrome/browser/android/intent_helper.h" |
52 #include "chrome/browser/android/java_exception_reporter.h" | 52 #include "chrome/browser/android/java_exception_reporter.h" |
53 #include "chrome/browser/android/large_icon_bridge.h" | 53 #include "chrome/browser/android/large_icon_bridge.h" |
54 #include "chrome/browser/android/location_settings_impl.h" | 54 #include "chrome/browser/android/location_settings_impl.h" |
55 #include "chrome/browser/android/logo_bridge.h" | 55 #include "chrome/browser/android/logo_bridge.h" |
56 #include "chrome/browser/android/metrics/launch_metrics.h" | 56 #include "chrome/browser/android/metrics/launch_metrics.h" |
57 #include "chrome/browser/android/metrics/uma_session_stats.h" | 57 #include "chrome/browser/android/metrics/uma_session_stats.h" |
58 #include "chrome/browser/android/metrics/uma_utils.h" | 58 #include "chrome/browser/android/metrics/uma_utils.h" |
59 #include "chrome/browser/android/metrics/variations_session.h" | 59 #include "chrome/browser/android/metrics/variations_session.h" |
| 60 #include "chrome/browser/android/mojo/chrome_service_registrar_android.h" |
60 #include "chrome/browser/android/net/external_estimate_provider_android.h" | 61 #include "chrome/browser/android/net/external_estimate_provider_android.h" |
61 #include "chrome/browser/android/ntp/most_visited_sites.h" | 62 #include "chrome/browser/android/ntp/most_visited_sites.h" |
62 #include "chrome/browser/android/ntp/new_tab_page_prefs.h" | 63 #include "chrome/browser/android/ntp/new_tab_page_prefs.h" |
63 #include "chrome/browser/android/ntp/ntp_snippets_bridge.h" | 64 #include "chrome/browser/android/ntp/ntp_snippets_bridge.h" |
64 #include "chrome/browser/android/ntp/ntp_snippets_controller.h" | 65 #include "chrome/browser/android/ntp/ntp_snippets_controller.h" |
65 #include "chrome/browser/android/ntp/ntp_snippets_launcher.h" | 66 #include "chrome/browser/android/ntp/ntp_snippets_launcher.h" |
66 #include "chrome/browser/android/offline_pages/offline_page_bridge.h" | 67 #include "chrome/browser/android/offline_pages/offline_page_bridge.h" |
67 #include "chrome/browser/android/omnibox/answers_image_bridge.h" | 68 #include "chrome/browser/android/omnibox/answers_image_bridge.h" |
68 #include "chrome/browser/android/omnibox/autocomplete_controller_android.h" | 69 #include "chrome/browser/android/omnibox/autocomplete_controller_android.h" |
69 #include "chrome/browser/android/omnibox/omnibox_prerender.h" | 70 #include "chrome/browser/android/omnibox/omnibox_prerender.h" |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
238 {"ChromeBrowserProvider", | 239 {"ChromeBrowserProvider", |
239 ChromeBrowserProvider::RegisterChromeBrowserProvider}, | 240 ChromeBrowserProvider::RegisterChromeBrowserProvider}, |
240 {"ChromeFeatureList", RegisterChromeFeatureListJni}, | 241 {"ChromeFeatureList", RegisterChromeFeatureListJni}, |
241 {"ChromeHttpAuthHandler", | 242 {"ChromeHttpAuthHandler", |
242 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler}, | 243 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler}, |
243 #if defined(ENABLE_MEDIA_ROUTER) | 244 #if defined(ENABLE_MEDIA_ROUTER) |
244 {"ChromeMediaRouter", media_router::MediaRouterAndroid::Register}, | 245 {"ChromeMediaRouter", media_router::MediaRouterAndroid::Register}, |
245 {"ChromeMediaRouterDialogController", | 246 {"ChromeMediaRouterDialogController", |
246 media_router::MediaRouterDialogControllerAndroid::Register}, | 247 media_router::MediaRouterDialogControllerAndroid::Register}, |
247 #endif | 248 #endif |
| 249 {"ChromeServiceRegistrar", ChromeServiceRegistrarAndroid::Register}, |
248 {"CompositorView", RegisterCompositorView}, | 250 {"CompositorView", RegisterCompositorView}, |
249 {"ConfirmInfoBar", RegisterConfirmInfoBar}, | 251 {"ConfirmInfoBar", RegisterConfirmInfoBar}, |
250 {"ConnectionInfoPopupAndroid", | 252 {"ConnectionInfoPopupAndroid", |
251 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid}, | 253 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid}, |
252 {"SecurityStateModel", RegisterSecurityStateModelAndroid}, | 254 {"SecurityStateModel", RegisterSecurityStateModelAndroid}, |
253 {"ConnectivityChecker", RegisterConnectivityChecker}, | 255 {"ConnectivityChecker", RegisterConnectivityChecker}, |
254 {"ContextMenuHelper", RegisterContextMenuHelper}, | 256 {"ContextMenuHelper", RegisterContextMenuHelper}, |
255 {"ContextualSearchManager", RegisterContextualSearchManager}, | 257 {"ContextualSearchManager", RegisterContextualSearchManager}, |
256 {"ContextualSearchSceneLayer", RegisterContextualSearchSceneLayer}, | 258 {"ContextualSearchSceneLayer", RegisterContextualSearchSceneLayer}, |
257 {"ContextualSearchTabHelper", RegisterContextualSearchTabHelper}, | 259 {"ContextualSearchTabHelper", RegisterContextualSearchTabHelper}, |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
393 }; | 395 }; |
394 | 396 |
395 bool RegisterBrowserJNI(JNIEnv* env) { | 397 bool RegisterBrowserJNI(JNIEnv* env) { |
396 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); | 398 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); |
397 return RegisterNativeMethods(env, kChromeRegisteredMethods, | 399 return RegisterNativeMethods(env, kChromeRegisteredMethods, |
398 arraysize(kChromeRegisteredMethods)); | 400 arraysize(kChromeRegisteredMethods)); |
399 } | 401 } |
400 | 402 |
401 } // namespace android | 403 } // namespace android |
402 } // namespace chrome | 404 } // namespace chrome |
OLD | NEW |