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/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/ssl_client_certificate_request.h" |
26 #include "chrome/browser/ui/android/website_settings_popup_android.h" | 26 #include "chrome/browser/ui/android/website_settings_popup_android.h" |
27 #include "components/autofill/browser/android/auxiliary_profile_loader_android.h " | |
27 #include "components/navigation_interception/component_jni_registrar.h" | 28 #include "components/navigation_interception/component_jni_registrar.h" |
28 #include "components/web_contents_delegate_android/component_jni_registrar.h" | 29 #include "components/web_contents_delegate_android/component_jni_registrar.h" |
29 | 30 |
30 bool RegisterCertificateViewer(JNIEnv* env); | 31 bool RegisterCertificateViewer(JNIEnv* env); |
31 | 32 |
32 namespace chrome { | 33 namespace chrome { |
33 namespace android { | 34 namespace android { |
34 | 35 |
35 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { | 36 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { |
36 // Register JNI for components we depend on. | 37 // Register JNI for components we depend on. |
(...skipping 22 matching lines...) Expand all Loading... | |
59 { "PersonalDataManagerAndroid", | 60 { "PersonalDataManagerAndroid", |
60 PersonalDataManagerAndroid::Register}, | 61 PersonalDataManagerAndroid::Register}, |
61 { "ProcessUtils", RegisterProcessUtils }, | 62 { "ProcessUtils", RegisterProcessUtils }, |
62 { "ProfileSyncService", ProfileSyncServiceAndroid::Register }, | 63 { "ProfileSyncService", ProfileSyncServiceAndroid::Register }, |
63 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor }, | 64 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor }, |
64 { "SSLClientCertificateRequest", | 65 { "SSLClientCertificateRequest", |
65 RegisterSSLClientCertificateRequestAndroid }, | 66 RegisterSSLClientCertificateRequestAndroid }, |
66 { "TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register }, | 67 { "TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register }, |
67 { "WebsiteSettingsPopupAndroid", | 68 { "WebsiteSettingsPopupAndroid", |
68 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid }, | 69 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid }, |
70 { "RegisterAuxiliaryProfileLoader", autofill::RegisterAuxiliaryProfileLoader } | |
Yaron
2013/03/13 21:23:23
Nit: move above the "components" section. See L37
| |
69 }; | 71 }; |
70 | 72 |
71 bool RegisterJni(JNIEnv* env) { | 73 bool RegisterJni(JNIEnv* env) { |
72 return RegisterNativeMethods(env, kChromeRegisteredMethods, | 74 return RegisterNativeMethods(env, kChromeRegisteredMethods, |
73 arraysize(kChromeRegisteredMethods)); | 75 arraysize(kChromeRegisteredMethods)); |
74 } | 76 } |
75 | 77 |
76 } // namespace android | 78 } // namespace android |
77 } // namespace chrome | 79 } // namespace chrome |
OLD | NEW |