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

Side by Side Diff: chrome/browser/signin/signin_manager_factory.cc

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix double registration in Chrome Frame test. 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/signin/signin_manager_factory.h" 5 #include "chrome/browser/signin/signin_manager_factory.h"
6 6
7 #include "chrome/browser/prefs/pref_service.h" 7 #include "chrome/browser/prefs/pref_registry_simple.h"
8 #include "chrome/browser/prefs/pref_service_syncable.h"
8 #include "chrome/browser/profiles/profile_dependency_manager.h" 9 #include "chrome/browser/profiles/profile_dependency_manager.h"
9 #include "chrome/browser/signin/signin_manager.h" 10 #include "chrome/browser/signin/signin_manager.h"
10 #include "chrome/browser/signin/token_service_factory.h" 11 #include "chrome/browser/signin/token_service_factory.h"
11 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 12 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
12 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
13 14
14 SigninManagerFactory::SigninManagerFactory() 15 SigninManagerFactory::SigninManagerFactory()
15 : ProfileKeyedServiceFactory("SigninManager", 16 : ProfileKeyedServiceFactory("SigninManager",
16 ProfileDependencyManager::GetInstance()) { 17 ProfileDependencyManager::GetInstance()) {
17 DependsOn(TokenServiceFactory::GetInstance()); 18 DependsOn(TokenServiceFactory::GetInstance());
(...skipping 27 matching lines...) Expand all
45 user_prefs->RegisterBooleanPref(prefs::kAutologinEnabled, true, 46 user_prefs->RegisterBooleanPref(prefs::kAutologinEnabled, true,
46 PrefServiceSyncable::UNSYNCABLE_PREF); 47 PrefServiceSyncable::UNSYNCABLE_PREF);
47 user_prefs->RegisterBooleanPref(prefs::kReverseAutologinEnabled, true, 48 user_prefs->RegisterBooleanPref(prefs::kReverseAutologinEnabled, true,
48 PrefServiceSyncable::UNSYNCABLE_PREF); 49 PrefServiceSyncable::UNSYNCABLE_PREF);
49 user_prefs->RegisterListPref(prefs::kReverseAutologinRejectedEmailList, 50 user_prefs->RegisterListPref(prefs::kReverseAutologinRejectedEmailList,
50 new ListValue, 51 new ListValue,
51 PrefServiceSyncable::UNSYNCABLE_PREF); 52 PrefServiceSyncable::UNSYNCABLE_PREF);
52 } 53 }
53 54
54 // static 55 // static
55 void SigninManagerFactory::RegisterPrefs(PrefServiceSimple* local_state) { 56 void SigninManagerFactory::RegisterPrefs(PrefRegistrySimple* registry) {
56 local_state->RegisterStringPref(prefs::kGoogleServicesUsernamePattern, ""); 57 registry->RegisterStringPref(prefs::kGoogleServicesUsernamePattern, "");
57 } 58 }
58 59
59 ProfileKeyedService* SigninManagerFactory::BuildServiceInstanceFor( 60 ProfileKeyedService* SigninManagerFactory::BuildServiceInstanceFor(
60 Profile* profile) const { 61 Profile* profile) const {
61 SigninManager* service = new SigninManager(); 62 SigninManager* service = new SigninManager();
62 service->Initialize(profile); 63 service->Initialize(profile);
63 return service; 64 return service;
64 } 65 }
OLDNEW
« no previous file with comments | « chrome/browser/signin/signin_manager_factory.h ('k') | chrome/browser/signin/signin_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698