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

Side by Side Diff: chrome/browser/plugins/plugin_prefs_factory.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/plugins/plugin_prefs_factory.h" 5 #include "chrome/browser/plugins/plugin_prefs_factory.h"
6 6
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "chrome/browser/plugins/plugin_prefs.h" 9 #include "chrome/browser/plugins/plugin_prefs.h"
10 #include "chrome/browser/profiles/incognito_helpers.h" 10 #include "chrome/browser/profiles/incognito_helpers.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/common/chrome_paths.h" 12 #include "chrome/common/chrome_paths.h"
13 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
14 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h" 14 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"
15 #include "components/browser_context_keyed_service/browser_context_keyed_service .h" 15 #include "components/browser_context_keyed_service/browser_context_keyed_service .h"
16 #include "components/user_prefs/pref_registry_syncable.h" 16 #include "components/user_prefs/pref_registry_syncable.h"
17 17
18 // static 18 // static
19 PluginPrefsFactory* PluginPrefsFactory::GetInstance() { 19 PluginPrefsFactory* PluginPrefsFactory::GetInstance() {
20 return Singleton<PluginPrefsFactory>::get(); 20 return Singleton<PluginPrefsFactory>::get();
21 } 21 }
22 22
23 // static 23 // static
24 scoped_refptr<PluginPrefs> PluginPrefsFactory::GetPrefsForProfile( 24 scoped_refptr<PluginPrefs> PluginPrefsFactory::GetPrefsForProfile(
25 Profile* profile) { 25 Profile* profile) {
26 return static_cast<PluginPrefs*>( 26 return static_cast<PluginPrefs*>(
27 GetInstance()->GetServiceForProfile(profile, true).get()); 27 GetInstance()->GetServiceForBrowserContext(profile, true).get());
28 } 28 }
29 29
30 // static 30 // static
31 scoped_refptr<RefcountedProfileKeyedService> 31 scoped_refptr<RefcountedBrowserContextKeyedService>
32 PluginPrefsFactory::CreateForTestingProfile(content::BrowserContext* profile) { 32 PluginPrefsFactory::CreateForTestingProfile(content::BrowserContext* profile) {
33 return static_cast<PluginPrefs*>( 33 return static_cast<PluginPrefs*>(
34 GetInstance()->BuildServiceInstanceFor(profile).get()); 34 GetInstance()->BuildServiceInstanceFor(profile).get());
35 } 35 }
36 36
37 PluginPrefsFactory::PluginPrefsFactory() 37 PluginPrefsFactory::PluginPrefsFactory()
38 : RefcountedProfileKeyedServiceFactory( 38 : RefcountedBrowserContextKeyedServiceFactory(
39 "PluginPrefs", ProfileDependencyManager::GetInstance()) { 39 "PluginPrefs", BrowserContextDependencyManager::GetInstance()) {
40 } 40 }
41 41
42 PluginPrefsFactory::~PluginPrefsFactory() {} 42 PluginPrefsFactory::~PluginPrefsFactory() {}
43 43
44 scoped_refptr<RefcountedProfileKeyedService> 44 scoped_refptr<RefcountedBrowserContextKeyedService>
45 PluginPrefsFactory::BuildServiceInstanceFor( 45 PluginPrefsFactory::BuildServiceInstanceFor(
46 content::BrowserContext* context) const { 46 content::BrowserContext* context) const {
47 Profile* profile = static_cast<Profile*>(context); 47 Profile* profile = static_cast<Profile*>(context);
48 scoped_refptr<PluginPrefs> plugin_prefs(new PluginPrefs()); 48 scoped_refptr<PluginPrefs> plugin_prefs(new PluginPrefs());
49 plugin_prefs->set_profile(profile->GetOriginalProfile()); 49 plugin_prefs->set_profile(profile->GetOriginalProfile());
50 plugin_prefs->SetPrefs(profile->GetPrefs()); 50 plugin_prefs->SetPrefs(profile->GetPrefs());
51 return plugin_prefs; 51 return plugin_prefs;
52 } 52 }
53 53
54 void PluginPrefsFactory::RegisterUserPrefs( 54 void PluginPrefsFactory::RegisterUserPrefs(
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 87
88 content::BrowserContext* PluginPrefsFactory::GetBrowserContextToUse( 88 content::BrowserContext* PluginPrefsFactory::GetBrowserContextToUse(
89 content::BrowserContext* context) const { 89 content::BrowserContext* context) const {
90 return chrome::GetBrowserContextRedirectedInIncognito(context); 90 return chrome::GetBrowserContextRedirectedInIncognito(context);
91 } 91 }
92 92
93 bool PluginPrefsFactory::ServiceIsNULLWhileTesting() const { 93 bool PluginPrefsFactory::ServiceIsNULLWhileTesting() const {
94 return true; 94 return true;
95 } 95 }
96 96
97 bool PluginPrefsFactory::ServiceIsCreatedWithProfile() const { 97 bool PluginPrefsFactory::ServiceIsCreatedWithBrowserContext() const {
98 return true; 98 return true;
99 } 99 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698