Replaced the current WebsiteSettings dialog with a new PageInfo dialog

chrome/browser/ui/android/website_settings_popup_android.h

Index: chrome/browser/ui/android/website_settings_popup_android.h
diff --git a/chrome/browser/ui/android/website_settings_popup_android.h b/chrome/browser/ui/android/website_settings_popup_android.h
index 75c4ea5f85a7ce92f83f00e508ec6e4503188ee4..eba73efd180a4d36643faec5a3efc3dc9a364484 100644
--- a/chrome/browser/ui/android/website_settings_popup_android.h
+++ b/chrome/browser/ui/android/website_settings_popup_android.h
@@ -16,6 +16,12 @@ namespace content {
 class WebContents;
 }
 
+enum PageInfoConnectionType {
+#define DEFINE_PAGE_INFO_CONNECTION_TYPE(x, y) PAGE_INFO_##x = y,
+#include "ui/gfx/android/page_info_connection_type_list.h"

[Ted C, 2014/09/03 20:44:49]

I think the new method of generating enums is probably going to land soon, so we
might need to switch over depending on which gets there first.

[sashab, 2014/09/19 02:29:48]

Ahh... And it's landed. Alright, I'll switch over this code :)

+#undef DEFINE_PAGE_INFO_CONNECTION_TYPE
+};
+
 // Android implementation of the website settings UI.
 class WebsiteSettingsPopupAndroid : public WebsiteSettingsUI {
  public:
@@ -25,10 +31,6 @@ class WebsiteSettingsPopupAndroid : public WebsiteSettingsUI {
   virtual ~WebsiteSettingsPopupAndroid();
   void Destroy(JNIEnv* env, jobject obj);
 
-  // Revokes any current user exceptions for bypassing SSL error interstitials
-  // on this page.
-  void ResetCertDecisions(JNIEnv* env, jobject obj, jobject java_web_contents);
-
   // WebsiteSettingsUI implementations.
   virtual void SetCookieInfo(const CookieInfoList& cookie_info_list) OVERRIDE;
   virtual void SetPermissionInfo(
@@ -46,6 +48,8 @@ class WebsiteSettingsPopupAndroid : public WebsiteSettingsUI {
   // The java prompt implementation.
   base::android::ScopedJavaGlobalRef<jobject> popup_jobject_;
 
+  GURL url_;
+
   DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupAndroid);
 };