| OLD | NEW | 
|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/account_reconcilor_factory.h" | 5 #include "chrome/browser/signin/account_reconcilor_factory.h" | 
| 6 | 6 | 
| 7 #include "chrome/browser/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" | 
| 8 #include "chrome/browser/signin/chrome_signin_client_factory.h" | 8 #include "chrome/browser/signin/chrome_signin_client_factory.h" | 
| 9 #include "chrome/browser/signin/gaia_cookie_manager_service_factory.h" | 9 #include "chrome/browser/signin/gaia_cookie_manager_service_factory.h" | 
| 10 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 10 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 
| (...skipping 14 matching lines...) Expand all  Loading... | 
| 25 | 25 | 
| 26 // static | 26 // static | 
| 27 AccountReconcilor* AccountReconcilorFactory::GetForProfile( | 27 AccountReconcilor* AccountReconcilorFactory::GetForProfile( | 
| 28     Profile* profile) { | 28     Profile* profile) { | 
| 29   return static_cast<AccountReconcilor*>( | 29   return static_cast<AccountReconcilor*>( | 
| 30       GetInstance()->GetServiceForBrowserContext(profile, true)); | 30       GetInstance()->GetServiceForBrowserContext(profile, true)); | 
| 31 } | 31 } | 
| 32 | 32 | 
| 33 // static | 33 // static | 
| 34 AccountReconcilorFactory* AccountReconcilorFactory::GetInstance() { | 34 AccountReconcilorFactory* AccountReconcilorFactory::GetInstance() { | 
| 35   return Singleton<AccountReconcilorFactory>::get(); | 35   return base::Singleton<AccountReconcilorFactory>::get(); | 
| 36 } | 36 } | 
| 37 | 37 | 
| 38 KeyedService* AccountReconcilorFactory::BuildServiceInstanceFor( | 38 KeyedService* AccountReconcilorFactory::BuildServiceInstanceFor( | 
| 39     content::BrowserContext* context) const { | 39     content::BrowserContext* context) const { | 
| 40   Profile* profile = Profile::FromBrowserContext(context); | 40   Profile* profile = Profile::FromBrowserContext(context); | 
| 41   AccountReconcilor* reconcilor = new AccountReconcilor( | 41   AccountReconcilor* reconcilor = new AccountReconcilor( | 
| 42       ProfileOAuth2TokenServiceFactory::GetForProfile(profile), | 42       ProfileOAuth2TokenServiceFactory::GetForProfile(profile), | 
| 43       SigninManagerFactory::GetForProfile(profile), | 43       SigninManagerFactory::GetForProfile(profile), | 
| 44       ChromeSigninClientFactory::GetForProfile(profile), | 44       ChromeSigninClientFactory::GetForProfile(profile), | 
| 45       GaiaCookieManagerServiceFactory::GetForProfile(profile)); | 45       GaiaCookieManagerServiceFactory::GetForProfile(profile)); | 
| 46   reconcilor->Initialize(true /* start_reconcile_if_tokens_available */); | 46   reconcilor->Initialize(true /* start_reconcile_if_tokens_available */); | 
| 47   return reconcilor; | 47   return reconcilor; | 
| 48 } | 48 } | 
| 49 | 49 | 
| 50 void AccountReconcilorFactory::RegisterProfilePrefs( | 50 void AccountReconcilorFactory::RegisterProfilePrefs( | 
| 51     user_prefs::PrefRegistrySyncable* registry) { | 51     user_prefs::PrefRegistrySyncable* registry) { | 
| 52 } | 52 } | 
| OLD | NEW | 
|---|