| 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 "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/history/android/sqlite_cursor.h" | 15 #include "chrome/browser/history/android/sqlite_cursor.h" |
| 16 #include "chrome/browser/lifetime/application_lifetime_android.h" | 16 #include "chrome/browser/lifetime/application_lifetime_android.h" |
| 17 #include "chrome/browser/search_engines/template_url_service_android.h" | 17 #include "chrome/browser/search_engines/template_url_service_android.h" |
| 18 #include "chrome/browser/sync/profile_sync_service_android.h" | 18 #include "chrome/browser/sync/profile_sync_service_android.h" |
| 19 #include "chrome/browser/ui/android/autofill/autofill_dialog_view_android.h" | 19 #include "chrome/browser/ui/android/autofill/autofill_dialog_view_android.h" |
| 20 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h" | 20 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h" |
| 21 #include "chrome/browser/ui/android/chrome_http_auth_handler.h" | 21 #include "chrome/browser/ui/android/chrome_http_auth_handler.h" |
| 22 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" | 22 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" |
| 23 #include "chrome/browser/ui/android/navigation_popup.h" | 23 #include "chrome/browser/ui/android/navigation_popup.h" |
| 24 #include "chrome/browser/ui/android/ssl_client_certificate_request.h" |
| 24 #include "chrome/browser/ui/android/website_settings_popup_android.h" | 25 #include "chrome/browser/ui/android/website_settings_popup_android.h" |
| 25 #include "components/navigation_interception/component_jni_registrar.h" | 26 #include "components/navigation_interception/component_jni_registrar.h" |
| 26 #include "components/web_contents_delegate_android/component_jni_registrar.h" | 27 #include "components/web_contents_delegate_android/component_jni_registrar.h" |
| 27 | 28 |
| 28 bool RegisterCertificateViewer(JNIEnv* env); | 29 bool RegisterCertificateViewer(JNIEnv* env); |
| 29 | 30 |
| 30 namespace chrome { | 31 namespace chrome { |
| 31 namespace android { | 32 namespace android { |
| 32 | 33 |
| 33 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { | 34 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { |
| (...skipping 16 matching lines...) Expand all Loading... |
| 50 RegisterChromeWebContentsDelegateAndroid }, | 51 RegisterChromeWebContentsDelegateAndroid }, |
| 51 { "ContentViewUtil", RegisterContentViewUtil }, | 52 { "ContentViewUtil", RegisterContentViewUtil }, |
| 52 { "DevToolsServer", RegisterDevToolsServer }, | 53 { "DevToolsServer", RegisterDevToolsServer }, |
| 53 { "IntentHelper", RegisterIntentHelper }, | 54 { "IntentHelper", RegisterIntentHelper }, |
| 54 { "JavascriptAppModalDialog", | 55 { "JavascriptAppModalDialog", |
| 55 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog }, | 56 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog }, |
| 56 { "NavigationPopup", NavigationPopup::RegisterNavigationPopup }, | 57 { "NavigationPopup", NavigationPopup::RegisterNavigationPopup }, |
| 57 { "ProcessUtils", RegisterProcessUtils }, | 58 { "ProcessUtils", RegisterProcessUtils }, |
| 58 { "ProfileSyncService", ProfileSyncServiceAndroid::Register }, | 59 { "ProfileSyncService", ProfileSyncServiceAndroid::Register }, |
| 59 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor }, | 60 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor }, |
| 61 { "SSLClientCertificateRequest", |
| 62 RegisterSSLClientCertificateRequestAndroid }, |
| 60 { "TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register }, | 63 { "TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register }, |
| 61 { "WebsiteSettingsPopupAndroid", | 64 { "WebsiteSettingsPopupAndroid", |
| 62 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid }, | 65 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid }, |
| 63 }; | 66 }; |
| 64 | 67 |
| 65 bool RegisterJni(JNIEnv* env) { | 68 bool RegisterJni(JNIEnv* env) { |
| 66 return RegisterNativeMethods(env, kChromeRegisteredMethods, | 69 return RegisterNativeMethods(env, kChromeRegisteredMethods, |
| 67 arraysize(kChromeRegisteredMethods)); | 70 arraysize(kChromeRegisteredMethods)); |
| 68 } | 71 } |
| 69 | 72 |
| 70 } // namespace android | 73 } // namespace android |
| 71 } // namespace chrome | 74 } // namespace chrome |
| OLD | NEW |