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

chrome/browser/ui/gtk/browser_window_gtk.cc

 // 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.
 
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 
 #include <dlfcn.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
@@ skipping 52 matching lines @@
 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h"
 #include "chrome/browser/ui/gtk/nine_box.h"
 #include "chrome/browser/ui/gtk/one_click_signin_bubble_gtk.h"
 #include "chrome/browser/ui/gtk/password_generation_bubble_gtk.h"
 #include "chrome/browser/ui/gtk/reload_button_gtk.h"
 #include "chrome/browser/ui/gtk/status_bubble_gtk.h"
 #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h"
 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h"
 #include "chrome/browser/ui/gtk/task_manager_gtk.h"
 #include "chrome/browser/ui/gtk/update_recommended_dialog.h"
+#include "chrome/browser/ui/gtk/website_settings_popup_gtk.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/page_info_bubble.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/task_manager/task_manager_dialog.h"
 #include "chrome/browser/web_applications/web_app.h"
-#include "chrome/browser/website_settings.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
@@ skipping 1041 matching lines @@
   browser::ShowPageInfoBubble(window_, profile, url, ssl, show_history,
                               browser_.get());
 }
 
 void BrowserWindowGtk::ShowWebsiteSettings(
     Profile* profile,
     TabContentsWrapper* tab_contents_wrapper,
     const GURL& url,
     const content::SSLStatus& ssl,
     bool show_history) {
-    WebsiteSettings::Show(GetNativeHandle(),
-                          profile,
-                          tab_contents_wrapper,
-                          url,
-                          ssl);
+    WebsiteSettingsPopupGtk::Show(
+        GetNativeHandle(),

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

nit: like I said in the other comment, you could save some vertical lines,
writting the parameters until you hit the 80 chars limit. ;)

[markusheintz_, 2012/06/02 21:22:33]

I don't have any strong feelings about the style in this case.

+        profile,
+        tab_contents_wrapper,
+        url,
+        ssl);
 }
 
 void BrowserWindowGtk::ShowAppMenu() {
   toolbar_->ShowAppMenu();
 }
 
 bool BrowserWindowGtk::PreHandleKeyboardEvent(
     const NativeWebKeyboardEvent& event, bool* is_keyboard_shortcut) {
   GdkEventKey* os_event = &event.os_event->key;
 
@@ skipping 1442 matching lines @@
           wm_type == ui::WM_OPENBOX ||
           wm_type == ui::WM_XFWM4);
 }
 
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser);
   browser_window_gtk->Init();
   return browser_window_gtk;
 }