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

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

Issue 1124383007: Revert of Revert of Move SecurityLevel into a class of its own (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 #include "chrome/browser/media/android/remote/record_cast_action.h" 71 #include "chrome/browser/media/android/remote/record_cast_action.h"
72 #include "chrome/browser/media/android/remote/remote_media_player_bridge.h" 72 #include "chrome/browser/media/android/remote/remote_media_player_bridge.h"
73 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" 73 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h"
74 #include "chrome/browser/notifications/notification_ui_manager_android.h" 74 #include "chrome/browser/notifications/notification_ui_manager_android.h"
75 #include "chrome/browser/password_manager/credential_android.h" 75 #include "chrome/browser/password_manager/credential_android.h"
76 #include "chrome/browser/prerender/external_prerender_handler_android.h" 76 #include "chrome/browser/prerender/external_prerender_handler_android.h"
77 #include "chrome/browser/profiles/profile_android.h" 77 #include "chrome/browser/profiles/profile_android.h"
78 #include "chrome/browser/search_engines/template_url_service_android.h" 78 #include "chrome/browser/search_engines/template_url_service_android.h"
79 #include "chrome/browser/signin/android_profile_oauth2_token_service.h" 79 #include "chrome/browser/signin/android_profile_oauth2_token_service.h"
80 #include "chrome/browser/speech/tts_android.h" 80 #include "chrome/browser/speech/tts_android.h"
81 #include "chrome/browser/ssl/connection_security_helper_android.h"
81 #include "chrome/browser/supervised_user/child_accounts/child_account_feedback_r eporter_android.h" 82 #include "chrome/browser/supervised_user/child_accounts/child_account_feedback_r eporter_android.h"
82 #include "chrome/browser/supervised_user/child_accounts/child_account_service_an droid.h" 83 #include "chrome/browser/supervised_user/child_accounts/child_account_service_an droid.h"
83 #include "chrome/browser/sync/profile_sync_service_android.h" 84 #include "chrome/browser/sync/profile_sync_service_android.h"
84 #include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android. h" 85 #include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android. h"
85 #include "chrome/browser/ui/android/autofill/autofill_dialog_result.h" 86 #include "chrome/browser/ui/android/autofill/autofill_dialog_result.h"
86 #include "chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.h" 87 #include "chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.h"
87 #include "chrome/browser/ui/android/autofill/autofill_logger_android.h" 88 #include "chrome/browser/ui/android/autofill/autofill_logger_android.h"
88 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h" 89 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h"
89 #include "chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.h" 90 #include "chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.h"
90 #include "chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h" 91 #include "chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 {"ChromeBrowserProvider", 173 {"ChromeBrowserProvider",
173 ChromeBrowserProvider::RegisterChromeBrowserProvider}, 174 ChromeBrowserProvider::RegisterChromeBrowserProvider},
174 {"ChromeHttpAuthHandler", 175 {"ChromeHttpAuthHandler",
175 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler}, 176 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler},
176 {"ChromeWebContentsDelegateAndroid", 177 {"ChromeWebContentsDelegateAndroid",
177 RegisterChromeWebContentsDelegateAndroid}, 178 RegisterChromeWebContentsDelegateAndroid},
178 {"ChromiumApplication", ChromiumApplication::RegisterBindings}, 179 {"ChromiumApplication", ChromiumApplication::RegisterBindings},
179 {"ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate}, 180 {"ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate},
180 {"ConnectionInfoPopupAndroid", 181 {"ConnectionInfoPopupAndroid",
181 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid}, 182 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid},
183 {"ConnectionSecurityHelper", RegisterConnectionSecurityHelperAndroid},
182 {"ContentViewUtil", RegisterContentViewUtil}, 184 {"ContentViewUtil", RegisterContentViewUtil},
183 {"ContextMenuHelper", RegisterContextMenuHelper}, 185 {"ContextMenuHelper", RegisterContextMenuHelper},
184 {"CookiesFetcher", RegisterCookiesFetcher}, 186 {"CookiesFetcher", RegisterCookiesFetcher},
185 {"Credential", RegisterCredential}, 187 {"Credential", RegisterCredential},
186 {"CreditCardScanner", autofill::CreditCardScannerViewAndroid::Register}, 188 {"CreditCardScanner", autofill::CreditCardScannerViewAndroid::Register},
187 {"DataReductionProxyInfoBarDelegate", DataReductionProxyInfoBar::Register}, 189 {"DataReductionProxyInfoBarDelegate", DataReductionProxyInfoBar::Register},
188 {"DataReductionProxySettings", DataReductionProxySettingsAndroid::Register}, 190 {"DataReductionProxySettings", DataReductionProxySettingsAndroid::Register},
189 {"DevToolsServer", RegisterDevToolsServer}, 191 {"DevToolsServer", RegisterDevToolsServer},
190 {"DomDistillerServiceFactory", 192 {"DomDistillerServiceFactory",
191 dom_distiller::android::DomDistillerServiceFactoryAndroid::Register}, 193 dom_distiller::android::DomDistillerServiceFactoryAndroid::Register},
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 }; 283 };
282 284
283 bool RegisterBrowserJNI(JNIEnv* env) { 285 bool RegisterBrowserJNI(JNIEnv* env) {
284 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 286 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
285 return RegisterNativeMethods(env, kChromeRegisteredMethods, 287 return RegisterNativeMethods(env, kChromeRegisteredMethods,
286 arraysize(kChromeRegisteredMethods)); 288 arraysize(kChromeRegisteredMethods));
287 } 289 }
288 290
289 } // namespace android 291 } // namespace android
290 } // namespace chrome 292 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698