summaryrefslogtreecommitdiffstats
path: root/chrome/browser/content_settings
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-26 18:09:02 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-26 18:09:02 +0000
commitc7fa4367503441fefc7da332b0bddd329ceea9dd (patch)
treeb1469aab9cb635f9f00096b7f746047272474690 /chrome/browser/content_settings
parentaca70615b08a5d741e5a10b91c8746e74d66f897 (diff)
downloadchromium_src-c7fa4367503441fefc7da332b0bddd329ceea9dd.zip
chromium_src-c7fa4367503441fefc7da332b0bddd329ceea9dd.tar.gz
chromium_src-c7fa4367503441fefc7da332b0bddd329ceea9dd.tar.bz2
[components] Switch {RefCounted}ProfileKeyedService to use BrowserContext
instead of Profile. This will help move it out of chrome. BUG=227219 Review URL: https://codereview.chromium.org/14141006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196777 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_settings')
-rw-r--r--chrome/browser/content_settings/cookie_settings.cc4
-rw-r--r--chrome/browser/content_settings/cookie_settings.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/content_settings/cookie_settings.cc b/chrome/browser/content_settings/cookie_settings.cc
index e0b1ff6..9c6e6f0 100644
--- a/chrome/browser/content_settings/cookie_settings.cc
+++ b/chrome/browser/content_settings/cookie_settings.cc
@@ -77,7 +77,9 @@ bool CookieSettings::Factory::ServiceRedirectedInIncognito() const {
}
scoped_refptr<RefcountedProfileKeyedService>
-CookieSettings::Factory::BuildServiceInstanceFor(Profile* profile) const {
+CookieSettings::Factory::BuildServiceInstanceFor(
+ content::BrowserContext* context) const {
+ Profile* profile = static_cast<Profile*>(context);
return new CookieSettings(profile->GetHostContentSettingsMap(),
profile->GetPrefs());
}
diff --git a/chrome/browser/content_settings/cookie_settings.h b/chrome/browser/content_settings/cookie_settings.h
index 4505db3..f3fb36c 100644
--- a/chrome/browser/content_settings/cookie_settings.h
+++ b/chrome/browser/content_settings/cookie_settings.h
@@ -123,7 +123,8 @@ class CookieSettings
virtual void RegisterUserPrefs(PrefRegistrySyncable* registry) OVERRIDE;
virtual bool ServiceRedirectedInIncognito() const OVERRIDE;
virtual scoped_refptr<RefcountedProfileKeyedService>
- BuildServiceInstanceFor(Profile* profile) const OVERRIDE;
+ BuildServiceInstanceFor(
+ content::BrowserContext* context) const OVERRIDE;
};
private: