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/debug/trace_event.h" | 9 #include "base/debug/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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 #include "chrome/browser/ui/android/infobars/infobar_android.h" | 65 #include "chrome/browser/ui/android/infobars/infobar_android.h" |
66 #include "chrome/browser/ui/android/infobars/infobar_container_android.h" | 66 #include "chrome/browser/ui/android/infobars/infobar_container_android.h" |
67 #include "chrome/browser/ui/android/infobars/translate_infobar.h" | 67 #include "chrome/browser/ui/android/infobars/translate_infobar.h" |
68 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" | 68 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" |
69 #include "chrome/browser/ui/android/navigation_popup.h" | 69 #include "chrome/browser/ui/android/navigation_popup.h" |
70 #include "chrome/browser/ui/android/omnibox/omnibox_view_util.h" | 70 #include "chrome/browser/ui/android/omnibox/omnibox_view_util.h" |
71 #include "chrome/browser/ui/android/ssl_client_certificate_request.h" | 71 #include "chrome/browser/ui/android/ssl_client_certificate_request.h" |
72 #include "chrome/browser/ui/android/tab_model/tab_model_base.h" | 72 #include "chrome/browser/ui/android/tab_model/tab_model_base.h" |
73 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h" | 73 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h" |
74 #include "chrome/browser/ui/android/website_settings_popup_android.h" | 74 #include "chrome/browser/ui/android/website_settings_popup_android.h" |
| 75 #include "chrome/browser/ui/android/website_settings_popup_legacy_android.h" |
75 #include "components/bookmarks/common/android/component_jni_registrar.h" | 76 #include "components/bookmarks/common/android/component_jni_registrar.h" |
76 #include "components/dom_distiller/android/component_jni_registrar.h" | 77 #include "components/dom_distiller/android/component_jni_registrar.h" |
77 #include "components/gcm_driver/android/component_jni_registrar.h" | 78 #include "components/gcm_driver/android/component_jni_registrar.h" |
78 #include "components/invalidation/android/component_jni_registrar.h" | 79 #include "components/invalidation/android/component_jni_registrar.h" |
79 #include "components/navigation_interception/component_jni_registrar.h" | 80 #include "components/navigation_interception/component_jni_registrar.h" |
80 #include "components/variations/android/component_jni_registrar.h" | 81 #include "components/variations/android/component_jni_registrar.h" |
81 #include "components/web_contents_delegate_android/component_jni_registrar.h" | 82 #include "components/web_contents_delegate_android/component_jni_registrar.h" |
82 | 83 |
83 #if defined(ENABLE_PRINTING) && !defined(ENABLE_FULL_PRINTING) | 84 #if defined(ENABLE_PRINTING) && !defined(ENABLE_FULL_PRINTING) |
84 #include "printing/printing_context_android.h" | 85 #include "printing/printing_context_android.h" |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
181 { "TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register }, | 182 { "TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register }, |
182 { "ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid }, | 183 { "ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid }, |
183 { "TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate }, | 184 { "TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate }, |
184 { "TtsPlatformImpl", TtsPlatformImplAndroid::Register }, | 185 { "TtsPlatformImpl", TtsPlatformImplAndroid::Register }, |
185 { "UmaBridge", RegisterUmaBridge }, | 186 { "UmaBridge", RegisterUmaBridge }, |
186 { "UrlUtilities", RegisterUrlUtilities }, | 187 { "UrlUtilities", RegisterUrlUtilities }, |
187 { "Variations", variations::android::RegisterVariations }, | 188 { "Variations", variations::android::RegisterVariations }, |
188 { "VoiceSearchTabHelper", RegisterVoiceSearchTabHelper }, | 189 { "VoiceSearchTabHelper", RegisterVoiceSearchTabHelper }, |
189 { "WebsiteSettingsPopupAndroid", | 190 { "WebsiteSettingsPopupAndroid", |
190 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid }, | 191 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid }, |
| 192 { "WebsiteSettingsPopupLegacyAndroid", |
| 193 WebsiteSettingsPopupLegacyAndroid:: |
| 194 RegisterWebsiteSettingsPopupLegacyAndroid }, |
191 #if defined(ENABLE_PRINTING) && !defined(ENABLE_FULL_PRINTING) | 195 #if defined(ENABLE_PRINTING) && !defined(ENABLE_FULL_PRINTING) |
192 { "PrintingContext", | 196 { "PrintingContext", |
193 printing::PrintingContextAndroid::RegisterPrintingContext}, | 197 printing::PrintingContextAndroid::RegisterPrintingContext}, |
194 #endif | 198 #endif |
195 }; | 199 }; |
196 | 200 |
197 bool RegisterJni(JNIEnv* env) { | 201 bool RegisterJni(JNIEnv* env) { |
198 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); | 202 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); |
199 return RegisterNativeMethods(env, kChromeRegisteredMethods, | 203 return RegisterNativeMethods(env, kChromeRegisteredMethods, |
200 arraysize(kChromeRegisteredMethods)); | 204 arraysize(kChromeRegisteredMethods)); |
201 } | 205 } |
202 | 206 |
203 } // namespace android | 207 } // namespace android |
204 } // namespace chrome | 208 } // namespace chrome |
OLD | NEW |