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

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

Issue 24109002: [InfoBar] Upstram basic infobar flow for Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@upstream_infobar_full
Patch Set: Fix License header in two more files Created 7 years, 3 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/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 18 matching lines...) Expand all
29 #include "chrome/browser/lifetime/application_lifetime_android.h" 29 #include "chrome/browser/lifetime/application_lifetime_android.h"
30 #include "chrome/browser/profiles/profile_android.h" 30 #include "chrome/browser/profiles/profile_android.h"
31 #include "chrome/browser/search_engines/template_url_service_android.h" 31 #include "chrome/browser/search_engines/template_url_service_android.h"
32 #include "chrome/browser/signin/android_profile_oauth2_token_service.h" 32 #include "chrome/browser/signin/android_profile_oauth2_token_service.h"
33 #include "chrome/browser/speech/tts_android.h" 33 #include "chrome/browser/speech/tts_android.h"
34 #include "chrome/browser/sync/profile_sync_service_android.h" 34 #include "chrome/browser/sync/profile_sync_service_android.h"
35 #include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android. h" 35 #include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android. h"
36 #include "chrome/browser/ui/android/autofill/autofill_dialog_result.h" 36 #include "chrome/browser/ui/android/autofill/autofill_dialog_result.h"
37 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h" 37 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h"
38 #include "chrome/browser/ui/android/chrome_http_auth_handler.h" 38 #include "chrome/browser/ui/android/chrome_http_auth_handler.h"
39 #include "chrome/browser/ui/android/infobar/confirm_infobar.h"
40 #include "chrome/browser/ui/android/infobar/infobar_android.h"
41 #include "chrome/browser/ui/android/infobar/infobar_container_android.h"
39 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" 42 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"
40 #include "chrome/browser/ui/android/navigation_popup.h" 43 #include "chrome/browser/ui/android/navigation_popup.h"
41 #include "chrome/browser/ui/android/ssl_client_certificate_request.h" 44 #include "chrome/browser/ui/android/ssl_client_certificate_request.h"
42 #include "chrome/browser/ui/android/validation_message_bubble_android.h" 45 #include "chrome/browser/ui/android/validation_message_bubble_android.h"
43 #include "chrome/browser/ui/android/website_settings_popup_android.h" 46 #include "chrome/browser/ui/android/website_settings_popup_android.h"
47 #include "chrome/browser/ui/auto_login_infobar_delegate_android.h"
44 #include "components/autofill/core/browser/android/component_jni_registrar.h" 48 #include "components/autofill/core/browser/android/component_jni_registrar.h"
45 #include "components/navigation_interception/component_jni_registrar.h" 49 #include "components/navigation_interception/component_jni_registrar.h"
46 #include "components/web_contents_delegate_android/component_jni_registrar.h" 50 #include "components/web_contents_delegate_android/component_jni_registrar.h"
47 51
48 bool RegisterCertificateViewer(JNIEnv* env); 52 bool RegisterCertificateViewer(JNIEnv* env);
49 53
50 namespace chrome { 54 namespace chrome {
51 namespace android { 55 namespace android {
52 56
53 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { 57 static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
54 // Register JNI for components we depend on. 58 // Register JNI for components we depend on.
55 { "NavigationInterception", 59 { "NavigationInterception",
56 navigation_interception::RegisterNavigationInterceptionJni }, 60 navigation_interception::RegisterNavigationInterceptionJni },
57 { "WebContentsDelegateAndroid", 61 { "WebContentsDelegateAndroid",
58 web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni }, 62 web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni },
59 { "RegisterAuxiliaryProfileLoader", autofill::RegisterAutofillAndroidJni }, 63 { "RegisterAuxiliaryProfileLoader", autofill::RegisterAutofillAndroidJni },
60 // Register JNI for chrome classes. 64 // Register JNI for chrome classes.
61 { "AndroidProfileOAuth2TokenService", 65 { "AndroidProfileOAuth2TokenService",
62 AndroidProfileOAuth2TokenService::Register }, 66 AndroidProfileOAuth2TokenService::Register },
63 { "ApplicationLifetime", RegisterApplicationLifetimeAndroid }, 67 { "ApplicationLifetime", RegisterApplicationLifetimeAndroid },
64 { "AutofillDialogControllerAndroid", 68 { "AutofillDialogControllerAndroid",
65 autofill::AutofillDialogControllerAndroid:: 69 autofill::AutofillDialogControllerAndroid::
66 RegisterAutofillDialogControllerAndroid }, 70 RegisterAutofillDialogControllerAndroid },
67 { "AutofillDialogResult", 71 { "AutofillDialogResult",
68 autofill::AutofillDialogResult::RegisterAutofillDialogResult }, 72 autofill::AutofillDialogResult::RegisterAutofillDialogResult },
69 { "AutofillPopup", 73 { "AutofillPopup",
70 autofill::AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid }, 74 autofill::AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid },
75 {"AutoLoginDelegate", AutoLoginInfoBarDelegateAndroid::Register},
71 { "BookmarksBridge", BookmarksBridge::RegisterBookmarksBridge }, 76 { "BookmarksBridge", BookmarksBridge::RegisterBookmarksBridge },
72 { "CertificateViewer", RegisterCertificateViewer }, 77 { "CertificateViewer", RegisterCertificateViewer },
73 { "ChromeBrowserProvider", 78 { "ChromeBrowserProvider",
74 ChromeBrowserProvider::RegisterChromeBrowserProvider }, 79 ChromeBrowserProvider::RegisterChromeBrowserProvider },
75 { "ChromeHttpAuthHandler", 80 { "ChromeHttpAuthHandler",
76 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler }, 81 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler },
77 { "ChromeWebContentsDelegateAndroid", 82 { "ChromeWebContentsDelegateAndroid",
78 RegisterChromeWebContentsDelegateAndroid }, 83 RegisterChromeWebContentsDelegateAndroid },
84 {"ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate},
79 { "ContentViewUtil", RegisterContentViewUtil }, 85 { "ContentViewUtil", RegisterContentViewUtil },
80 { "DevToolsServer", RegisterDevToolsServer }, 86 { "DevToolsServer", RegisterDevToolsServer },
81 { "InvalidationController", invalidation::RegisterInvalidationController }, 87 { "InvalidationController", invalidation::RegisterInvalidationController },
82 { "FaviconHelper", FaviconHelper::RegisterFaviconHelper }, 88 { "FaviconHelper", FaviconHelper::RegisterFaviconHelper },
83 { "FieldTrialHelper", RegisterFieldTrialHelper }, 89 { "FieldTrialHelper", RegisterFieldTrialHelper },
84 { "ForeignSessionHelper", 90 { "ForeignSessionHelper",
85 ForeignSessionHelper::RegisterForeignSessionHelper }, 91 ForeignSessionHelper::RegisterForeignSessionHelper },
92 {"InfoBarContainer", RegisterInfoBarContainer},
86 { "ShortcutHelper", ShortcutHelper::RegisterShortcutHelper }, 93 { "ShortcutHelper", ShortcutHelper::RegisterShortcutHelper },
87 { "IntentHelper", RegisterIntentHelper }, 94 { "IntentHelper", RegisterIntentHelper },
88 { "JavascriptAppModalDialog", 95 { "JavascriptAppModalDialog",
89 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog }, 96 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog },
90 { "MostVisitedSites", RegisterMostVisitedSites }, 97 { "MostVisitedSites", RegisterMostVisitedSites },
98 {"NativeInfoBar", RegisterNativeInfoBar},
91 { "NavigationPopup", NavigationPopup::RegisterNavigationPopup }, 99 { "NavigationPopup", NavigationPopup::RegisterNavigationPopup },
92 { "OmniboxPrerender", RegisterOmniboxPrerender }, 100 { "OmniboxPrerender", RegisterOmniboxPrerender },
93 { "PersonalDataManagerAndroid", 101 { "PersonalDataManagerAndroid",
94 autofill::PersonalDataManagerAndroid::Register }, 102 autofill::PersonalDataManagerAndroid::Register },
95 { "ProfileAndroid", ProfileAndroid::RegisterProfileAndroid }, 103 { "ProfileAndroid", ProfileAndroid::RegisterProfileAndroid },
96 { "ProfileSyncService", ProfileSyncServiceAndroid::Register }, 104 { "ProfileSyncService", ProfileSyncServiceAndroid::Register },
97 { "SigninManager", SigninManagerAndroid::Register }, 105 { "SigninManager", SigninManagerAndroid::Register },
98 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor }, 106 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor },
99 { "SSLClientCertificateRequest", RegisterSSLClientCertificateRequestAndroid }, 107 { "SSLClientCertificateRequest", RegisterSSLClientCertificateRequestAndroid },
100 { "StartupMetricUtils", RegisterStartupMetricUtils }, 108 { "StartupMetricUtils", RegisterStartupMetricUtils },
101 { "TabAndroid", TabAndroid::RegisterTabAndroid }, 109 { "TabAndroid", TabAndroid::RegisterTabAndroid },
102 { "TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register }, 110 { "TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register },
103 { "TtsPlatformImpl", TtsPlatformImplAndroid::Register }, 111 { "TtsPlatformImpl", TtsPlatformImplAndroid::Register },
104 {"UrlUtilities", RegisterUrlUtilities}, 112 {"UrlUtilities", RegisterUrlUtilities},
105 { "ValidationMessageBubbleAndroid", 113 { "ValidationMessageBubbleAndroid",
106 ValidationMessageBubbleAndroid::Register }, 114 ValidationMessageBubbleAndroid::Register },
107 { "WebsiteSettingsPopupAndroid", 115 { "WebsiteSettingsPopupAndroid",
108 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid }, 116 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid },
109 }; 117 };
110 118
111 bool RegisterJni(JNIEnv* env) { 119 bool RegisterJni(JNIEnv* env) {
112 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 120 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
113 return RegisterNativeMethods(env, kChromeRegisteredMethods, 121 return RegisterNativeMethods(env, kChromeRegisteredMethods,
114 arraysize(kChromeRegisteredMethods)); 122 arraysize(kChromeRegisteredMethods));
115 } 123 }
116 124
117 } // namespace android 125 } // namespace android
118 } // namespace chrome 126 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/android/testshell/testshell_stubs.cc ('k') | chrome/browser/android/tab_android_test_stubs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698