diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-15 14:52:10 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-15 14:52:10 +0000 |
| commit | 498e0a6eb258f10ad76039c3028d0f7a4ad365e4 (patch) | |
| tree | 25b43d36863da3a25c2e4ae2bcb33dfe4c78bef8 /chrome/browser/plugin_prefs_factory.cc | |
| parent | 977268f00da9e10a906c0cf37984b6c9a5b768c0 (diff) | |
| download | chromium_src-498e0a6eb258f10ad76039c3028d0f7a4ad365e4.zip chromium_src-498e0a6eb258f10ad76039c3028d0f7a4ad365e4.tar.gz chromium_src-498e0a6eb258f10ad76039c3028d0f7a4ad365e4.tar.bz2 | |
Convert PluginPrefs to RefcountedProfileKeyedService.
BUG=77155
TEST=compiles
Review URL: http://codereview.chromium.org/9363040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122081 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_prefs_factory.cc')
| -rw-r--r-- | chrome/browser/plugin_prefs_factory.cc | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/chrome/browser/plugin_prefs_factory.cc b/chrome/browser/plugin_prefs_factory.cc index 8671a90..d16ae47 100644 --- a/chrome/browser/plugin_prefs_factory.cc +++ b/chrome/browser/plugin_prefs_factory.cc @@ -13,53 +13,38 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/pref_names.h" -namespace { - -} // namespace - -PluginPrefsWrapper::PluginPrefsWrapper(scoped_refptr<PluginPrefs> plugin_prefs) - : plugin_prefs_(plugin_prefs) { -} - -PluginPrefsWrapper::~PluginPrefsWrapper() {} - -void PluginPrefsWrapper::Shutdown() { - plugin_prefs_->ShutdownOnUIThread(); -} - // static PluginPrefsFactory* PluginPrefsFactory::GetInstance() { return Singleton<PluginPrefsFactory>::get(); } -PluginPrefsWrapper* PluginPrefsFactory::GetWrapperForProfile( - Profile* profile) { - return static_cast<PluginPrefsWrapper*>(GetServiceForProfile(profile, true)); -} - // static -ProfileKeyedBase* PluginPrefsFactory::CreateWrapperForProfile( +ProfileKeyedBase* PluginPrefsFactory::CreatePrefsForProfile( Profile* profile) { return GetInstance()->BuildServiceInstanceFor(profile); } +PluginPrefs* PluginPrefsFactory::GetPrefsForProfile(Profile* profile) { + return static_cast<PluginPrefs*>(GetBaseForProfile(profile, true)); +} + void PluginPrefsFactory::ForceRegisterPrefsForTest(PrefService* prefs) { RegisterUserPrefs(prefs); } PluginPrefsFactory::PluginPrefsFactory() - : ProfileKeyedServiceFactory("PluginPrefs", - ProfileDependencyManager::GetInstance()) { + : RefcountedProfileKeyedServiceFactory( + "PluginPrefs", ProfileDependencyManager::GetInstance()) { } PluginPrefsFactory::~PluginPrefsFactory() {} -ProfileKeyedService* PluginPrefsFactory::BuildServiceInstanceFor( +RefcountedProfileKeyedService* PluginPrefsFactory::BuildServiceInstanceFor( Profile* profile) const { - scoped_refptr<PluginPrefs> plugin_prefs(new PluginPrefs()); + PluginPrefs* plugin_prefs = new PluginPrefs(); plugin_prefs->set_profile(profile->GetOriginalProfile()); plugin_prefs->SetPrefs(profile->GetPrefs()); - return new PluginPrefsWrapper(plugin_prefs); + return plugin_prefs; } void PluginPrefsFactory::RegisterUserPrefs(PrefService* prefs) { |