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

Side by Side Diff: chrome/browser/policy/user_policy_signin_service_factory.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again; base::File changes conflicted. Created 7 years, 10 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/user_policy_signin_service_factory.h" 5 #include "chrome/browser/policy/user_policy_signin_service_factory.h"
6 6
7 #include "chrome/browser/policy/user_cloud_policy_manager_factory.h" 7 #include "chrome/browser/policy/user_cloud_policy_manager_factory.h"
8 #include "chrome/browser/policy/user_policy_signin_service.h" 8 #include "chrome/browser/policy/user_policy_signin_service.h"
9 #include "chrome/browser/prefs/pref_registry_syncable.h"
9 #include "chrome/browser/prefs/pref_service.h" 10 #include "chrome/browser/prefs/pref_service.h"
10 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/profiles/profile_dependency_manager.h" 12 #include "chrome/browser/profiles/profile_dependency_manager.h"
12 #include "chrome/browser/signin/signin_manager_factory.h" 13 #include "chrome/browser/signin/signin_manager_factory.h"
13 #include "chrome/browser/signin/token_service_factory.h" 14 #include "chrome/browser/signin/token_service_factory.h"
14 #include "chrome/common/pref_names.h" 15 #include "chrome/common/pref_names.h"
15 16
16 namespace policy { 17 namespace policy {
17 18
18 UserPolicySigninServiceFactory::UserPolicySigninServiceFactory() 19 UserPolicySigninServiceFactory::UserPolicySigninServiceFactory()
(...skipping 23 matching lines...) Expand all
42 return new UserPolicySigninService(profile); 43 return new UserPolicySigninService(profile);
43 } 44 }
44 45
45 bool UserPolicySigninServiceFactory::ServiceIsCreatedWithProfile() const { 46 bool UserPolicySigninServiceFactory::ServiceIsCreatedWithProfile() const {
46 // Create this object when the profile is created so it can track any 47 // Create this object when the profile is created so it can track any
47 // user signin activity. 48 // user signin activity.
48 return true; 49 return true;
49 } 50 }
50 51
51 void UserPolicySigninServiceFactory::RegisterUserPrefs( 52 void UserPolicySigninServiceFactory::RegisterUserPrefs(
52 PrefServiceSyncable* user_prefs) { 53 PrefRegistrySyncable* user_prefs) {
53 user_prefs->RegisterBooleanPref(prefs::kDisableCloudPolicyOnSignin, 54 user_prefs->RegisterBooleanPref(prefs::kDisableCloudPolicyOnSignin,
54 false, PrefServiceSyncable::UNSYNCABLE_PREF); 55 false, PrefRegistrySyncable::UNSYNCABLE_PREF);
55 } 56 }
56 57
57 } // namespace policy 58 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698