Replaced the current WebsiteSettings dialog with a new PageInfo dialog

chrome/browser/ui/android/website_settings_popup_android.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_ANDROID_WEBSITE_SETTINGS_POPUP_ANDROID_H_
 #define CHROME_BROWSER_UI_ANDROID_WEBSITE_SETTINGS_POPUP_ANDROID_H_
 
 #include <jni.h>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
 
 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:
   WebsiteSettingsPopupAndroid(JNIEnv* env,
                               jobject java_website_settings,
                               content::WebContents* web_contents);
   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(
       const PermissionInfoList& permission_info_list) OVERRIDE;
   virtual void SetIdentityInfo(const IdentityInfo& identity_info) OVERRIDE;
   virtual void SetFirstVisit(const base::string16& first_visit) OVERRIDE;
   virtual void SetSelectedTab(WebsiteSettingsUI::TabId tab_id) OVERRIDE;
 
   static bool RegisterWebsiteSettingsPopupAndroid(JNIEnv* env);
 
  private:
   // The presenter that controlls the Website Settings UI.
   scoped_ptr<WebsiteSettings> presenter_;
 
   // The java prompt implementation.
   base::android::ScopedJavaGlobalRef<jobject> popup_jobject_;
 
+  GURL url_;
+
   DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupAndroid);
 };
 
 #endif  // CHROME_BROWSER_UI_ANDROID_WEBSITE_SETTINGS_POPUP_ANDROID_H_