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

Side by Side Diff: chrome/browser/policy/cloud/user_policy_signin_service_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/policy/cloud/user_policy_signin_service_factory.h" 5 #include "chrome/browser/policy/cloud/user_policy_signin_service_factory.h"
6 6
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" 8 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
9 #include "chrome/browser/policy/cloud/user_policy_signin_service.h" 9 #include "chrome/browser/policy/cloud/user_policy_signin_service.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/signin/signin_manager_factory.h" 11 #include "chrome/browser/signin/signin_manager_factory.h"
12 #include "chrome/browser/signin/token_service_factory.h" 12 #include "chrome/browser/signin/token_service_factory.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/user_prefs/pref_registry_syncable.h" 15 #include "components/user_prefs/pref_registry_syncable.h"
16 16
17 namespace policy { 17 namespace policy {
18 18
19 UserPolicySigninServiceFactory::UserPolicySigninServiceFactory() 19 UserPolicySigninServiceFactory::UserPolicySigninServiceFactory()
20 : ProfileKeyedServiceFactory("UserPolicySigninService", 20 : BrowserContextKeyedServiceFactory(
21 ProfileDependencyManager::GetInstance()) { 21 "UserPolicySigninService",
22 BrowserContextDependencyManager::GetInstance()) {
22 DependsOn(TokenServiceFactory::GetInstance()); 23 DependsOn(TokenServiceFactory::GetInstance());
23 DependsOn(SigninManagerFactory::GetInstance()); 24 DependsOn(SigninManagerFactory::GetInstance());
24 DependsOn(UserCloudPolicyManagerFactory::GetInstance()); 25 DependsOn(UserCloudPolicyManagerFactory::GetInstance());
25 } 26 }
26 27
27 UserPolicySigninServiceFactory::~UserPolicySigninServiceFactory() {} 28 UserPolicySigninServiceFactory::~UserPolicySigninServiceFactory() {}
28 29
29 // static 30 // static
30 UserPolicySigninService* UserPolicySigninServiceFactory::GetForProfile( 31 UserPolicySigninService* UserPolicySigninServiceFactory::GetForProfile(
31 Profile* profile) { 32 Profile* profile) {
32 return static_cast<UserPolicySigninService*>( 33 return static_cast<UserPolicySigninService*>(
33 GetInstance()->GetServiceForProfile(profile, true)); 34 GetInstance()->GetServiceForBrowserContext(profile, true));
34 } 35 }
35 36
36 // static 37 // static
37 UserPolicySigninServiceFactory* UserPolicySigninServiceFactory::GetInstance() { 38 UserPolicySigninServiceFactory* UserPolicySigninServiceFactory::GetInstance() {
38 return Singleton<UserPolicySigninServiceFactory>::get(); 39 return Singleton<UserPolicySigninServiceFactory>::get();
39 } 40 }
40 41
41 ProfileKeyedService* UserPolicySigninServiceFactory::BuildServiceInstanceFor( 42 BrowserContextKeyedService*
43 UserPolicySigninServiceFactory::BuildServiceInstanceFor(
42 content::BrowserContext* profile) const { 44 content::BrowserContext* profile) const {
43 return new UserPolicySigninService(static_cast<Profile*>(profile)); 45 return new UserPolicySigninService(static_cast<Profile*>(profile));
44 } 46 }
45 47
46 bool UserPolicySigninServiceFactory::ServiceIsCreatedWithProfile() const { 48 bool
49 UserPolicySigninServiceFactory::ServiceIsCreatedWithBrowserContext() const {
47 // Create this object when the profile is created so it can track any 50 // Create this object when the profile is created so it can track any
48 // user signin activity. 51 // user signin activity.
49 return true; 52 return true;
50 } 53 }
51 54
52 void UserPolicySigninServiceFactory::RegisterUserPrefs( 55 void UserPolicySigninServiceFactory::RegisterUserPrefs(
53 user_prefs::PrefRegistrySyncable* user_prefs) { 56 user_prefs::PrefRegistrySyncable* user_prefs) {
54 user_prefs->RegisterBooleanPref( 57 user_prefs->RegisterBooleanPref(
55 prefs::kDisableCloudPolicyOnSignin, 58 prefs::kDisableCloudPolicyOnSignin,
56 false, 59 false,
57 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 60 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
58 } 61 }
59 62
60 } // namespace policy 63 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698