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

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

Issue 15517005: Remove references to Profile from browser_context_keyed_service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase & style Created 7 years, 7 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
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 "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/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"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 setting == CONTENT_SETTING_SESSION_ONLY); 43 setting == CONTENT_SETTING_SESSION_ONLY);
44 } 44 }
45 45
46 } // namespace 46 } // namespace
47 47
48 // static 48 // static
49 scoped_refptr<CookieSettings> CookieSettings::Factory::GetForProfile( 49 scoped_refptr<CookieSettings> CookieSettings::Factory::GetForProfile(
50 Profile* profile) { 50 Profile* profile) {
51 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 51 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
52 return static_cast<CookieSettings*>( 52 return static_cast<CookieSettings*>(
53 GetInstance()->GetServiceForProfile(profile, true).get()); 53 GetInstance()->GetServiceForBrowserContext(profile, true).get());
54 } 54 }
55 55
56 // static 56 // static
57 CookieSettings::Factory* CookieSettings::Factory::GetInstance() { 57 CookieSettings::Factory* CookieSettings::Factory::GetInstance() {
58 return Singleton<CookieSettings::Factory>::get(); 58 return Singleton<CookieSettings::Factory>::get();
59 } 59 }
60 60
61 CookieSettings::Factory::Factory() 61 CookieSettings::Factory::Factory()
62 : RefcountedProfileKeyedServiceFactory( 62 : RefcountedBrowserContextKeyedServiceFactory(
63 "CookieSettings", 63 "CookieSettings",
64 ProfileDependencyManager::GetInstance()) { 64 BrowserContextDependencyManager::GetInstance()) {
65 } 65 }
66 66
67 CookieSettings::Factory::~Factory() {} 67 CookieSettings::Factory::~Factory() {}
68 68
69 void CookieSettings::Factory::RegisterUserPrefs( 69 void CookieSettings::Factory::RegisterUserPrefs(
70 user_prefs::PrefRegistrySyncable* registry) { 70 user_prefs::PrefRegistrySyncable* registry) {
71 registry->RegisterBooleanPref( 71 registry->RegisterBooleanPref(
72 prefs::kBlockThirdPartyCookies, 72 prefs::kBlockThirdPartyCookies,
73 false, 73 false,
74 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 74 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
75 } 75 }
76 76
77 content::BrowserContext* CookieSettings::Factory::GetBrowserContextToUse( 77 content::BrowserContext* CookieSettings::Factory::GetBrowserContextToUse(
78 content::BrowserContext* context) const { 78 content::BrowserContext* context) const {
79 return chrome::GetBrowserContextRedirectedInIncognito(context); 79 return chrome::GetBrowserContextRedirectedInIncognito(context);
80 } 80 }
81 81
82 scoped_refptr<RefcountedProfileKeyedService> 82 scoped_refptr<RefcountedBrowserContextKeyedService>
83 CookieSettings::Factory::BuildServiceInstanceFor( 83 CookieSettings::Factory::BuildServiceInstanceFor(
84 content::BrowserContext* context) const { 84 content::BrowserContext* context) const {
85 Profile* profile = static_cast<Profile*>(context); 85 Profile* profile = static_cast<Profile*>(context);
86 return new CookieSettings(profile->GetHostContentSettingsMap(), 86 return new CookieSettings(profile->GetHostContentSettingsMap(),
87 profile->GetPrefs()); 87 profile->GetPrefs());
88 } 88 }
89 89
90 CookieSettings::CookieSettings( 90 CookieSettings::CookieSettings(
91 HostContentSettingsMap* host_content_settings_map, 91 HostContentSettingsMap* host_content_settings_map,
92 PrefService* prefs) 92 PrefService* prefs)
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698