| 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 13 matching lines...) Expand all Loading... |
| 24 #include "chrome/browser/android/compositor/compositor_view.h" | 24 #include "chrome/browser/android/compositor/compositor_view.h" |
| 25 #include "chrome/browser/android/compositor/layer_title_cache.h" | 25 #include "chrome/browser/android/compositor/layer_title_cache.h" |
| 26 #include "chrome/browser/android/compositor/scene_layer/contextual_search_scene_
layer.h" | 26 #include "chrome/browser/android/compositor/scene_layer/contextual_search_scene_
layer.h" |
| 27 #include "chrome/browser/android/compositor/scene_layer/reader_mode_scene_layer.
h" | 27 #include "chrome/browser/android/compositor/scene_layer/reader_mode_scene_layer.
h" |
| 28 #include "chrome/browser/android/compositor/scene_layer/scene_layer.h" | 28 #include "chrome/browser/android/compositor/scene_layer/scene_layer.h" |
| 29 #include "chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h
" | 29 #include "chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h
" |
| 30 #include "chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.h" | 30 #include "chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.h" |
| 31 #include "chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.h" | 31 #include "chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.h" |
| 32 #include "chrome/browser/android/compositor/scene_layer/toolbar_scene_layer.h" | 32 #include "chrome/browser/android/compositor/scene_layer/toolbar_scene_layer.h" |
| 33 #include "chrome/browser/android/compositor/tab_content_manager.h" | 33 #include "chrome/browser/android/compositor/tab_content_manager.h" |
| 34 #include "chrome/browser/android/contextualsearch/contextual_search_context.h" |
| 34 #include "chrome/browser/android/contextualsearch/contextual_search_manager.h" | 35 #include "chrome/browser/android/contextualsearch/contextual_search_manager.h" |
| 35 #include "chrome/browser/android/contextualsearch/contextual_search_tab_helper.h
" | 36 #include "chrome/browser/android/contextualsearch/contextual_search_tab_helper.h
" |
| 36 #include "chrome/browser/android/contextualsearch/ctr_suppression.h" | 37 #include "chrome/browser/android/contextualsearch/ctr_suppression.h" |
| 37 #include "chrome/browser/android/cookies/cookies_fetcher.h" | 38 #include "chrome/browser/android/cookies/cookies_fetcher.h" |
| 38 #include "chrome/browser/android/data_usage/data_use_tab_ui_manager_android.h" | 39 #include "chrome/browser/android/data_usage/data_use_tab_ui_manager_android.h" |
| 39 #include "chrome/browser/android/data_usage/external_data_use_observer_bridge.h" | 40 #include "chrome/browser/android/data_usage/external_data_use_observer_bridge.h" |
| 40 #include "chrome/browser/android/devtools_server.h" | 41 #include "chrome/browser/android/devtools_server.h" |
| 41 #include "chrome/browser/android/document/document_web_contents_delegate.h" | 42 #include "chrome/browser/android/document/document_web_contents_delegate.h" |
| 42 #include "chrome/browser/android/dom_distiller/distiller_ui_handle_android.h" | 43 #include "chrome/browser/android/dom_distiller/distiller_ui_handle_android.h" |
| 43 #include "chrome/browser/android/download/chrome_download_delegate.h" | 44 #include "chrome/browser/android/download/chrome_download_delegate.h" |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 #endif | 261 #endif |
| 261 {"ChromeWebApkHost", ChromeWebApkHost::Register}, | 262 {"ChromeWebApkHost", ChromeWebApkHost::Register}, |
| 262 {"CompositorView", RegisterCompositorView}, | 263 {"CompositorView", RegisterCompositorView}, |
| 263 {"ConnectionInfoPopupAndroid", | 264 {"ConnectionInfoPopupAndroid", |
| 264 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid}, | 265 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid}, |
| 265 {"SecurityStateModel", RegisterSecurityStateModelAndroid}, | 266 {"SecurityStateModel", RegisterSecurityStateModelAndroid}, |
| 266 {"ConnectivityChecker", chrome::android::RegisterConnectivityChecker}, | 267 {"ConnectivityChecker", chrome::android::RegisterConnectivityChecker}, |
| 267 {"ContentSuggestionsNotificationHelper", | 268 {"ContentSuggestionsNotificationHelper", |
| 268 ntp_snippets::ContentSuggestionsNotificationHelper::Register}, | 269 ntp_snippets::ContentSuggestionsNotificationHelper::Register}, |
| 269 {"ContextMenuHelper", RegisterContextMenuHelper}, | 270 {"ContextMenuHelper", RegisterContextMenuHelper}, |
| 271 {"ContextualSearchContext", RegisterContextualSearchContext}, |
| 270 {"ContextualSearchManager", RegisterContextualSearchManager}, | 272 {"ContextualSearchManager", RegisterContextualSearchManager}, |
| 271 {"ContextualSearchSceneLayer", RegisterContextualSearchSceneLayer}, | 273 {"ContextualSearchSceneLayer", RegisterContextualSearchSceneLayer}, |
| 272 {"ContextualSearchTabHelper", RegisterContextualSearchTabHelper}, | 274 {"ContextualSearchTabHelper", RegisterContextualSearchTabHelper}, |
| 273 {"CookiesFetcher", RegisterCookiesFetcher}, | 275 {"CookiesFetcher", RegisterCookiesFetcher}, |
| 274 {"CreditCardScannerBridge", | 276 {"CreditCardScannerBridge", |
| 275 autofill::CreditCardScannerViewAndroid::Register}, | 277 autofill::CreditCardScannerViewAndroid::Register}, |
| 276 {"CtrSuppression", RegisterCtrSuppression}, | 278 {"CtrSuppression", RegisterCtrSuppression}, |
| 277 {"CurrencyFormatter", payments::CurrencyFormatterAndroid::Register}, | 279 {"CurrencyFormatter", payments::CurrencyFormatterAndroid::Register}, |
| 278 {"DataReductionPromoInfoBarDelegate", | 280 {"DataReductionPromoInfoBarDelegate", |
| 279 DataReductionPromoInfoBarDelegateAndroid::Register}, | 281 DataReductionPromoInfoBarDelegateAndroid::Register}, |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 434 #endif | 436 #endif |
| 435 }; | 437 }; |
| 436 | 438 |
| 437 bool RegisterBrowserJNI(JNIEnv* env) { | 439 bool RegisterBrowserJNI(JNIEnv* env) { |
| 438 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); | 440 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); |
| 439 return RegisterNativeMethods(env, kChromeRegisteredMethods, | 441 return RegisterNativeMethods(env, kChromeRegisteredMethods, |
| 440 arraysize(kChromeRegisteredMethods)); | 442 arraysize(kChromeRegisteredMethods)); |
| 441 } | 443 } |
| 442 | 444 |
| 443 } // namespace android | 445 } // namespace android |
| OLD | NEW |