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

chrome/browser/ui/website_settings/website_settings.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/website_settings.h"
+#include "chrome/browser/ui/website_settings/website_settings.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browsing_data_cookie_helper.h"
 #include "chrome/browser/browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data_local_storage_helper.h"
 #include "chrome/browser/browsing_data_indexed_db_helper.h"
 #include "chrome/browser/browsing_data_file_system_helper.h"
 #include "chrome/browser/browsing_data_server_bound_cert_helper.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/local_shared_objects_container.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
-#include "chrome/browser/ui/website_settings_ui.h"
+#include "chrome/browser/ui/website_settings/website_settings_ui.h"
 #include "chrome/common/content_settings_pattern.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/common/ssl_status.h"
 #include "content/public/common/url_constants.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/registry_controlled_domain.h"
 #include "net/base/ssl_cipher_suite_names.h"
 #include "net/base/ssl_connection_status_flags.h"
 #include "net/base/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
-#if defined(TOOLKIT_GTK)
-#include "chrome/browser/ui/gtk/website_settings_popup_gtk.h"
-#endif
-
 using content::BrowserThread;
 
 namespace {
 
 ContentSettingsType kPermissionType[] = {
   CONTENT_SETTINGS_TYPE_POPUPS,
   CONTENT_SETTINGS_TYPE_PLUGINS,
   CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
   CONTENT_SETTINGS_TYPE_GEOLOCATION,
 };
 
 }  // namespace
 
 WebsiteSettings::WebsiteSettings(
     WebsiteSettingsUI* ui,
     Profile* profile,
     TabSpecificContentSettings* tab_specific_content_settings,
     const GURL& url,
     const content::SSLStatus& ssl,
     content::CertStore* cert_store)
     : TabSpecificContentSettings::SiteDataObserver(
           tab_specific_content_settings),
       ui_(ui),
       site_url_(url),
       site_identity_status_(SITE_IDENTITY_STATUS_UNKNOWN),
       cert_id_(0),
       site_connection_status_(SITE_CONNECTION_STATUS_UNKNOWN),
       cert_store_(cert_store),
       content_settings_(profile->GetHostContentSettingsMap()) {
-  ui_->SetPresenter(this);
   Init(profile, url, ssl);
 
   HistoryService* history_service =
       profile->GetHistoryService(Profile::EXPLICIT_ACCESS);
   if (history_service) {
     history_service->GetVisibleVisitCountToHost(
         site_url_,
         &visit_count_request_consumer_,
         base::Bind(&WebsiteSettings::OnGotVisitCountToHost,
                    base::Unretained(this)));
   }
 
   PresentSitePermissions();
   PresentSiteData();
   PresentSiteIdentity();
   PresentHistoryInfo(base::Time());
 }
 
 WebsiteSettings::~WebsiteSettings() {
 }
 
-void WebsiteSettings::OnUIClosing() {
-  ui_->SetPresenter(NULL);
-  delete this;
-}
-
 void WebsiteSettings::OnSitePermissionChanged(ContentSettingsType type,
                                               ContentSetting setting) {
   ContentSettingsPattern primary_pattern;
   ContentSettingsPattern secondary_pattern;
   switch (type) {
     case CONTENT_SETTINGS_TYPE_GEOLOCATION:
       // TODO(markusheintz): The rule we create here should also change the
       // location permission for iframed content.
       primary_pattern = ContentSettingsPattern::FromURLNoWildcard(site_url_);
       secondary_pattern = ContentSettingsPattern::FromURLNoWildcard(site_url_);
@@ skipping 381 matching lines @@
     first_visit_text = l10n_util::GetStringFUTF16(
         IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY,
         base::TimeFormatShortDate(first_visit));
   } else {
     first_visit_text = l10n_util::GetStringUTF16(
         IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY);
 
   }
   ui_->SetFirstVisit(first_visit_text);
 }
-
-// static
-void WebsiteSettings::Show(gfx::NativeWindow parent,
-                           Profile* profile,
-                           TabContentsWrapper* tab_contents_wrapper,
-                           const GURL& url,
-                           const content::SSLStatus& ssl) {
-#if defined(TOOLKIT_GTK)
-  // The WebsiteSettingsModel will delete itself after the UI is closed.
-  new WebsiteSettings(new WebsiteSettingsPopupGtk(parent,
-                                                  profile,
-                                                  tab_contents_wrapper),
-                      profile,
-                      tab_contents_wrapper->content_settings(),
-                      url,
-                      ssl,
-                      content::CertStore::GetInstance());
-#endif
-}