diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-25 18:14:50 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-25 18:14:50 +0000 |
| commit | a786f3821e677c027fb43c8ae47e0e5f8e8f71c3 (patch) | |
| tree | 4a1bafb84bc8ba2342e2433949965d999571a3f4 /chrome/browser/content_settings/cookie_settings.cc | |
| parent | 42973b953187b9315d6e325ccd58af44118fc5e2 (diff) | |
| download | chromium_src-a786f3821e677c027fb43c8ae47e0e5f8e8f71c3.zip chromium_src-a786f3821e677c027fb43c8ae47e0e5f8e8f71c3.tar.gz chromium_src-a786f3821e677c027fb43c8ae47e0e5f8e8f71c3.tar.bz2 | |
Make third-party cookie blocking take precedence over any rules that match all hosts.
Previously, it would only take precedence over rules that match all origins ("*").
BUG=133768
TEST=see bug for manual test.
Review URL: https://chromiumcodereview.appspot.com/10574045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143953 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_settings/cookie_settings.cc')
| -rw-r--r-- | chrome/browser/content_settings/cookie_settings.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/content_settings/cookie_settings.cc b/chrome/browser/content_settings/cookie_settings.cc index ff27e34..fb2eb4f 100644 --- a/chrome/browser/content_settings/cookie_settings.cc +++ b/chrome/browser/content_settings/cookie_settings.cc @@ -200,8 +200,8 @@ ContentSetting CookieSettings::GetCookieSetting( // If no explicit exception has been made and third-party cookies are blocked // by default, apply that rule. - if (info.primary_pattern == ContentSettingsPattern::Wildcard() && - info.secondary_pattern == ContentSettingsPattern::Wildcard() && + if (info.primary_pattern.MatchesAllHosts() && + info.secondary_pattern.MatchesAllHosts() && ShouldBlockThirdPartyCookies() && !first_party_url.SchemeIs(chrome::kExtensionScheme)) { bool not_strict = CommandLine::ForCurrentProcess()->HasSwitch( |