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

Unified Diff: chrome/browser/ui/views/collected_cookies_win.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/views/collected_cookies_win.cc
diff --git a/chrome/browser/ui/views/collected_cookies_win.cc b/chrome/browser/ui/views/collected_cookies_win.cc
index 833c97397f286b00489ae4bee84ab577d7eb996f..fc212443435f6398b434c9ffa8a5b2b5ca3b6dd5 100644
--- a/chrome/browser/ui/views/collected_cookies_win.cc
+++ b/chrome/browser/ui/views/collected_cookies_win.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/ui/views/collected_cookies_win.h"
-#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"
@@ -291,13 +291,13 @@ views::View* CollectedCookiesWin::CreateBlockedPane() {
TabContentsWrapper::GetCurrentWrapperForContents(tab_contents_);
TabSpecificContentSettings* content_settings = wrapper->content_settings();
- HostContentSettingsMap* host_content_settings_map =
- wrapper->profile()->GetHostContentSettingsMap();
+ CookieSettings* cookie_settings =
+ CookieSettings::GetForProfile(wrapper->profile());
// Create the controls that go into the pane.
blocked_label_ = new views::Label(
UTF16ToWide(l10n_util::GetStringUTF16(
- host_content_settings_map->BlockThirdPartyCookies() ?
+ cookie_settings->ShouldBlockThirdPartyCookies() ?
IDS_COLLECTED_COOKIES_BLOCKED_THIRD_PARTY_BLOCKING_ENABLED :
IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_LABEL)));
blocked_label_->SetMultiLine(true);
@@ -486,7 +486,7 @@ void CollectedCookiesWin::AddContentException(views::TreeView* tree_view,
static_cast<CookieTreeOriginNode*>(tree_view->GetSelectedNode());
Profile* profile =
Profile::FromBrowserContext(tab_contents_->browser_context());
- origin_node->CreateContentException(profile->GetHostContentSettingsMap(),
+ origin_node->CreateContentException(CookieSettings::GetForProfile(profile),
setting);
infobar_->UpdateVisibility(true, setting, origin_node->GetTitle());
gfx::Rect bounds = GetWidget()->GetClientAreaScreenBounds();

Powered by Google App Engine
This is Rietveld 408576698