| OLD | NEW |
| 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 "base/prefs/pref_registry_simple.h" | 7 #include "base/prefs/pref_registry_simple.h" |
| 8 #include "chrome/browser/profiles/profile_dependency_manager.h" | 8 #include "chrome/browser/profiles/profile_dependency_manager.h" |
| 9 #include "chrome/browser/signin/signin_manager.h" | 9 #include "chrome/browser/signin/signin_manager.h" |
| 10 #include "chrome/browser/signin/token_service_factory.h" | 10 #include "chrome/browser/signin/token_service_factory.h" |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 PrefRegistrySyncable::UNSYNCABLE_PREF); | 71 PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 72 } | 72 } |
| 73 | 73 |
| 74 // static | 74 // static |
| 75 void SigninManagerFactory::RegisterPrefs(PrefRegistrySimple* registry) { | 75 void SigninManagerFactory::RegisterPrefs(PrefRegistrySimple* registry) { |
| 76 registry->RegisterStringPref(prefs::kGoogleServicesUsernamePattern, | 76 registry->RegisterStringPref(prefs::kGoogleServicesUsernamePattern, |
| 77 std::string()); | 77 std::string()); |
| 78 } | 78 } |
| 79 | 79 |
| 80 ProfileKeyedService* SigninManagerFactory::BuildServiceInstanceFor( | 80 ProfileKeyedService* SigninManagerFactory::BuildServiceInstanceFor( |
| 81 Profile* profile) const { | 81 content::BrowserContext* profile) const { |
| 82 | |
| 83 SigninManagerBase* service = NULL; | 82 SigninManagerBase* service = NULL; |
| 84 #if defined(OS_CHROMEOS) | 83 #if defined(OS_CHROMEOS) |
| 85 service = new SigninManagerBase(); | 84 service = new SigninManagerBase(); |
| 86 #else | 85 #else |
| 87 service = new SigninManager(); | 86 service = new SigninManager(); |
| 88 #endif | 87 #endif |
| 89 | 88 service->Initialize(static_cast<Profile*>(profile)); |
| 90 service->Initialize(profile); | |
| 91 return service; | 89 return service; |
| 92 } | 90 } |
| OLD | NEW |