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

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/chrome_jni_registrar.cc
diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc
index 873c6261d0382bde15889c77fee05526ba0e3813..de7c9398c91a3c5ab2d838f1e34304cfee637c2a 100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -36,11 +36,15 @@
#include "chrome/browser/ui/android/autofill/autofill_dialog_result.h"
#include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h"
#include "chrome/browser/ui/android/chrome_http_auth_handler.h"
+#include "chrome/browser/ui/android/infobar/confirm_infobar.h"
+#include "chrome/browser/ui/android/infobar/infobar_android.h"
+#include "chrome/browser/ui/android/infobar/infobar_container_android.h"
#include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"
#include "chrome/browser/ui/android/navigation_popup.h"
#include "chrome/browser/ui/android/ssl_client_certificate_request.h"
#include "chrome/browser/ui/android/validation_message_bubble_android.h"
#include "chrome/browser/ui/android/website_settings_popup_android.h"
+#include "chrome/browser/ui/auto_login_infobar_delegate_android.h"
#include "components/autofill/core/browser/android/component_jni_registrar.h"
#include "components/navigation_interception/component_jni_registrar.h"
#include "components/web_contents_delegate_android/component_jni_registrar.h"
@@ -68,6 +72,7 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
autofill::AutofillDialogResult::RegisterAutofillDialogResult },
{ "AutofillPopup",
autofill::AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid },
+ {"AutoLoginDelegate", AutoLoginInfoBarDelegateAndroid::Register},
{ "BookmarksBridge", BookmarksBridge::RegisterBookmarksBridge },
{ "CertificateViewer", RegisterCertificateViewer },
{ "ChromeBrowserProvider",
@@ -76,6 +81,7 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler },
{ "ChromeWebContentsDelegateAndroid",
RegisterChromeWebContentsDelegateAndroid },
+ {"ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate},
{ "ContentViewUtil", RegisterContentViewUtil },
{ "DevToolsServer", RegisterDevToolsServer },
{ "InvalidationController", invalidation::RegisterInvalidationController },
@@ -83,11 +89,13 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
{ "FieldTrialHelper", RegisterFieldTrialHelper },
{ "ForeignSessionHelper",
ForeignSessionHelper::RegisterForeignSessionHelper },
+ {"InfoBarContainer", RegisterInfoBarContainer},
{ "ShortcutHelper", ShortcutHelper::RegisterShortcutHelper },
{ "IntentHelper", RegisterIntentHelper },
{ "JavascriptAppModalDialog",
JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog },
{ "MostVisitedSites", RegisterMostVisitedSites },
+ {"NativeInfoBar", RegisterNativeInfoBar},
{ "NavigationPopup", NavigationPopup::RegisterNavigationPopup },
{ "OmniboxPrerender", RegisterOmniboxPrerender },
{ "PersonalDataManagerAndroid",
« 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