Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7666)

Unified Diff: chrome/browser/ui/website_settings/website_settings.cc

Issue 10440092: Remove any platform specific code from the chrome/browser/website_settings.* . (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort includes Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/website_settings/website_settings.cc
diff --git a/chrome/browser/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
similarity index 94%
rename from chrome/browser/website_settings.cc
rename to chrome/browser/ui/website_settings/website_settings.cc
index ceb8551f1b20b29da7024065a56f7baf7510d1f5..6ccb3898785c4190b4c5232da66df373325f6546 100644
--- a/chrome/browser/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -2,7 +2,7 @@
// 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>
@@ -25,7 +25,7 @@
#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"
@@ -41,10 +41,6 @@
#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 {
@@ -74,7 +70,6 @@ WebsiteSettings::WebsiteSettings(
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 =
@@ -96,11 +91,6 @@ WebsiteSettings::WebsiteSettings(
WebsiteSettings::~WebsiteSettings() {
}
-void WebsiteSettings::OnUIClosing() {
- ui_->SetPresenter(NULL);
- delete this;
-}
-
void WebsiteSettings::OnSitePermissionChanged(ContentSettingsType type,
ContentSetting setting) {
ContentSettingsPattern primary_pattern;
@@ -502,22 +492,3 @@ void WebsiteSettings::PresentHistoryInfo(base::Time first_visit) {
}
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
-}
« no previous file with comments | « chrome/browser/ui/website_settings/website_settings.h ('k') | chrome/browser/ui/website_settings/website_settings_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698