| 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" | 
|   11 #include "chrome/browser/after_startup_task_utils_android.h" |   11 #include "chrome/browser/after_startup_task_utils_android.h" | 
|   12 #include "chrome/browser/android/accessibility/font_size_prefs_android.h" |   12 #include "chrome/browser/android/accessibility/font_size_prefs_android.h" | 
|   13 #include "chrome/browser/android/appmenu/app_menu_drag_helper.h" |   13 #include "chrome/browser/android/appmenu/app_menu_drag_helper.h" | 
|   14 #include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h" |   14 #include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h" | 
|   15 #include "chrome/browser/android/banners/app_banner_manager_android.h" |   15 #include "chrome/browser/android/banners/app_banner_manager_android.h" | 
|   16 #include "chrome/browser/android/bookmarks/bookmark_bridge.h" |   16 #include "chrome/browser/android/bookmarks/bookmark_bridge.h" | 
|   17 #include "chrome/browser/android/bookmarks/partner_bookmarks_reader.h" |   17 #include "chrome/browser/android/bookmarks/partner_bookmarks_reader.h" | 
|   18 #include "chrome/browser/android/bottombar/overlay_panel_content.h" |   18 #include "chrome/browser/android/bottombar/overlay_panel_content.h" | 
|   19 #include "chrome/browser/android/browsing_data/browsing_data_counter_bridge.h" |   19 #include "chrome/browser/android/browsing_data/browsing_data_counter_bridge.h" | 
|   20 #include "chrome/browser/android/browsing_data/url_filter_bridge.h" |   20 #include "chrome/browser/android/browsing_data/url_filter_bridge.h" | 
|   21 #include "chrome/browser/android/chrome_application.h" |   21 #include "chrome/browser/android/chrome_application.h" | 
|   22 #include "chrome/browser/android/chrome_backup_agent.h" |   22 #include "chrome/browser/android/chrome_backup_agent.h" | 
|   23 #include "chrome/browser/android/chrome_feature_list.h" |   23 #include "chrome/browser/android/chrome_feature_list.h" | 
|   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/resources/resource_factory.h" | 
|   26 #include "chrome/browser/android/compositor/scene_layer/contextual_search_scene_
     layer.h" |   27 #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" |   28 #include "chrome/browser/android/compositor/scene_layer/reader_mode_scene_layer.
     h" | 
|   28 #include "chrome/browser/android/compositor/scene_layer/scene_layer.h" |   29 #include "chrome/browser/android/compositor/scene_layer/scene_layer.h" | 
|   29 #include "chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h
     " |   30 #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" |   31 #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" |   32 #include "chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.h" | 
|   32 #include "chrome/browser/android/compositor/scene_layer/toolbar_scene_layer.h" |   33 #include "chrome/browser/android/compositor/scene_layer/toolbar_scene_layer.h" | 
|   33 #include "chrome/browser/android/compositor/tab_content_manager.h" |   34 #include "chrome/browser/android/compositor/tab_content_manager.h" | 
|   34 #include "chrome/browser/android/contextualsearch/contextual_search_context.h" |   35 #include "chrome/browser/android/contextualsearch/contextual_search_context.h" | 
|   35 #include "chrome/browser/android/contextualsearch/contextual_search_manager.h" |   36 #include "chrome/browser/android/contextualsearch/contextual_search_manager.h" | 
| (...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  368     {"PrefServiceBridge", PrefServiceBridge::RegisterPrefServiceBridge}, |  369     {"PrefServiceBridge", PrefServiceBridge::RegisterPrefServiceBridge}, | 
|  369     {"ProfileAndroid", ProfileAndroid::RegisterProfileAndroid}, |  370     {"ProfileAndroid", ProfileAndroid::RegisterProfileAndroid}, | 
|  370     {"ProfileDownloader", RegisterProfileDownloader}, |  371     {"ProfileDownloader", RegisterProfileDownloader}, | 
|  371     {"ProfileSyncService", ProfileSyncServiceAndroid::Register}, |  372     {"ProfileSyncService", ProfileSyncServiceAndroid::Register}, | 
|  372     {"RapporServiceBridge", rappor::RegisterRapporServiceBridge}, |  373     {"RapporServiceBridge", rappor::RegisterRapporServiceBridge}, | 
|  373     {"RecentlyClosedBridge", RecentlyClosedTabsBridge::Register}, |  374     {"RecentlyClosedBridge", RecentlyClosedTabsBridge::Register}, | 
|  374     {"RecordCastAction", remote_media::RegisterRecordCastAction}, |  375     {"RecordCastAction", remote_media::RegisterRecordCastAction}, | 
|  375     {"ReaderModeSceneLayer", RegisterReaderModeSceneLayer}, |  376     {"ReaderModeSceneLayer", RegisterReaderModeSceneLayer}, | 
|  376     {"RemoteMediaPlayerBridge", |  377     {"RemoteMediaPlayerBridge", | 
|  377      remote_media::RemoteMediaPlayerBridge::RegisterRemoteMediaPlayerBridge}, |  378      remote_media::RemoteMediaPlayerBridge::RegisterRemoteMediaPlayerBridge}, | 
 |  379     {"ResourceFactory", RegisterResourceFactory}, | 
|  378     {"ResourcePrefetchPredictor", |  380     {"ResourcePrefetchPredictor", | 
|  379      predictors::RegisterResourcePrefetchPredictor}, |  381      predictors::RegisterResourcePrefetchPredictor}, | 
|  380     {"RevenueStats", chrome::android::RegisterRevenueStats}, |  382     {"RevenueStats", chrome::android::RegisterRevenueStats}, | 
|  381     {"SafeBrowsing", safe_browsing::android::RegisterBrowserJNI}, |  383     {"SafeBrowsing", safe_browsing::android::RegisterBrowserJNI}, | 
|  382     {"SceneLayer", RegisterSceneLayer}, |  384     {"SceneLayer", RegisterSceneLayer}, | 
|  383     {"ScreenshotTask", chrome::android::RegisterScreenshotTask}, |  385     {"ScreenshotTask", chrome::android::RegisterScreenshotTask}, | 
|  384     {"ServiceTabLauncher", ServiceTabLauncher::Register}, |  386     {"ServiceTabLauncher", ServiceTabLauncher::Register}, | 
|  385     {"SearchGeolocationDisclosureTabHelper", |  387     {"SearchGeolocationDisclosureTabHelper", | 
|  386      SearchGeolocationDisclosureTabHelper::Register}, |  388      SearchGeolocationDisclosureTabHelper::Register}, | 
|  387     {"ServiceWorkerPaymentAppBridge", RegisterServiceWorkerPaymentAppBridge}, |  389     {"ServiceWorkerPaymentAppBridge", RegisterServiceWorkerPaymentAppBridge}, | 
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  443 #endif |  445 #endif | 
|  444 }; |  446 }; | 
|  445  |  447  | 
|  446 bool RegisterBrowserJNI(JNIEnv* env) { |  448 bool RegisterBrowserJNI(JNIEnv* env) { | 
|  447   TRACE_EVENT0("startup", "chrome_android::RegisterJni"); |  449   TRACE_EVENT0("startup", "chrome_android::RegisterJni"); | 
|  448   return RegisterNativeMethods(env, kChromeRegisteredMethods, |  450   return RegisterNativeMethods(env, kChromeRegisteredMethods, | 
|  449                                arraysize(kChromeRegisteredMethods)); |  451                                arraysize(kChromeRegisteredMethods)); | 
|  450 } |  452 } | 
|  451  |  453  | 
|  452 }  // namespace android |  454 }  // namespace android | 
| OLD | NEW |