chrome/browser/content_settings/cookie_settings.cc - Issue 518803009: Move content_settings_pattern and content_settings_pattern_parser to the content_settings component.

Side by Side Diff: chrome/browser/content_settings/cookie_settings.cc

Issue 518803009: Move content_settings_pattern and content_settings_pattern_parser to the content_settings component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 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 unified diff | Download patch

OLD	NEW
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 "chrome/browser/content_settings/cookie_settings.h"	5 #include "chrome/browser/content_settings/cookie_settings.h"

6	6

7 #include "base/prefs/pref_service.h"	7 #include "base/prefs/pref_service.h"

8 #include "chrome/browser/chrome_notification_types.h"	8 #include "chrome/browser/chrome_notification_types.h"

9 #include "chrome/browser/content_settings/content_settings_utils.h"	9 #include "chrome/browser/content_settings/content_settings_utils.h"

10 #include "chrome/browser/content_settings/host_content_settings_map.h"	10 #include "chrome/browser/content_settings/host_content_settings_map.h"

11 #include "chrome/browser/profiles/incognito_helpers.h"	11 #include "chrome/browser/profiles/incognito_helpers.h"

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

13 #include "chrome/common/content_settings_pattern.h"

14 #include "chrome/common/pref_names.h"	13 #include "chrome/common/pref_names.h"

	14 #include "components/content_settings/core/common/content_settings_pattern.h"

15 #include "components/keyed_service/content/browser_context_dependency_manager.h"	15 #include "components/keyed_service/content/browser_context_dependency_manager.h"

16 #include "components/keyed_service/core/keyed_service.h"	16 #include "components/keyed_service/core/keyed_service.h"

17 #include "components/pref_registry/pref_registry_syncable.h"	17 #include "components/pref_registry/pref_registry_syncable.h"

18 #include "content/public/browser/browser_thread.h"	18 #include "content/public/browser/browser_thread.h"

19 #include "content/public/browser/notification_service.h"	19 #include "content/public/browser/notification_service.h"

20 #include "content/public/browser/notification_source.h"	20 #include "content/public/browser/notification_source.h"

21 #include "content/public/browser/user_metrics.h"	21 #include "content/public/browser/user_metrics.h"

22 #include "extensions/common/constants.h"	22 #include "extensions/common/constants.h"

23 #include "net/base/net_errors.h"	23 #include "net/base/net_errors.h"

24 #include "net/base/static_cookie_policy.h"	24 #include "net/base/static_cookie_policy.h"

(...skipping 197 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
222	222

223 base::AutoLock auto_lock(lock_);	223 base::AutoLock auto_lock(lock_);

224 block_third_party_cookies_ = pref_change_registrar_.prefs()->GetBoolean(	224 block_third_party_cookies_ = pref_change_registrar_.prefs()->GetBoolean(

225 prefs::kBlockThirdPartyCookies);	225 prefs::kBlockThirdPartyCookies);

226 }	226 }

227	227

228 bool CookieSettings::ShouldBlockThirdPartyCookies() const {	228 bool CookieSettings::ShouldBlockThirdPartyCookies() const {

229 base::AutoLock auto_lock(lock_);	229 base::AutoLock auto_lock(lock_);

230 return block_third_party_cookies_;	230 return block_third_party_cookies_;

231 }	231 }

OLD	NEW