diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-30 08:24:12 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-30 08:24:12 +0000 |
commit | cb370a06391bd8cd1d3c52e4722645962366dd42 (patch) | |
tree | 9ca36ba10363365401bd1a816962f4679fda8467 /chrome/browser/cocoa/preferences_window_controller.mm | |
parent | dbefae2c2db09a90c2b9ee4d3ea1a40e580e532e (diff) | |
download | chromium_src-cb370a06391bd8cd1d3c52e4722645962366dd42.zip chromium_src-cb370a06391bd8cd1d3c52e4722645962366dd42.tar.gz chromium_src-cb370a06391bd8cd1d3c52e4722645962366dd42.tar.bz2 |
Changes to support new cookie policy.
Changes:
1- net::CookiePolicy becomes an interface.
2- Old implementaiton of CookiePolicy copied to StaticCookiePolicy.
3- ChromeULRRequestContext implements CookiePolicy.
4- HostContentSettingsMap gets a global "BlockThirdPartyCookies" pref.
R=pkasting
Review URL: http://codereview.chromium.org/556095
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/preferences_window_controller.mm')
-rw-r--r-- | chrome/browser/cocoa/preferences_window_controller.mm | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm index 19ad0f2..b3d435a 100644 --- a/chrome/browser/cocoa/preferences_window_controller.mm +++ b/chrome/browser/cocoa/preferences_window_controller.mm @@ -45,7 +45,6 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" -#include "net/base/cookie_policy.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" @@ -1471,17 +1470,7 @@ const int kDisabledIndex = 1; // Sets the backend pref for whether or not to accept cookies based on |index|. - (void)setCookieBehavior:(NSInteger)index { - net::CookiePolicy::Type policy = net::CookiePolicy::ALLOW_ALL_COOKIES; - if (net::CookiePolicy::ValidType(index)) - policy = net::CookiePolicy::FromInt(index); - const char* kUserMetrics[] = { - "Options_AllowAllCookies", - "Options_BlockThirdPartyCookies", - "Options_BlockAllCookies" - }; - DCHECK(policy >= 0 && (unsigned int)policy < arraysize(kUserMetrics)); - [self recordUserAction:kUserMetrics[policy]]; - cookieBehavior_.SetValue(policy); + // TODO(darin): Remove everything else related to this setter. } - (NSURL*)defaultDownloadLocation { |