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/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 87 #include "chrome/browser/android/recently_closed_tabs_bridge.h" | 87 #include "chrome/browser/android/recently_closed_tabs_bridge.h" |
| 88 #include "chrome/browser/android/rlz/revenue_stats.h" | 88 #include "chrome/browser/android/rlz/revenue_stats.h" |
| 89 #include "chrome/browser/android/safe_browsing/safe_browsing_api_handler_bridge. h" | 89 #include "chrome/browser/android/safe_browsing/safe_browsing_api_handler_bridge. h" |
| 90 #include "chrome/browser/android/service_tab_launcher.h" | 90 #include "chrome/browser/android/service_tab_launcher.h" |
| 91 #include "chrome/browser/android/sessions/session_tab_helper_android.h" | 91 #include "chrome/browser/android/sessions/session_tab_helper_android.h" |
| 92 #include "chrome/browser/android/shortcut_helper.h" | 92 #include "chrome/browser/android/shortcut_helper.h" |
| 93 #include "chrome/browser/android/signin/account_management_screen_helper.h" | 93 #include "chrome/browser/android/signin/account_management_screen_helper.h" |
| 94 #include "chrome/browser/android/signin/account_tracker_service_android.h" | 94 #include "chrome/browser/android/signin/account_tracker_service_android.h" |
| 95 #include "chrome/browser/android/signin/signin_investigator_android.h" | 95 #include "chrome/browser/android/signin/signin_investigator_android.h" |
| 96 #include "chrome/browser/android/signin/signin_manager_android.h" | 96 #include "chrome/browser/android/signin/signin_manager_android.h" |
| 97 #include "chrome/browser/android/swipe_refresh_handler.h" | |
| 97 #include "chrome/browser/android/tab_android.h" | 98 #include "chrome/browser/android/tab_android.h" |
| 98 #include "chrome/browser/android/tab_state.h" | 99 #include "chrome/browser/android/tab_state.h" |
| 99 #include "chrome/browser/android/tab_web_contents_delegate_android.h" | 100 #include "chrome/browser/android/tab_web_contents_delegate_android.h" |
| 100 #include "chrome/browser/android/url_utilities.h" | 101 #include "chrome/browser/android/url_utilities.h" |
| 101 #include "chrome/browser/android/voice_search_tab_helper.h" | 102 #include "chrome/browser/android/voice_search_tab_helper.h" |
| 102 #include "chrome/browser/android/warmup_manager.h" | 103 #include "chrome/browser/android/warmup_manager.h" |
| 103 #include "chrome/browser/android/web_contents_factory.h" | 104 #include "chrome/browser/android/web_contents_factory.h" |
| 104 #include "chrome/browser/android/webapk/manifest_upgrade_detector_fetcher.h" | 105 #include "chrome/browser/android/webapk/manifest_upgrade_detector_fetcher.h" |
| 105 #include "chrome/browser/android/webapk/webapk_installer.h" | 106 #include "chrome/browser/android/webapk/webapk_installer.h" |
| 106 #include "chrome/browser/android/webapk/webapk_update_manager.h" | 107 #include "chrome/browser/android/webapk/webapk_update_manager.h" |
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 374 {"SingleTabModel", RegisterSingleTabModel}, | 375 {"SingleTabModel", RegisterSingleTabModel}, |
| 375 #if BUILDFLAG(ENABLE_SPELLCHECK) | 376 #if BUILDFLAG(ENABLE_SPELLCHECK) |
| 376 {"SpellCheckerSessionBridge", spellcheck::android::RegisterSpellcheckJni}, | 377 {"SpellCheckerSessionBridge", spellcheck::android::RegisterSpellcheckJni}, |
| 377 #endif | 378 #endif |
| 378 {"SqliteCursor", SQLiteCursor::RegisterSqliteCursor}, | 379 {"SqliteCursor", SQLiteCursor::RegisterSqliteCursor}, |
| 379 {"SSLClientCertificateRequest", | 380 {"SSLClientCertificateRequest", |
| 380 chrome::android::RegisterSSLClientCertificateRequestAndroid}, | 381 chrome::android::RegisterSSLClientCertificateRequestAndroid}, |
| 381 {"StartupMetricUtils", chrome::android::RegisterStartupMetricUtils}, | 382 {"StartupMetricUtils", chrome::android::RegisterStartupMetricUtils}, |
| 382 {"StaticTabSceneLayer", RegisterStaticTabSceneLayer}, | 383 {"StaticTabSceneLayer", RegisterStaticTabSceneLayer}, |
| 383 {"SupervisedUserContentProvider", SupervisedUserContentProvider::Register}, | 384 {"SupervisedUserContentProvider", SupervisedUserContentProvider::Register}, |
| 385 {"SwipeRefreshHandler", SwipeRefreshHandler::RegisterSwipeRefreshHandler}, | |
| 384 {"Sync", syncer::RegisterSyncJni}, | 386 {"Sync", syncer::RegisterSyncJni}, |
| 385 {"SyncSessionsMetrics", SyncSessionsMetricsAndroid::Register}, | 387 {"SyncSessionsMetrics", SyncSessionsMetricsAndroid::Register}, |
| 386 {"TabAndroid", TabAndroid::RegisterTabAndroid}, | 388 {"TabAndroid", TabAndroid::RegisterTabAndroid}, |
| 387 {"TabContentManager", RegisterTabContentManager}, | 389 {"TabContentManager", RegisterTabContentManager}, |
| 388 {"TabListSceneLayer", RegisterTabListSceneLayer}, | 390 {"TabListSceneLayer", RegisterTabListSceneLayer}, |
| 389 {"TabModelJniBridge", TabModelJniBridge::Register}, | 391 {"TabModelJniBridge", TabModelJniBridge::Register}, |
| 390 {"TabState", RegisterTabState}, | 392 {"TabState", RegisterTabState}, |
| 391 {"TabStripSceneLayer", RegisterTabStripSceneLayer}, | 393 {"TabStripSceneLayer", RegisterTabStripSceneLayer}, |
| 392 {"TabWebContentsDelegateAndroid", RegisterTabWebContentsDelegateAndroid}, | 394 {"TabWebContentsDelegateAndroid", RegisterTabWebContentsDelegateAndroid}, |
| 393 {"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register}, | 395 {"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register}, |
| 394 {"ThumbnailProvider", ThumbnailProvider::RegisterThumbnailProvider}, | 396 {"ThumbnailProvider", ThumbnailProvider::RegisterThumbnailProvider}, |
| 395 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid}, | 397 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid}, |
| 396 {"ToolbarSceneLayer", RegisterToolbarSceneLayer}, | 398 {"ToolbarSceneLayer", RegisterToolbarSceneLayer}, |
| 397 {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate}, | 399 {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate}, |
| 398 {"TtsPlatformImpl", TtsPlatformImplAndroid::Register}, | 400 {"TtsPlatformImpl", TtsPlatformImplAndroid::Register}, |
| 399 {"UmaSessionStats", RegisterUmaSessionStats}, | 401 {"UmaSessionStats", RegisterUmaSessionStats}, |
| 400 {"UrlFilterBridge", UrlFilterBridge::Register}, | 402 {"UrlFilterBridge", UrlFilterBridge::Register}, |
| 401 {"UrlUtilities", RegisterUrlUtilities}, | 403 {"UrlUtilities", RegisterUrlUtilities}, |
| 402 {"UsbChooserDialogAndroid", UsbChooserDialogAndroid::Register}, | 404 {"UsbChooserDialogAndroid", UsbChooserDialogAndroid::Register}, |
| 403 {"Variations", variations::android::RegisterVariations}, | 405 {"Variations", variations::android::RegisterVariations}, |
| 404 {"VariationsSession", chrome::android::RegisterVariationsSession}, | 406 {"VariationsSession", chrome::android::RegisterVariationsSession}, |
| 405 #if defined(ENABLE_VR_SHELL) || defined(ENABLE_WEBVR) | 407 #if defined(ENABLE_VR_SHELL) || defined(ENABLE_WEBVR) |
| 406 {"VrShell", vr_shell::RegisterVrShell}, | 408 {"VrShell", vr_shell::RegisterVrShell}, |
| 407 {"VrShellDelegate", vr_shell::RegisterVrShellDelegate}, | 409 {"VrShellDelegate", vr_shell::RegisterVrShellDelegate}, |
| 408 {"DisplaySynchronizer", | 410 {"DisplaySynchronizer", |
| 409 DisplaySynchronizer::RegisterDisplaySynchronizerNatives}, | 411 DisplaySynchronizer::RegisterDisplaySynchronizerNatives}, |
| 410 {"GvrApi", GvrApi::RegisterGvrApiNatives}, | 412 {"GvrApi", GvrApi::RegisterGvrApiNatives}, |
| 411 {"NativeCallbacks", | 413 {"NativeCallbacks", NativeCallbacks::RegisterNativeCallbacksNatives}, |
|
Jinsuk Kim
2016/11/28 23:06:40
This doesn't seem related to this CL?
rlanday
2016/11/29 00:46:25
I think this was from git cl format, I will undo i
| |
| 412 NativeCallbacks::RegisterNativeCallbacksNatives}, | |
| 413 #endif | 414 #endif |
| 414 {"WarmupManager", RegisterWarmupManager}, | 415 {"WarmupManager", RegisterWarmupManager}, |
| 415 {"WebApkInstaller", WebApkInstaller::Register}, | 416 {"WebApkInstaller", WebApkInstaller::Register}, |
| 416 {"WebApkUpdateManager", WebApkUpdateManager::Register}, | 417 {"WebApkUpdateManager", WebApkUpdateManager::Register}, |
| 417 {"WebContentsFactory", RegisterWebContentsFactory}, | 418 {"WebContentsFactory", RegisterWebContentsFactory}, |
| 418 {"WebsitePreferenceBridge", RegisterWebsitePreferenceBridge}, | 419 {"WebsitePreferenceBridge", RegisterWebsitePreferenceBridge}, |
| 419 {"WebsiteSettingsPopupAndroid", | 420 {"WebsiteSettingsPopupAndroid", |
| 420 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid}, | 421 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid}, |
| 421 #if BUILDFLAG(ENABLE_PRINTING) && !BUILDFLAG(ENABLE_PRINT_PREVIEW) | 422 #if BUILDFLAG(ENABLE_PRINTING) && !BUILDFLAG(ENABLE_PRINT_PREVIEW) |
| 422 {"PrintingContext", | 423 {"PrintingContext", |
| 423 printing::PrintingContextAndroid::RegisterPrintingContext}, | 424 printing::PrintingContextAndroid::RegisterPrintingContext}, |
| 424 #endif | 425 #endif |
| 425 }; | 426 }; |
| 426 | 427 |
| 427 bool RegisterBrowserJNI(JNIEnv* env) { | 428 bool RegisterBrowserJNI(JNIEnv* env) { |
| 428 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); | 429 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); |
| 429 return RegisterNativeMethods(env, kChromeRegisteredMethods, | 430 return RegisterNativeMethods(env, kChromeRegisteredMethods, |
| 430 arraysize(kChromeRegisteredMethods)); | 431 arraysize(kChromeRegisteredMethods)); |
| 431 } | 432 } |
| 432 | 433 |
| 433 } // namespace android | 434 } // namespace android |
| OLD | NEW |