Remove any platform specific code from the chrome/browser/website_settings.* .

chrome/browser/ui/gtk/website_settings_popup_gtk.h

Index: chrome/browser/ui/gtk/website_settings_popup_gtk.h
diff --git a/chrome/browser/ui/gtk/website_settings_popup_gtk.h b/chrome/browser/ui/gtk/website_settings_popup_gtk.h
index be74f67938b494b6144a801698e879df6e74586c..dc55be475555a9e737d8b9e994864e58830c9e4d 100644
--- a/chrome/browser/ui/gtk/website_settings_popup_gtk.h
+++ b/chrome/browser/ui/gtk/website_settings_popup_gtk.h
@@ -11,9 +11,16 @@
 #include <gtk/gtk.h>
 
 #include "chrome/browser/ui/gtk/bubble/bubble_gtk.h"
+#include "googleurl/src/gurl.h"
 
 class Browser;
 class BubbleGtk;
+
+namespace content {
+class CertStore;
+struct SSLStatus;
+}
+
 class GtkThemeService;
 class Profile;
 class TabContentsWrapper;
@@ -24,13 +31,25 @@ class WebsiteSettings;
 class WebsiteSettingsPopupGtk : public WebsiteSettingsUI,

[tfarina, 2012/05/31 19:23:01]

I have another suggestion, feel free to ignore though.

I'd rename WebsiteSettingsUI to WebsiteSettingsPopup. I think UI is too
ambiguous to be used here.

[markusheintz_, 2012/06/01 10:06:06]

The reason why I named it UI instead of Popup is that the implementation must
not necessarily be a Popup.

                                 public BubbleDelegateGtk {
  public:
+  // Creates a |WebsiteSettingsPopupGtk| and displays the UI. The |url|
+  // contains the omnibox URL of the currently active tab, |parent| contains
+  // the currently active window, |profile| contains the currently active
+  // profile and |ssl| contains the |SSLStatus| of the connection to the
+  // website in the currently active tab that is wrapped by the
+  // |tab_contents_wrapper|.
+  static void Show(gfx::NativeWindow parent,
+                   Profile* profile,
+                   TabContentsWrapper* tab_contents_wrapper,
+                   const GURL& url,
+                   const content::SSLStatus& ssl);
+
   WebsiteSettingsPopupGtk(gfx::NativeWindow parent,
                           Profile* profile,
-                          TabContentsWrapper* wrapper);
-  virtual ~WebsiteSettingsPopupGtk();
+                          TabContentsWrapper* wrapper,
+                          const GURL& url,
+                          const content::SSLStatus& ssl);
 
   // WebsiteSettingsUI implementations.
-  virtual void SetPresenter(WebsiteSettings* presenter) OVERRIDE;
   virtual void SetCookieInfo(const CookieInfoList& cookie_info_list) OVERRIDE;
   virtual void SetPermissionInfo(
       const PermissionInfoList& permission_info_list) OVERRIDE;
@@ -41,6 +60,8 @@ class WebsiteSettingsPopupGtk : public WebsiteSettingsUI,
   virtual void BubbleClosing(BubbleGtk* bubble, bool closed_by_escape) OVERRIDE;
 
  private:
+  virtual ~WebsiteSettingsPopupGtk();
+
   // Layouts the different sections retrieved from the model.
   void InitContents();
 
@@ -108,7 +129,7 @@ class WebsiteSettingsPopupGtk : public WebsiteSettingsUI,
 
   // The UI translates user actions to specific events and forwards them to the
   // |presenter_|. The |presenter_| handles these events and updates the UI.
-  WebsiteSettings* presenter_;
+  scoped_ptr<WebsiteSettings> presenter_;

[tfarina, 2012/05/31 17:34:19]

Is this change from a weak pointer to a managed one necessary? I don't
understand the ownership of this code too well to judge it necessary or not yet.

[markusheintz_, 2012/06/01 10:06:06]

Yes it is since the UI owns the presenter_.

 
   DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupGtk);
 };