Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_tracker_factory.h" | 5 #include "chrome/browser/signin/signin_tracker_factory.h" |
| 6 | 6 |
| 7 #include "chrome/browser/signin/account_reconcilor_factory.h" | 7 #include "chrome/browser/signin/account_reconcilor_factory.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/profile_oauth2_token_service_factory.h" | 9 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
| 10 #include "chrome/browser/signin/signin_manager_factory.h" | 10 #include "chrome/browser/signin/signin_manager_factory.h" |
| 11 #include "components/signin/core/common/profile_management_switches.h" | 11 #include "components/signin/core/common/profile_management_switches.h" |
| 12 | 12 |
| 13 SigninTrackerFactory::SigninTrackerFactory() {} | 13 SigninTrackerFactory::SigninTrackerFactory() {} |
| 14 SigninTrackerFactory::~SigninTrackerFactory() {} | 14 SigninTrackerFactory::~SigninTrackerFactory() {} |
| 15 | 15 |
| 16 // static | 16 // static |
| 17 scoped_ptr<SigninTracker> SigninTrackerFactory::CreateForProfile( | 17 scoped_ptr<SigninTracker> SigninTrackerFactory::CreateForProfile( |
| 18 Profile* profile, | 18 Profile* profile, |
| 19 SigninTracker::Observer* observer) { | 19 SigninTracker::Observer* observer) { |
| 20 // Determine whether to use the AccountReconcilor. | 20 // Determine whether to use the AccountReconcilor. |
| 21 AccountReconcilor* account_reconcilor = NULL; | 21 AccountReconcilor* account_reconcilor = NULL; |
| 22 if (!switches::IsEnableWebBasedSignin() && switches::IsNewProfileManagement()) | 22 if (!switches::IsEnableWebBasedSignin()) |
|
guohui
2014/07/07 21:06:57
so we want to always create an account reconcilor
Mike Lerman
2014/07/08 12:30:48
I removed the check for the NewProfileManagement f
| |
| 23 account_reconcilor = AccountReconcilorFactory::GetForProfile(profile); | 23 account_reconcilor = AccountReconcilorFactory::GetForProfile(profile); |
| 24 | 24 |
| 25 return scoped_ptr<SigninTracker>(new SigninTracker( | 25 return scoped_ptr<SigninTracker>(new SigninTracker( |
| 26 ProfileOAuth2TokenServiceFactory::GetForProfile(profile), | 26 ProfileOAuth2TokenServiceFactory::GetForProfile(profile), |
| 27 SigninManagerFactory::GetForProfile(profile), | 27 SigninManagerFactory::GetForProfile(profile), |
| 28 account_reconcilor, | 28 account_reconcilor, |
| 29 ChromeSigninClientFactory::GetForProfile(profile), | 29 ChromeSigninClientFactory::GetForProfile(profile), |
| 30 observer)); | 30 observer)); |
| 31 } | 31 } |
| OLD | NEW |