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

chrome/browser/ui/gtk/website_settings_popup_gtk.h

 // Copyright (c) 2012 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_GTK_WEBSITE_SETTINGS_POPUP_GTK_H_
 #define CHROME_BROWSER_UI_GTK_WEBSITE_SETTINGS_POPUP_GTK_H_
 #pragma once
 
 #include "chrome/browser/ui/website_settings_ui.h"
 
 #include <gtk/gtk.h>
 
 #include "chrome/browser/ui/gtk/bubble/bubble_gtk.h"
+#include "googleurl/src/gurl.h"

[tfarina, 2012/05/31 23:58:08]

nit: please, forward declare this instead.

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

Done.

 
 class Browser;
 class BubbleGtk;

[tfarina, 2012/05/31 23:58:08]

remove this forward declaration.

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

Done.

+
+namespace content {
+class CertStore;
+struct SSLStatus;
+}
+
 class GtkThemeService;
 class Profile;
 class TabContentsWrapper;
 class WebsiteSettings;
 
 // GTK implementation of the website settings UI. The website settings UI is
 // displayed in a popup that is positioned relative the an anchor element.

[tfarina, 2012/05/31 23:58:08]

nit: relative to an anchor element? can this comment be improved?

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

I guess this part of the comment is not really necessary. Are you fine with
deleting it?

[tfarina, 2012/06/01 21:20:26]

Yes, much cleaner now. Thanks.

 class WebsiteSettingsPopupGtk : public WebsiteSettingsUI,
                                 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,

[Ben Goodger (Google), 2012/05/31 20:51:51]

can your ctor be private then?

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

Done.

                           Profile* profile,
-                          TabContentsWrapper* wrapper);
-  virtual ~WebsiteSettingsPopupGtk();
+                          TabContentsWrapper* wrapper,
+                          const GURL& url,
+                          const content::SSLStatus& ssl);
 
   // WebsiteSettingsUI implementations.

[tfarina, 2012/05/31 23:58:08]

I bet you can also move these overrides and the BubbleDelegateGtk one to the
private section.

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

The WebsiteSettingsUI methods are the public API used by the WebsiteSettings
class (presenter).

The BubbleClosing method is the callback for the BubbeGTK to notify the Popup
that it is closing.

That's why all of them need to be public.

-  virtual void SetPresenter(WebsiteSettings* presenter) OVERRIDE;
   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 string16& first_visit) OVERRIDE;
 
   // BubbleDelegateGtk implementation.
   virtual void BubbleClosing(BubbleGtk* bubble, bool closed_by_escape) OVERRIDE;
 
  private:
+  virtual ~WebsiteSettingsPopupGtk();
+
   // Layouts the different sections retrieved from the model.
   void InitContents();
 
   // Removes all children of |container|.
   void ClearContainer(GtkWidget* container);
 
   // Creates a label that contains the given |text| and has the given |width|.
   GtkWidget* CreateTextLabel(const std::string& text, int width);
 
   // Creates a popup section and returns a virtual box that contains the
@@ skipping 47 matching lines @@
   GtkWidget* permissions_section_contents_;
 
   // Container for the identity tab content.
   GtkWidget* identity_tab_contents_;
 
   // Container for the information about the first visit date of the website.
   GtkWidget* first_visit_contents_;
 
   // 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 23:58:08]

include base/memory/scoped_ptr.h for this.

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

Done.

 
   DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_WEBSITE_SETTINGS_POPUP_GTK_H_