Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(392)

Side by Side Diff: chrome/browser/android/chrome_jni_registrar.cc

Issue 878413008: Remove WebsiteSettingsPopupLegacy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 #include "chrome/browser/ui/android/infobars/infobar_container_android.h" 86 #include "chrome/browser/ui/android/infobars/infobar_container_android.h"
87 #include "chrome/browser/ui/android/infobars/translate_infobar.h" 87 #include "chrome/browser/ui/android/infobars/translate_infobar.h"
88 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" 88 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"
89 #include "chrome/browser/ui/android/navigation_popup.h" 89 #include "chrome/browser/ui/android/navigation_popup.h"
90 #include "chrome/browser/ui/android/omnibox/omnibox_url_emphasizer.h" 90 #include "chrome/browser/ui/android/omnibox/omnibox_url_emphasizer.h"
91 #include "chrome/browser/ui/android/omnibox/omnibox_view_util.h" 91 #include "chrome/browser/ui/android/omnibox/omnibox_view_util.h"
92 #include "chrome/browser/ui/android/ssl_client_certificate_request.h" 92 #include "chrome/browser/ui/android/ssl_client_certificate_request.h"
93 #include "chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h" 93 #include "chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h"
94 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h" 94 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h"
95 #include "chrome/browser/ui/android/website_settings_popup_android.h" 95 #include "chrome/browser/ui/android/website_settings_popup_android.h"
96 #include "chrome/browser/ui/android/website_settings_popup_legacy_android.h"
97 #include "components/bookmarks/common/android/component_jni_registrar.h" 96 #include "components/bookmarks/common/android/component_jni_registrar.h"
98 #include "components/dom_distiller/android/component_jni_registrar.h" 97 #include "components/dom_distiller/android/component_jni_registrar.h"
99 #include "components/gcm_driver/android/component_jni_registrar.h" 98 #include "components/gcm_driver/android/component_jni_registrar.h"
100 #include "components/invalidation/android/component_jni_registrar.h" 99 #include "components/invalidation/android/component_jni_registrar.h"
101 #include "components/navigation_interception/component_jni_registrar.h" 100 #include "components/navigation_interception/component_jni_registrar.h"
102 #include "components/variations/android/component_jni_registrar.h" 101 #include "components/variations/android/component_jni_registrar.h"
103 #include "components/web_contents_delegate_android/component_jni_registrar.h" 102 #include "components/web_contents_delegate_android/component_jni_registrar.h"
104 103
105 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW) 104 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW)
106 #include "printing/printing_context_android.h" 105 #include "printing/printing_context_android.h"
107 #endif 106 #endif
108 107
109 bool RegisterCertificateViewer(JNIEnv* env);
110
111 namespace chrome { 108 namespace chrome {
112 namespace android { 109 namespace android {
113 110
114 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { 111 static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
115 // Register JNI for components we depend on. 112 // Register JNI for components we depend on.
116 {"AppMenuDragHelper", RegisterAppMenuDragHelper}, 113 {"AppMenuDragHelper", RegisterAppMenuDragHelper},
117 {"Bookmarks", bookmarks::android::RegisterBookmarks}, 114 {"Bookmarks", bookmarks::android::RegisterBookmarks},
118 {"DomDistiller", dom_distiller::android::RegisterDomDistiller}, 115 {"DomDistiller", dom_distiller::android::RegisterDomDistiller},
119 {"ChromeDownloadDelegate", RegisterChromeDownloadDeleagte}, 116 {"ChromeDownloadDelegate", RegisterChromeDownloadDeleagte},
120 {"GCMDriver", gcm::android::RegisterGCMDriverJni}, 117 {"GCMDriver", gcm::android::RegisterGCMDriverJni},
(...skipping 16 matching lines...) Expand all
137 autofill::AutofillDialogControllerAndroid:: 134 autofill::AutofillDialogControllerAndroid::
138 RegisterAutofillDialogControllerAndroid}, 135 RegisterAutofillDialogControllerAndroid},
139 {"AutofillDialogResult", 136 {"AutofillDialogResult",
140 autofill::AutofillDialogResult::RegisterAutofillDialogResult}, 137 autofill::AutofillDialogResult::RegisterAutofillDialogResult},
141 {"AutofillLoggerAndroid", autofill::AutofillLoggerAndroid::Register}, 138 {"AutofillLoggerAndroid", autofill::AutofillLoggerAndroid::Register},
142 {"AutofillPopup", 139 {"AutofillPopup",
143 autofill::AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid}, 140 autofill::AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid},
144 {"AutofillProfileBridge", autofill::RegisterAutofillProfileBridge}, 141 {"AutofillProfileBridge", autofill::RegisterAutofillProfileBridge},
145 {"BookmarksBridge", BookmarksBridge::RegisterBookmarksBridge}, 142 {"BookmarksBridge", BookmarksBridge::RegisterBookmarksBridge},
146 {"CardUnmaskPrompt", autofill::CardUnmaskPromptViewAndroid::Register}, 143 {"CardUnmaskPrompt", autofill::CardUnmaskPromptViewAndroid::Register},
147 {"CertificateViewer", RegisterCertificateViewer},
148 {"ChildAccountFeedbackReporter", RegisterChildAccountFeedbackReporter}, 144 {"ChildAccountFeedbackReporter", RegisterChildAccountFeedbackReporter},
149 {"ChildAccountService", RegisterChildAccountService}, 145 {"ChildAccountService", RegisterChildAccountService},
150 {"ChromeBrowserProvider", 146 {"ChromeBrowserProvider",
151 ChromeBrowserProvider::RegisterChromeBrowserProvider}, 147 ChromeBrowserProvider::RegisterChromeBrowserProvider},
152 {"ChromeHttpAuthHandler", 148 {"ChromeHttpAuthHandler",
153 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler}, 149 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler},
154 {"ChromeWebContentsDelegateAndroid", 150 {"ChromeWebContentsDelegateAndroid",
155 RegisterChromeWebContentsDelegateAndroid}, 151 RegisterChromeWebContentsDelegateAndroid},
156 {"ChromiumApplication", ChromiumApplication::RegisterBindings}, 152 {"ChromiumApplication", ChromiumApplication::RegisterBindings},
157 {"ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate}, 153 {"ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate},
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid}, 222 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid},
227 {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate}, 223 {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate},
228 {"TtsPlatformImpl", TtsPlatformImplAndroid::Register}, 224 {"TtsPlatformImpl", TtsPlatformImplAndroid::Register},
229 {"UmaBridge", RegisterUmaBridge}, 225 {"UmaBridge", RegisterUmaBridge},
230 {"UrlUtilities", RegisterUrlUtilities}, 226 {"UrlUtilities", RegisterUrlUtilities},
231 {"Variations", variations::android::RegisterVariations}, 227 {"Variations", variations::android::RegisterVariations},
232 {"VoiceSearchTabHelper", RegisterVoiceSearchTabHelper}, 228 {"VoiceSearchTabHelper", RegisterVoiceSearchTabHelper},
233 {"WebsitePreferenceBridge", RegisterWebsitePreferenceBridge}, 229 {"WebsitePreferenceBridge", RegisterWebsitePreferenceBridge},
234 {"WebsiteSettingsPopupAndroid", 230 {"WebsiteSettingsPopupAndroid",
235 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid}, 231 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid},
236 {"WebsiteSettingsPopupLegacyAndroid",
237 WebsiteSettingsPopupLegacyAndroid::
238 RegisterWebsiteSettingsPopupLegacyAndroid},
239 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW) 232 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW)
240 {"PrintingContext", 233 {"PrintingContext",
241 printing::PrintingContextAndroid::RegisterPrintingContext}, 234 printing::PrintingContextAndroid::RegisterPrintingContext},
242 #endif 235 #endif
243 }; 236 };
244 237
245 bool RegisterJni(JNIEnv* env) { 238 bool RegisterJni(JNIEnv* env) {
246 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 239 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
247 return RegisterNativeMethods(env, kChromeRegisteredMethods, 240 return RegisterNativeMethods(env, kChromeRegisteredMethods,
248 arraysize(kChromeRegisteredMethods)); 241 arraysize(kChromeRegisteredMethods));
249 } 242 }
250 243
251 } // namespace android 244 } // namespace android
252 } // namespace chrome 245 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698