chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm - Issue 7713034: HostContentSettingsMap refactoring.

Unified Diff: chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm

Issue 7713034: HostContentSettingsMap refactoring. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Keeping up to date with trunk. Created 9 years, 3 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

« chrome/browser/content_settings/cookie_settings.cc ('K') | « chrome/browser/renderer_host/chrome_render_message_filter.cc ('k') | chrome/browser/ui/content_settings/content_setting_bubble_model.cc » ('j') | chrome/browser/ui/content_settings/content_setting_bubble_model.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm

diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm

index 75e160686d86324dac54ab9e1d7a9adf88ca532d..6d4c76bb8f1e3c0678866485870b70ef7a58421a 100644

--- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm

+++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm

@@ -8,9 +8,10 @@

#import "base/mac/mac_util.h"

#include "base/sys_string_conversions.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/infobars/infobar_tab_helper.h"

+#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/cocoa/constrained_window_mac.h"

#import "chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.h"

@@ -18,6 +19,7 @@

#include "chrome/browser/ui/collected_cookies_infobar_delegate.h"

#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

#include "chrome/common/chrome_notification_types.h"

+#include "chrome/common/pref_names.h"

#include "content/browser/tab_contents/tab_contents.h"

#include "content/common/notification_details.h"

#include "content/common/notification_source.h"

@@ -184,7 +186,7 @@ void CollectedCookiesMac::OnSheetDidEnd(NSWindow* sheet) {

// Change the label of the blocked cookies part if necessary.

Profile* profile = wrapper_->profile();

- if (profile->GetHostContentSettingsMap()->BlockThirdPartyCookies()) {

+ if (profile->GetPrefs()->GetBoolean(prefs::kBlockThirdPartyCookies)) {

[blockedCookiesText_ setStringValue:l10n_util::GetNSString(

IDS_COLLECTED_COOKIES_BLOCKED_THIRD_PARTY_BLOCKING_ENABLED)];

CGFloat textDeltaY = [GTMUILocalizerAndLayoutTweaker

@@ -243,7 +245,7 @@ void CollectedCookiesMac::OnSheetDidEnd(NSWindow* sheet) {

Profile* profile = wrapper_->profile();

CookieTreeOriginNode* origin_node =

static_cast<CookieTreeOriginNode*>(cookie);

- origin_node->CreateContentException(profile->GetHostContentSettingsMap(),

+ origin_node->CreateContentException(CookieSettings::GetForProfile(profile),

setting);

if (!lastDomain.empty())

multipleDomainsChanged = YES;