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/browser_process.h" |
8 #include "chrome/browser/profiles/profile_dependency_manager.h" | 9 #include "chrome/browser/profiles/profile_dependency_manager.h" |
9 #include "chrome/browser/signin/chrome_signin_manager_delegate.h" | 10 #include "chrome/browser/signin/chrome_signin_manager_delegate.h" |
10 #include "chrome/browser/signin/signin_manager.h" | 11 #include "chrome/browser/signin/signin_manager.h" |
11 #include "chrome/browser/signin/token_service_factory.h" | 12 #include "chrome/browser/signin/token_service_factory.h" |
12 #include "chrome/browser/ui/global_error/global_error_service_factory.h" | 13 #include "chrome/browser/ui/global_error/global_error_service_factory.h" |
13 #include "chrome/common/pref_names.h" | 14 #include "chrome/common/pref_names.h" |
14 #include "components/user_prefs/pref_registry_syncable.h" | 15 #include "components/user_prefs/pref_registry_syncable.h" |
15 | 16 |
16 SigninManagerFactory::SigninManagerFactory() | 17 SigninManagerFactory::SigninManagerFactory() |
17 : ProfileKeyedServiceFactory("SigninManager", | 18 : ProfileKeyedServiceFactory("SigninManager", |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 content::BrowserContext* context) const { | 90 content::BrowserContext* context) const { |
90 SigninManagerBase* service = NULL; | 91 SigninManagerBase* service = NULL; |
91 Profile* profile = static_cast<Profile*>(context); | 92 Profile* profile = static_cast<Profile*>(context); |
92 #if defined(OS_CHROMEOS) | 93 #if defined(OS_CHROMEOS) |
93 service = new SigninManagerBase(); | 94 service = new SigninManagerBase(); |
94 #else | 95 #else |
95 service = new SigninManager( | 96 service = new SigninManager( |
96 scoped_ptr<SigninManagerDelegate>( | 97 scoped_ptr<SigninManagerDelegate>( |
97 new ChromeSigninManagerDelegate(profile))); | 98 new ChromeSigninManagerDelegate(profile))); |
98 #endif | 99 #endif |
99 service->Initialize(profile); | 100 service->Initialize(profile, g_browser_process->local_state()); |
100 return service; | 101 return service; |
101 } | 102 } |
OLD | NEW |