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

Unified Diff: chrome/browser/android/chrome_jni_registrar.cc

Issue 1100283002: Add connection info popup within Page Info on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Close WebsiteSettingsPopup when opening ConnectionInfoPopup Created 5 years, 8 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
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 eecce76f9c01c15c96d2a62f0e75a7f968211ac7..9b470cb298b5f5001977281b7bc9981e10ba6800 100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -87,6 +87,7 @@
#include "chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h"
#include "chrome/browser/ui/android/autofill/password_generation_popup_view_android.h"
#include "chrome/browser/ui/android/chrome_http_auth_handler.h"
+#include "chrome/browser/ui/android/connection_info_popup_android.h"
#include "chrome/browser/ui/android/context_menu_helper.h"
#include "chrome/browser/ui/android/infobars/account_chooser_infobar.h"
#include "chrome/browser/ui/android/infobars/app_banner_infobar.h"
@@ -120,6 +121,8 @@
#include "printing/printing_context_android.h"
#endif
+bool RegisterCertificateViewer(JNIEnv* env);
Ted C 2015/04/27 19:04:01 I think you should just include the .h for the cer
tsergeant 2015/04/28 03:15:00 Done. There wasn't a .h file for the Android speci
+
namespace chrome {
namespace android {
@@ -158,6 +161,7 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
{"AutofillProfileBridge", autofill::RegisterAutofillProfileBridge},
{"BookmarksBridge", BookmarksBridge::RegisterBookmarksBridge},
{"CardUnmaskPrompt", autofill::CardUnmaskPromptViewAndroid::Register},
+ {"CertificateViewer", RegisterCertificateViewer},
{"ChildAccountFeedbackReporter", RegisterChildAccountFeedbackReporter},
{"ChildAccountService", RegisterChildAccountService},
{"ChromeBrowserProvider",
@@ -168,6 +172,8 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
RegisterChromeWebContentsDelegateAndroid},
{"ChromiumApplication", ChromiumApplication::RegisterBindings},
{"ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate},
+ {"ConnectionInfoPopupAndroid",
+ ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid},
{"ContentViewUtil", RegisterContentViewUtil},
{"ContextMenuHelper", RegisterContextMenuHelper},
{"CookiesFetcher", RegisterCookiesFetcher},

Powered by Google App Engine
This is Rietveld 408576698