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 "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "chrome/browser/android/bookmarks_bridge.h" | 10 #include "chrome/browser/android/bookmarks_bridge.h" |
(...skipping 20 matching lines...) Expand all Loading... | |
31 #include "chrome/browser/sync/profile_sync_service_android.h" | 31 #include "chrome/browser/sync/profile_sync_service_android.h" |
32 #include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android. h" | 32 #include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android. h" |
33 #include "chrome/browser/ui/android/autofill/autofill_dialog_result.h" | 33 #include "chrome/browser/ui/android/autofill/autofill_dialog_result.h" |
34 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h" | 34 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h" |
35 #include "chrome/browser/ui/android/chrome_http_auth_handler.h" | 35 #include "chrome/browser/ui/android/chrome_http_auth_handler.h" |
36 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" | 36 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" |
37 #include "chrome/browser/ui/android/navigation_popup.h" | 37 #include "chrome/browser/ui/android/navigation_popup.h" |
38 #include "chrome/browser/ui/android/ssl_client_certificate_request.h" | 38 #include "chrome/browser/ui/android/ssl_client_certificate_request.h" |
39 #include "chrome/browser/ui/android/validation_message_bubble_android.h" | 39 #include "chrome/browser/ui/android/validation_message_bubble_android.h" |
40 #include "chrome/browser/ui/android/website_settings_popup_android.h" | 40 #include "chrome/browser/ui/android/website_settings_popup_android.h" |
41 #include "chrome/common/android/startup_metric_utils_android.h" | |
41 #include "components/autofill/core/browser/android/component_jni_registrar.h" | 42 #include "components/autofill/core/browser/android/component_jni_registrar.h" |
42 #include "components/navigation_interception/component_jni_registrar.h" | 43 #include "components/navigation_interception/component_jni_registrar.h" |
43 #include "components/web_contents_delegate_android/component_jni_registrar.h" | 44 #include "components/web_contents_delegate_android/component_jni_registrar.h" |
44 | 45 |
45 bool RegisterCertificateViewer(JNIEnv* env); | 46 bool RegisterCertificateViewer(JNIEnv* env); |
46 | 47 |
47 namespace chrome { | 48 namespace chrome { |
48 namespace android { | 49 namespace android { |
49 | 50 |
50 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { | 51 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
86 { "MostVisitedSites", RegisterMostVisitedSites }, | 87 { "MostVisitedSites", RegisterMostVisitedSites }, |
87 { "NavigationPopup", NavigationPopup::RegisterNavigationPopup }, | 88 { "NavigationPopup", NavigationPopup::RegisterNavigationPopup }, |
88 { "OmniboxPrerender", RegisterOmniboxPrerender }, | 89 { "OmniboxPrerender", RegisterOmniboxPrerender }, |
89 { "PersonalDataManagerAndroid", | 90 { "PersonalDataManagerAndroid", |
90 autofill::PersonalDataManagerAndroid::Register }, | 91 autofill::PersonalDataManagerAndroid::Register }, |
91 { "ProfileAndroid", ProfileAndroid::RegisterProfileAndroid }, | 92 { "ProfileAndroid", ProfileAndroid::RegisterProfileAndroid }, |
92 { "ProfileSyncService", ProfileSyncServiceAndroid::Register }, | 93 { "ProfileSyncService", ProfileSyncServiceAndroid::Register }, |
93 { "SigninManager", SigninManagerAndroid::Register }, | 94 { "SigninManager", SigninManagerAndroid::Register }, |
94 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor }, | 95 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor }, |
95 { "SSLClientCertificateRequest", RegisterSSLClientCertificateRequestAndroid }, | 96 { "SSLClientCertificateRequest", RegisterSSLClientCertificateRequestAndroid }, |
97 { "StartupMetricUtils", RegisterStartupMetricUtils }, | |
Yaron
2013/08/27 20:42:30
Hmm. This is only used by the browser process but
aberent
2013/08/28 15:53:05
I don't want to create a common jni register only
| |
96 { "TabAndroid", TabAndroid::RegisterTabAndroid }, | 98 { "TabAndroid", TabAndroid::RegisterTabAndroid }, |
97 { "TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register }, | 99 { "TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register }, |
98 { "TtsPlatformImpl", TtsPlatformImplAndroid::Register }, | 100 { "TtsPlatformImpl", TtsPlatformImplAndroid::Register }, |
99 { "ValidationMessageBubbleAndroid", | 101 { "ValidationMessageBubbleAndroid", |
100 ValidationMessageBubbleAndroid::Register }, | 102 ValidationMessageBubbleAndroid::Register }, |
101 { "WebsiteSettingsPopupAndroid", | 103 { "WebsiteSettingsPopupAndroid", |
102 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid }, | 104 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid }, |
103 }; | 105 }; |
104 | 106 |
105 bool RegisterJni(JNIEnv* env) { | 107 bool RegisterJni(JNIEnv* env) { |
106 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); | 108 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); |
107 return RegisterNativeMethods(env, kChromeRegisteredMethods, | 109 return RegisterNativeMethods(env, kChromeRegisteredMethods, |
108 arraysize(kChromeRegisteredMethods)); | 110 arraysize(kChromeRegisteredMethods)); |
109 } | 111 } |
110 | 112 |
111 } // namespace android | 113 } // namespace android |
112 } // namespace chrome | 114 } // namespace chrome |
OLD | NEW |