| 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/android/accessibility/font_size_prefs_android.h" | 10 #include "chrome/browser/android/accessibility/font_size_prefs_android.h" | 
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 124 #include "chrome/browser/ui/android/ssl_client_certificate_request.h" | 124 #include "chrome/browser/ui/android/ssl_client_certificate_request.h" | 
| 125 #include "chrome/browser/ui/android/tab_model/single_tab_model.h" | 125 #include "chrome/browser/ui/android/tab_model/single_tab_model.h" | 
| 126 #include "chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h" | 126 #include "chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h" | 
| 127 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h" | 127 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h" | 
| 128 #include "chrome/browser/ui/android/website_settings_popup_android.h" | 128 #include "chrome/browser/ui/android/website_settings_popup_android.h" | 
| 129 #include "components/bookmarks/common/android/component_jni_registrar.h" | 129 #include "components/bookmarks/common/android/component_jni_registrar.h" | 
| 130 #include "components/dom_distiller/android/component_jni_registrar.h" | 130 #include "components/dom_distiller/android/component_jni_registrar.h" | 
| 131 #include "components/gcm_driver/android/component_jni_registrar.h" | 131 #include "components/gcm_driver/android/component_jni_registrar.h" | 
| 132 #include "components/invalidation/impl/android/component_jni_registrar.h" | 132 #include "components/invalidation/impl/android/component_jni_registrar.h" | 
| 133 #include "components/navigation_interception/component_jni_registrar.h" | 133 #include "components/navigation_interception/component_jni_registrar.h" | 
|  | 134 #include "components/policy/core/browser/android/component_jni_registrar.h" | 
| 134 #include "components/service_tab_launcher/component_jni_registrar.h" | 135 #include "components/service_tab_launcher/component_jni_registrar.h" | 
| 135 #include "components/variations/android/component_jni_registrar.h" | 136 #include "components/variations/android/component_jni_registrar.h" | 
| 136 #include "components/web_contents_delegate_android/component_jni_registrar.h" | 137 #include "components/web_contents_delegate_android/component_jni_registrar.h" | 
| 137 | 138 | 
| 138 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW) | 139 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW) | 
| 139 #include "printing/printing_context_android.h" | 140 #include "printing/printing_context_android.h" | 
| 140 #endif | 141 #endif | 
| 141 | 142 | 
| 142 namespace chrome { | 143 namespace chrome { | 
| 143 namespace android { | 144 namespace android { | 
| 144 | 145 | 
| 145 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { | 146 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { | 
| 146     // Register JNI for components we depend on. | 147     // Register JNI for components we depend on. | 
| 147     {"AppMenuDragHelper", RegisterAppMenuDragHelper}, | 148     {"AppMenuDragHelper", RegisterAppMenuDragHelper}, | 
| 148     {"Bookmarks", bookmarks::android::RegisterBookmarks}, | 149     {"Bookmarks", bookmarks::android::RegisterBookmarks}, | 
| 149     {"DomDistiller", dom_distiller::android::RegisterDomDistiller}, | 150     {"DomDistiller", dom_distiller::android::RegisterDomDistiller}, | 
| 150     {"ChromeDownloadDelegate", RegisterChromeDownloadDelegate}, | 151     {"ChromeDownloadDelegate", RegisterChromeDownloadDelegate}, | 
| 151     {"GCMDriver", gcm::android::RegisterGCMDriverJni}, | 152     {"GCMDriver", gcm::android::RegisterGCMDriverJni}, | 
| 152     {"Invalidation", invalidation::android::RegisterInvalidationJni}, | 153     {"Invalidation", invalidation::android::RegisterInvalidationJni}, | 
| 153     {"NavigationInterception", | 154     {"NavigationInterception", | 
| 154      navigation_interception::RegisterNavigationInterceptionJni}, | 155      navigation_interception::RegisterNavigationInterceptionJni}, | 
|  | 156     {"Policy", policy::android::RegisterPolicy}, | 
| 155     {"WebContentsDelegateAndroid", | 157     {"WebContentsDelegateAndroid", | 
| 156      web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni}, | 158      web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni}, | 
| 157     // Register JNI for chrome classes. | 159     // Register JNI for chrome classes. | 
| 158     {"AccessibilityUtils", AccessibilityUtil::Register}, | 160     {"AccessibilityUtils", AccessibilityUtil::Register}, | 
| 159     {"AccountChooserInfoBar", RegisterAccountChooserInfoBar}, | 161     {"AccountChooserInfoBar", RegisterAccountChooserInfoBar}, | 
| 160     {"AccountManagementScreenHelper", AccountManagementScreenHelper::Register}, | 162     {"AccountManagementScreenHelper", AccountManagementScreenHelper::Register}, | 
| 161     {"AnswersImageBridge", RegisterAnswersImageBridge}, | 163     {"AnswersImageBridge", RegisterAnswersImageBridge}, | 
| 162     {"AppBannerInfoBarAndroid", RegisterAppBannerInfoBarAndroid}, | 164     {"AppBannerInfoBarAndroid", RegisterAppBannerInfoBarAndroid}, | 
| 163     {"AppBannerInfoBarDelegateAndroid", | 165     {"AppBannerInfoBarDelegateAndroid", | 
| 164      banners::RegisterAppBannerInfoBarDelegateAndroid}, | 166      banners::RegisterAppBannerInfoBarDelegateAndroid}, | 
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 310 }; | 312 }; | 
| 311 | 313 | 
| 312 bool RegisterBrowserJNI(JNIEnv* env) { | 314 bool RegisterBrowserJNI(JNIEnv* env) { | 
| 313   TRACE_EVENT0("startup", "chrome_android::RegisterJni"); | 315   TRACE_EVENT0("startup", "chrome_android::RegisterJni"); | 
| 314   return RegisterNativeMethods(env, kChromeRegisteredMethods, | 316   return RegisterNativeMethods(env, kChromeRegisteredMethods, | 
| 315                                arraysize(kChromeRegisteredMethods)); | 317                                arraysize(kChromeRegisteredMethods)); | 
| 316 } | 318 } | 
| 317 | 319 | 
| 318 }  // namespace android | 320 }  // namespace android | 
| 319 }  // namespace chrome | 321 }  // namespace chrome | 
| OLD | NEW | 
|---|