chrome/browser/content_settings/cookie_settings.cc - Issue 18640003: Updates some includes of chrome_notification_types.h

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

Issue 18640003: Updates some includes of chrome_notification_types.h (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/content_settings/content_settings_pref_provider.cc ('k') | chrome/browser/content_settings/host_content_settings_map.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/command_line.h"	7 #include "base/command_line.h"

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

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

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

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

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

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

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

14 #include "chrome/common/chrome_switches.h"	14 #include "chrome/common/chrome_switches.h"

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

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

17 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"	17 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"

18 #include "components/browser_context_keyed_service/browser_context_keyed_service .h"	18 #include "components/browser_context_keyed_service/browser_context_keyed_service .h"

19 #include "components/user_prefs/pref_registry_syncable.h"	19 #include "components/user_prefs/pref_registry_syncable.h"

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

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

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

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

(...skipping 203 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
227	227

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

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

230 prefs::kBlockThirdPartyCookies);	230 prefs::kBlockThirdPartyCookies);

231 }	231 }

232	232

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

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

235 return block_third_party_cookies_;	235 return block_third_party_cookies_;

236 }	236 }

OLD	NEW