Replaced the current WebsiteSettings dialog with a new PageInfo dialog

chrome/browser/ui/android/website_settings_popup_legacy_android.h

Index: chrome/browser/ui/android/website_settings_popup_legacy_android.h
diff --git a/chrome/browser/ui/android/website_settings_popup_android.h b/chrome/browser/ui/android/website_settings_popup_legacy_android.h
similarity index 58%
copy from chrome/browser/ui/android/website_settings_popup_android.h
copy to chrome/browser/ui/android/website_settings_popup_legacy_android.h
index 12cdafa3cab4378d95522835492677f6a32ef6ff..61a7a476e6c4f067df309e96c366b92e4c362680 100644
--- a/chrome/browser/ui/android/website_settings_popup_android.h
+++ b/chrome/browser/ui/android/website_settings_popup_legacy_android.h
@@ -2,8 +2,8 @@
 // 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_
+#ifndef CHROME_BROWSER_UI_ANDROID_WEBSITE_SETTINGS_POPUP_LEGACY_ANDROID_H_
+#define CHROME_BROWSER_UI_ANDROID_WEBSITE_SETTINGS_POPUP_LEGACY_ANDROID_H_
 
 #include <jni.h>
 
@@ -17,12 +17,12 @@ class WebContents;
 }
 
 // Android implementation of the website settings UI.
-class WebsiteSettingsPopupAndroid : public WebsiteSettingsUI {
+class WebsiteSettingsPopupLegacyAndroid : public WebsiteSettingsUI {
  public:
-  WebsiteSettingsPopupAndroid(JNIEnv* env,
-                              jobject java_website_settings,
-                              content::WebContents* web_contents);
-  virtual ~WebsiteSettingsPopupAndroid();
+  WebsiteSettingsPopupLegacyAndroid(JNIEnv* env,
+                                    jobject java_website_settings,
+                                    content::WebContents* web_contents);
+  virtual ~WebsiteSettingsPopupLegacyAndroid();
   void Destroy(JNIEnv* env, jobject obj);
 
   // Revokes any current user exceptions for bypassing SSL error interstitials
@@ -30,14 +30,14 @@ class WebsiteSettingsPopupAndroid : public WebsiteSettingsUI {
   void ResetCertDecisions(JNIEnv* env, jobject obj, jobject java_web_contents);
 
   // WebsiteSettingsUI implementations.
-  virtual void SetCookieInfo(const CookieInfoList& cookie_info_list) override;
+  virtual void SetCookieInfo(const CookieInfoList& cookie_info_list) OVERRIDE;

[Ted C, 2014/10/07 17:48:06]

You'll want to update to using lowercase override as that is the new standard.

[sashab, 2014/10/07 22:58:24]

Done.

   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;
+      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);
+  static bool RegisterWebsiteSettingsPopupLegacyAndroid(JNIEnv* env);
 
  private:
   // The presenter that controlls the Website Settings UI.
@@ -46,7 +46,7 @@ class WebsiteSettingsPopupAndroid : public WebsiteSettingsUI {
   // The java prompt implementation.
   base::android::ScopedJavaGlobalRef<jobject> popup_jobject_;
 
-  DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupAndroid);
+  DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupLegacyAndroid);
 };
 
-#endif  // CHROME_BROWSER_UI_ANDROID_WEBSITE_SETTINGS_POPUP_ANDROID_H_
+#endif  // CHROME_BROWSER_UI_ANDROID_WEBSITE_SETTINGS_POPUP_LEGACY_ANDROID_H_