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

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

Issue 372033002: Change semantics of newProfileManagement() to accountConsistency() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix profile_chooser_controller_test Created 6 years, 5 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 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() &&
23 switches::IsEnableAccountConsistency())
23 account_reconcilor = AccountReconcilorFactory::GetForProfile(profile); 24 account_reconcilor = AccountReconcilorFactory::GetForProfile(profile);
24 25
25 return scoped_ptr<SigninTracker>(new SigninTracker( 26 return scoped_ptr<SigninTracker>(new SigninTracker(
26 ProfileOAuth2TokenServiceFactory::GetForProfile(profile), 27 ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
27 SigninManagerFactory::GetForProfile(profile), 28 SigninManagerFactory::GetForProfile(profile),
28 account_reconcilor, 29 account_reconcilor,
29 ChromeSigninClientFactory::GetForProfile(profile), 30 ChromeSigninClientFactory::GetForProfile(profile),
30 observer)); 31 observer));
31 } 32 }
OLDNEW
« no previous file with comments | « chrome/browser/signin/signin_header_helper.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698