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

Side by Side Diff: components/content_settings/core/browser/cookie_settings.cc

Issue 2938163002: Store base::Value in ContentSettingPatternSource instead of an enum (Closed)
Patch Set: rebased Created 3 years, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/content_settings/core/browser/cookie_settings.h" 5 #include "components/content_settings/core/browser/cookie_settings.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "components/content_settings/core/browser/content_settings_utils.h" 9 #include "components/content_settings/core/browser/content_settings_utils.h"
10 #include "components/content_settings/core/browser/host_content_settings_map.h" 10 #include "components/content_settings/core/browser/host_content_settings_map.h"
11 #include "components/content_settings/core/common/content_settings_pattern.h" 11 #include "components/content_settings/core/common/content_settings_pattern.h"
12 #include "components/content_settings/core/common/content_settings_utils.h"
12 #include "components/content_settings/core/common/pref_names.h" 13 #include "components/content_settings/core/common/pref_names.h"
13 #include "components/pref_registry/pref_registry_syncable.h" 14 #include "components/pref_registry/pref_registry_syncable.h"
14 #include "components/prefs/pref_service.h" 15 #include "components/prefs/pref_service.h"
15 #include "extensions/features/features.h" 16 #include "extensions/features/features.h"
16 #include "net/base/net_errors.h" 17 #include "net/base/net_errors.h"
17 #include "net/base/static_cookie_policy.h" 18 #include "net/base/static_cookie_policy.h"
18 #include "url/gurl.h" 19 #include "url/gurl.h"
19 20
20 namespace { 21 namespace {
21 22
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 block_third_party_cookies_ = pref_change_registrar_.prefs()->GetBoolean( 175 block_third_party_cookies_ = pref_change_registrar_.prefs()->GetBoolean(
175 prefs::kBlockThirdPartyCookies); 176 prefs::kBlockThirdPartyCookies);
176 } 177 }
177 178
178 bool CookieSettings::ShouldBlockThirdPartyCookies() const { 179 bool CookieSettings::ShouldBlockThirdPartyCookies() const {
179 base::AutoLock auto_lock(lock_); 180 base::AutoLock auto_lock(lock_);
180 return block_third_party_cookies_; 181 return block_third_party_cookies_;
181 } 182 }
182 183
183 } // namespace content_settings 184 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698