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

Unified Diff: chrome/browser/ui/gtk/collected_cookies_gtk.cc

Issue 7713034: HostContentSettingsMap refactoring. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Tiny fixes (unnecessary #includes, win + mac fixes). Created 9 years, 4 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/gtk/collected_cookies_gtk.cc
diff --git a/chrome/browser/ui/gtk/collected_cookies_gtk.cc b/chrome/browser/ui/gtk/collected_cookies_gtk.cc
index e73a8a2d549eddaa64312ffa4a5ba3660730e52b..ad3c8bff7a7bbf3397e8c61ac6cb569a72b0c781 100644
--- a/chrome/browser/ui/gtk/collected_cookies_gtk.cc
+++ b/chrome/browser/ui/gtk/collected_cookies_gtk.cc
@@ -6,7 +6,7 @@
#include <string>
-#include "chrome/browser/content_settings/host_content_settings_map.h"
+#include "chrome/browser/content_settings/cookie_settings.h"
#include "chrome/browser/content_settings/tab_specific_content_settings.h"
#include "chrome/browser/cookies_tree_model.h"
#include "chrome/browser/profiles/profile.h"
@@ -242,14 +242,14 @@ GtkWidget* CollectedCookiesGtk::CreateAllowedPane() {
GtkWidget* CollectedCookiesGtk::CreateBlockedPane() {
TabContentsWrapper* wrapper =
TabContentsWrapper::GetCurrentWrapperForContents(tab_contents_);
- HostContentSettingsMap* host_content_settings_map =
- wrapper->profile()->GetHostContentSettingsMap();
+ CookieSettings* cookie_settings =
+ CookieSettings::GetForProfile(wrapper->profile());
GtkWidget* cookie_list_vbox = gtk_vbox_new(FALSE, ui::kControlSpacing);
GtkWidget* label = gtk_label_new(
l10n_util::GetStringUTF8(
- host_content_settings_map->BlockThirdPartyCookies() ?
+ cookie_settings->ShouldBlockThirdPartyCookies() ?
IDS_COLLECTED_COOKIES_BLOCKED_THIRD_PARTY_BLOCKING_ENABLED :
IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_LABEL).c_str());
gtk_widget_set_size_request(label, kTreeViewWidth, -1);
@@ -464,7 +464,7 @@ void CollectedCookiesGtk::AddExceptions(GtkTreeSelection* selection,
Profile* profile =
Profile::FromBrowserContext(tab_contents_->browser_context());
origin_node->CreateContentException(
- profile->GetHostContentSettingsMap(), setting);
+ CookieSettings::GetForProfile(profile), setting);
}
}
g_list_foreach(paths, reinterpret_cast<GFunc>(gtk_tree_path_free), NULL);

Powered by Google App Engine
This is Rietveld 408576698