Chromium Code Reviews| 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/trace_event/trace_event.h" | 9 #include "base/trace_event/trace_event.h" |
| 10 #include "chrome/browser/after_startup_task_utils_android.h" | 10 #include "chrome/browser/after_startup_task_utils_android.h" |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 34 #include "chrome/browser/android/data_usage/external_data_use_observer.h" | 34 #include "chrome/browser/android/data_usage/external_data_use_observer.h" |
| 35 #include "chrome/browser/android/dev_tools_server.h" | 35 #include "chrome/browser/android/dev_tools_server.h" |
| 36 #include "chrome/browser/android/document/document_web_contents_delegate.h" | 36 #include "chrome/browser/android/document/document_web_contents_delegate.h" |
| 37 #include "chrome/browser/android/dom_distiller/distiller_ui_handle_android.h" | 37 #include "chrome/browser/android/dom_distiller/distiller_ui_handle_android.h" |
| 38 #include "chrome/browser/android/download/chrome_download_delegate.h" | 38 #include "chrome/browser/android/download/chrome_download_delegate.h" |
| 39 #include "chrome/browser/android/favicon_helper.h" | 39 #include "chrome/browser/android/favicon_helper.h" |
| 40 #include "chrome/browser/android/feature_utilities.h" | 40 #include "chrome/browser/android/feature_utilities.h" |
| 41 #include "chrome/browser/android/feedback/connectivity_checker.h" | 41 #include "chrome/browser/android/feedback/connectivity_checker.h" |
| 42 #include "chrome/browser/android/feedback/screenshot_task.h" | 42 #include "chrome/browser/android/feedback/screenshot_task.h" |
| 43 #include "chrome/browser/android/find_in_page/find_in_page_bridge.h" | 43 #include "chrome/browser/android/find_in_page/find_in_page_bridge.h" |
| 44 #include "chrome/browser/android/firstrun/variations/variations_seed_bridge.h" | |
| 44 #include "chrome/browser/android/foreign_session_helper.h" | 45 #include "chrome/browser/android/foreign_session_helper.h" |
| 45 #include "chrome/browser/android/fullscreen/fullscreen_infobar_delegate.h" | 46 #include "chrome/browser/android/fullscreen/fullscreen_infobar_delegate.h" |
| 46 #include "chrome/browser/android/history_report/history_report_jni_bridge.h" | 47 #include "chrome/browser/android/history_report/history_report_jni_bridge.h" |
| 47 #include "chrome/browser/android/intent_helper.h" | 48 #include "chrome/browser/android/intent_helper.h" |
| 48 #include "chrome/browser/android/java_exception_reporter.h" | 49 #include "chrome/browser/android/java_exception_reporter.h" |
| 49 #include "chrome/browser/android/large_icon_bridge.h" | 50 #include "chrome/browser/android/large_icon_bridge.h" |
| 50 #include "chrome/browser/android/location_settings_impl.h" | 51 #include "chrome/browser/android/location_settings_impl.h" |
| 51 #include "chrome/browser/android/logo_bridge.h" | 52 #include "chrome/browser/android/logo_bridge.h" |
| 52 #include "chrome/browser/android/metrics/launch_metrics.h" | 53 #include "chrome/browser/android/metrics/launch_metrics.h" |
| 53 #include "chrome/browser/android/metrics/uma_session_stats.h" | 54 #include "chrome/browser/android/metrics/uma_session_stats.h" |
| (...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 335 {"TabState", RegisterTabState}, | 336 {"TabState", RegisterTabState}, |
| 336 {"TabStripSceneLayer", RegisterTabStripSceneLayer}, | 337 {"TabStripSceneLayer", RegisterTabStripSceneLayer}, |
| 337 {"TabWebContentsDelegateAndroid", RegisterTabWebContentsDelegateAndroid}, | 338 {"TabWebContentsDelegateAndroid", RegisterTabWebContentsDelegateAndroid}, |
| 338 {"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register}, | 339 {"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register}, |
| 339 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid}, | 340 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid}, |
| 340 {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate}, | 341 {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate}, |
| 341 {"TtsPlatformImpl", TtsPlatformImplAndroid::Register}, | 342 {"TtsPlatformImpl", TtsPlatformImplAndroid::Register}, |
| 342 {"UmaSessionStats", RegisterUmaSessionStats}, | 343 {"UmaSessionStats", RegisterUmaSessionStats}, |
| 343 {"UrlUtilities", RegisterUrlUtilities}, | 344 {"UrlUtilities", RegisterUrlUtilities}, |
| 344 {"Variations", variations::android::RegisterVariations}, | 345 {"Variations", variations::android::RegisterVariations}, |
| 346 {"VariationsSeedBridge", | |
| 347 VariationsSeedBridge::RegisterVariationsSeedBridge}, | |
|
Alexei Svitkine (slow)
2015/11/05 16:38:26
Seems like we already have "Variations" above?
Ca
Alexander Agulenko
2015/11/06 08:09:01
Done.
| |
| 345 {"VariationsSession", chrome::android::RegisterVariationsSession}, | 348 {"VariationsSession", chrome::android::RegisterVariationsSession}, |
| 346 {"WarmupManager", RegisterWarmupManager}, | 349 {"WarmupManager", RegisterWarmupManager}, |
| 347 {"WebappRegistry", WebappRegistry::RegisterWebappRegistry}, | 350 {"WebappRegistry", WebappRegistry::RegisterWebappRegistry}, |
| 348 {"WebContentsFactory", RegisterWebContentsFactory}, | 351 {"WebContentsFactory", RegisterWebContentsFactory}, |
| 349 {"WebsitePreferenceBridge", RegisterWebsitePreferenceBridge}, | 352 {"WebsitePreferenceBridge", RegisterWebsitePreferenceBridge}, |
| 350 {"WebsiteSettingsPopupAndroid", | 353 {"WebsiteSettingsPopupAndroid", |
| 351 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid}, | 354 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid}, |
| 352 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW) | 355 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW) |
| 353 {"PrintingContext", | 356 {"PrintingContext", |
| 354 printing::PrintingContextAndroid::RegisterPrintingContext}, | 357 printing::PrintingContextAndroid::RegisterPrintingContext}, |
| 355 #endif | 358 #endif |
| 356 }; | 359 }; |
| 357 | 360 |
| 358 bool RegisterBrowserJNI(JNIEnv* env) { | 361 bool RegisterBrowserJNI(JNIEnv* env) { |
| 359 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); | 362 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); |
| 360 return RegisterNativeMethods(env, kChromeRegisteredMethods, | 363 return RegisterNativeMethods(env, kChromeRegisteredMethods, |
| 361 arraysize(kChromeRegisteredMethods)); | 364 arraysize(kChromeRegisteredMethods)); |
| 362 } | 365 } |
| 363 | 366 |
| 364 } // namespace android | 367 } // namespace android |
| 365 } // namespace chrome | 368 } // namespace chrome |
| OLD | NEW |