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

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

Issue 12374020: Add Android support for SSL client authentication to the browser layer. (Closed) Base URL: http://git.chromium.org/chromium/src.git@client-cert-test
Patch Set: reorder Java sources properly in chrome_browser.gypi Created 7 years, 9 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 "chrome/browser/android/chrome_web_contents_delegate_android.h" 9 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
10 #include "chrome/browser/android/content_view_util.h" 10 #include "chrome/browser/android/content_view_util.h"
11 #include "chrome/browser/android/dev_tools_server.h" 11 #include "chrome/browser/android/dev_tools_server.h"
12 #include "chrome/browser/android/intent_helper.h" 12 #include "chrome/browser/android/intent_helper.h"
13 #include "chrome/browser/android/process_utils.h" 13 #include "chrome/browser/android/process_utils.h"
14 #include "chrome/browser/android/provider/chrome_browser_provider.h" 14 #include "chrome/browser/android/provider/chrome_browser_provider.h"
15 #include "chrome/browser/autofill/android/personal_data_manager_android.h" 15 #include "chrome/browser/autofill/android/personal_data_manager_android.h"
16 #include "chrome/browser/history/android/sqlite_cursor.h" 16 #include "chrome/browser/history/android/sqlite_cursor.h"
17 #include "chrome/browser/lifetime/application_lifetime_android.h" 17 #include "chrome/browser/lifetime/application_lifetime_android.h"
18 #include "chrome/browser/search_engines/template_url_service_android.h" 18 #include "chrome/browser/search_engines/template_url_service_android.h"
19 #include "chrome/browser/sync/profile_sync_service_android.h" 19 #include "chrome/browser/sync/profile_sync_service_android.h"
20 #include "chrome/browser/ui/android/autofill/autofill_dialog_view_android.h" 20 #include "chrome/browser/ui/android/autofill/autofill_dialog_view_android.h"
21 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h" 21 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h"
22 #include "chrome/browser/ui/android/chrome_http_auth_handler.h" 22 #include "chrome/browser/ui/android/chrome_http_auth_handler.h"
23 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" 23 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"
24 #include "chrome/browser/ui/android/navigation_popup.h" 24 #include "chrome/browser/ui/android/navigation_popup.h"
25 #include "chrome/browser/ui/android/ssl_client_certificate_request.h"
25 #include "chrome/browser/ui/android/website_settings_popup_android.h" 26 #include "chrome/browser/ui/android/website_settings_popup_android.h"
26 #include "components/navigation_interception/component_jni_registrar.h" 27 #include "components/navigation_interception/component_jni_registrar.h"
27 #include "components/web_contents_delegate_android/component_jni_registrar.h" 28 #include "components/web_contents_delegate_android/component_jni_registrar.h"
28 29
29 bool RegisterCertificateViewer(JNIEnv* env); 30 bool RegisterCertificateViewer(JNIEnv* env);
30 31
31 namespace chrome { 32 namespace chrome {
32 namespace android { 33 namespace android {
33 34
34 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { 35 static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
(...skipping 18 matching lines...) Expand all
53 { "DevToolsServer", RegisterDevToolsServer }, 54 { "DevToolsServer", RegisterDevToolsServer },
54 { "IntentHelper", RegisterIntentHelper }, 55 { "IntentHelper", RegisterIntentHelper },
55 { "JavascriptAppModalDialog", 56 { "JavascriptAppModalDialog",
56 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog }, 57 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog },
57 { "NavigationPopup", NavigationPopup::RegisterNavigationPopup }, 58 { "NavigationPopup", NavigationPopup::RegisterNavigationPopup },
58 { "PersonalDataManagerAndroid", 59 { "PersonalDataManagerAndroid",
59 PersonalDataManagerAndroid::Register}, 60 PersonalDataManagerAndroid::Register},
60 { "ProcessUtils", RegisterProcessUtils }, 61 { "ProcessUtils", RegisterProcessUtils },
61 { "ProfileSyncService", ProfileSyncServiceAndroid::Register }, 62 { "ProfileSyncService", ProfileSyncServiceAndroid::Register },
62 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor }, 63 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor },
64 { "SSLClientCertificateRequest",
65 RegisterSSLClientCertificateRequestAndroid },
63 { "TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register }, 66 { "TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register },
64 { "WebsiteSettingsPopupAndroid", 67 { "WebsiteSettingsPopupAndroid",
65 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid }, 68 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid },
66 }; 69 };
67 70
68 bool RegisterJni(JNIEnv* env) { 71 bool RegisterJni(JNIEnv* env) {
69 return RegisterNativeMethods(env, kChromeRegisteredMethods, 72 return RegisterNativeMethods(env, kChromeRegisteredMethods,
70 arraysize(kChromeRegisteredMethods)); 73 arraysize(kChromeRegisteredMethods));
71 } 74 }
72 75
73 } // namespace android 76 } // namespace android
74 } // namespace chrome 77 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698