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

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

Issue 12045081: Android implementation of WebsiteSettingsUi (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 2fca5492a3d7ee498018fb015ffa7625d2b5c47c..cb737ee0e2962994c7b22c296ccdf812aeefaa5e 100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -18,9 +18,12 @@
#include "chrome/browser/ui/android/chrome_http_auth_handler.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/website_settings_popup_android.h"
#include "components/navigation_interception/component_jni_registrar.h"
#include "components/web_contents_delegate_android/component_jni_registrar.h"
+bool RegisterCertificateViewer(JNIEnv* env);
+
namespace chrome {
namespace android {
@@ -33,6 +36,7 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
{ "ApplicationLifetime", browser::RegisterApplicationLifetimeAndroid},
{ "AutofillPopup",
AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid},
+ { "CertificateViewer", RegisterCertificateViewer},
{ "ChromeBrowserProvider",
ChromeBrowserProvider::RegisterChromeBrowserProvider },
{ "ChromeHttpAuthHandler",
@@ -47,6 +51,8 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
{ "NavigationPopup", NavigationPopup::RegisterNavigationPopup },
{ "ProcessUtils", RegisterProcessUtils },
{ "SqliteCursor", SQLiteCursor::RegisterSqliteCursor },
+ { "WebsiteSettingsPopupAndroid",
+ WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid },
};
bool RegisterJni(JNIEnv* env) {

Powered by Google App Engine
This is Rietveld 408576698