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

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

Issue 8437002: Move BrowserThread to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A few updates. Created 9 years, 1 month 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/content_settings/content_settings_utils.h" 8 #include "chrome/browser/content_settings/content_settings_utils.h"
9 #include "chrome/browser/content_settings/host_content_settings_map.h" 9 #include "chrome/browser/content_settings/host_content_settings_map.h"
10 #include "chrome/browser/prefs/pref_service.h" 10 #include "chrome/browser/prefs/pref_service.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/profiles/profile_dependency_manager.h" 12 #include "chrome/browser/profiles/profile_dependency_manager.h"
13 #include "chrome/browser/profiles/profile_keyed_service.h" 13 #include "chrome/browser/profiles/profile_keyed_service.h"
14 #include "chrome/common/chrome_notification_types.h" 14 #include "chrome/common/chrome_notification_types.h"
15 #include "chrome/common/chrome_switches.h" 15 #include "chrome/common/chrome_switches.h"
16 #include "chrome/common/content_settings_pattern.h" 16 #include "chrome/common/content_settings_pattern.h"
17 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
18 #include "content/browser/user_metrics.h" 18 #include "content/browser/user_metrics.h"
19 #include "content/public/browser/browser_thread.h" 19 #include "content/public/browser/browser_thread.h"
20 #include "content/public/browser/notification_service.h" 20 #include "content/public/browser/notification_service.h"
21 #include "content/public/browser/notification_source.h" 21 #include "content/public/browser/notification_source.h"
22 #include "googleurl/src/gurl.h" 22 #include "googleurl/src/gurl.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"
25 25
26 using content::BrowserThread;
27
26 namespace { 28 namespace {
27 29
28 bool IsValidSetting(ContentSetting setting) { 30 bool IsValidSetting(ContentSetting setting) {
29 return (setting == CONTENT_SETTING_ALLOW || 31 return (setting == CONTENT_SETTING_ALLOW ||
30 setting == CONTENT_SETTING_SESSION_ONLY || 32 setting == CONTENT_SETTING_SESSION_ONLY ||
31 setting == CONTENT_SETTING_BLOCK); 33 setting == CONTENT_SETTING_BLOCK);
32 } 34 }
33 35
34 bool IsAllowed(ContentSetting setting) { 36 bool IsAllowed(ContentSetting setting) {
35 DCHECK(IsValidSetting(setting)); 37 DCHECK(IsValidSetting(setting));
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 void CookieSettings::RegisterUserPrefs(PrefService* prefs) { 243 void CookieSettings::RegisterUserPrefs(PrefService* prefs) {
242 prefs->RegisterBooleanPref(prefs::kBlockThirdPartyCookies, 244 prefs->RegisterBooleanPref(prefs::kBlockThirdPartyCookies,
243 false, 245 false,
244 PrefService::SYNCABLE_PREF); 246 PrefService::SYNCABLE_PREF);
245 } 247 }
246 248
247 bool CookieSettings::ShouldBlockThirdPartyCookies() const { 249 bool CookieSettings::ShouldBlockThirdPartyCookies() const {
248 base::AutoLock auto_lock(lock_); 250 base::AutoLock auto_lock(lock_);
249 return block_third_party_cookies_; 251 return block_third_party_cookies_;
250 } 252 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698