| 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 "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_registry_syncable.h" |
| 10 #include "chrome/browser/prefs/pref_service.h" | 11 #include "chrome/browser/prefs/pref_service.h" |
| 11 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
| 12 #include "chrome/browser/profiles/profile_dependency_manager.h" | 13 #include "chrome/browser/profiles/profile_dependency_manager.h" |
| 13 #include "chrome/browser/profiles/profile_keyed_service.h" | 14 #include "chrome/browser/profiles/profile_keyed_service.h" |
| 14 #include "chrome/common/chrome_notification_types.h" | 15 #include "chrome/common/chrome_notification_types.h" |
| 15 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
| 16 #include "chrome/common/content_settings_pattern.h" | 17 #include "chrome/common/content_settings_pattern.h" |
| 17 #include "chrome/common/pref_names.h" | 18 #include "chrome/common/pref_names.h" |
| 18 #include "content/public/browser/browser_thread.h" | 19 #include "content/public/browser/browser_thread.h" |
| 19 #include "content/public/browser/notification_service.h" | 20 #include "content/public/browser/notification_service.h" |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 | 59 |
| 59 CookieSettings::Factory::Factory() | 60 CookieSettings::Factory::Factory() |
| 60 : RefcountedProfileKeyedServiceFactory( | 61 : RefcountedProfileKeyedServiceFactory( |
| 61 "CookieSettings", | 62 "CookieSettings", |
| 62 ProfileDependencyManager::GetInstance()) { | 63 ProfileDependencyManager::GetInstance()) { |
| 63 } | 64 } |
| 64 | 65 |
| 65 CookieSettings::Factory::~Factory() {} | 66 CookieSettings::Factory::~Factory() {} |
| 66 | 67 |
| 67 void CookieSettings::Factory::RegisterUserPrefs( | 68 void CookieSettings::Factory::RegisterUserPrefs( |
| 68 PrefServiceSyncable* user_prefs) { | 69 PrefRegistrySyncable* registry) { |
| 69 user_prefs->RegisterBooleanPref(prefs::kBlockThirdPartyCookies, | 70 registry->RegisterBooleanPref(prefs::kBlockThirdPartyCookies, |
| 70 false, | 71 false, |
| 71 PrefServiceSyncable::SYNCABLE_PREF); | 72 PrefRegistrySyncable::SYNCABLE_PREF); |
| 72 } | 73 } |
| 73 | 74 |
| 74 bool CookieSettings::Factory::ServiceRedirectedInIncognito() const { | 75 bool CookieSettings::Factory::ServiceRedirectedInIncognito() const { |
| 75 return true; | 76 return true; |
| 76 } | 77 } |
| 77 | 78 |
| 78 scoped_refptr<RefcountedProfileKeyedService> | 79 scoped_refptr<RefcountedProfileKeyedService> |
| 79 CookieSettings::Factory::BuildServiceInstanceFor(Profile* profile) const { | 80 CookieSettings::Factory::BuildServiceInstanceFor(Profile* profile) const { |
| 80 return new CookieSettings(profile->GetHostContentSettingsMap(), | 81 return new CookieSettings(profile->GetHostContentSettingsMap(), |
| 81 profile->GetPrefs()); | 82 profile->GetPrefs()); |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 | 215 |
| 215 base::AutoLock auto_lock(lock_); | 216 base::AutoLock auto_lock(lock_); |
| 216 block_third_party_cookies_ = pref_change_registrar_.prefs()->GetBoolean( | 217 block_third_party_cookies_ = pref_change_registrar_.prefs()->GetBoolean( |
| 217 prefs::kBlockThirdPartyCookies); | 218 prefs::kBlockThirdPartyCookies); |
| 218 } | 219 } |
| 219 | 220 |
| 220 bool CookieSettings::ShouldBlockThirdPartyCookies() const { | 221 bool CookieSettings::ShouldBlockThirdPartyCookies() const { |
| 221 base::AutoLock auto_lock(lock_); | 222 base::AutoLock auto_lock(lock_); |
| 222 return block_third_party_cookies_; | 223 return block_third_party_cookies_; |
| 223 } | 224 } |
| OLD | NEW |