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

Side by Side Diff: ios/chrome/browser/signin/account_reconcilor_factory.cc

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ToT Created 5 years, 3 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "ios/chrome/browser/signin/account_reconcilor_factory.h" 5 #include "ios/chrome/browser/signin/account_reconcilor_factory.h"
6 6
7 #include "base/memory/singleton.h" 7 #include "base/memory/singleton.h"
8 #include "components/keyed_service/ios/browser_state_dependency_manager.h" 8 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
9 #include "components/signin/core/browser/account_reconcilor.h" 9 #include "components/signin/core/browser/account_reconcilor.h"
10 #include "ios/chrome/browser/signin/gaia_cookie_manager_service_factory.h" 10 #include "ios/chrome/browser/signin/gaia_cookie_manager_service_factory.h"
(...skipping 18 matching lines...) Expand all
29 29
30 // static 30 // static
31 AccountReconcilor* AccountReconcilorFactory::GetForBrowserState( 31 AccountReconcilor* AccountReconcilorFactory::GetForBrowserState(
32 ios::ChromeBrowserState* browser_state) { 32 ios::ChromeBrowserState* browser_state) {
33 return static_cast<AccountReconcilor*>( 33 return static_cast<AccountReconcilor*>(
34 GetInstance()->GetServiceForBrowserState(browser_state, true)); 34 GetInstance()->GetServiceForBrowserState(browser_state, true));
35 } 35 }
36 36
37 // static 37 // static
38 AccountReconcilorFactory* AccountReconcilorFactory::GetInstance() { 38 AccountReconcilorFactory* AccountReconcilorFactory::GetInstance() {
39 return Singleton<AccountReconcilorFactory>::get(); 39 return base::Singleton<AccountReconcilorFactory>::get();
40 } 40 }
41 41
42 scoped_ptr<KeyedService> AccountReconcilorFactory::BuildServiceInstanceFor( 42 scoped_ptr<KeyedService> AccountReconcilorFactory::BuildServiceInstanceFor(
43 web::BrowserState* context) const { 43 web::BrowserState* context) const {
44 ios::ChromeBrowserState* chrome_browser_state = 44 ios::ChromeBrowserState* chrome_browser_state =
45 ios::ChromeBrowserState::FromBrowserState(context); 45 ios::ChromeBrowserState::FromBrowserState(context);
46 scoped_ptr<AccountReconcilor> reconcilor(new AccountReconcilor( 46 scoped_ptr<AccountReconcilor> reconcilor(new AccountReconcilor(
47 OAuth2TokenServiceFactory::GetForBrowserState(chrome_browser_state), 47 OAuth2TokenServiceFactory::GetForBrowserState(chrome_browser_state),
48 SigninManagerFactory::GetForBrowserState(chrome_browser_state), 48 SigninManagerFactory::GetForBrowserState(chrome_browser_state),
49 SigninClientFactory::GetForBrowserState(chrome_browser_state), 49 SigninClientFactory::GetForBrowserState(chrome_browser_state),
50 GaiaCookieManagerServiceFactory::GetForBrowserState( 50 GaiaCookieManagerServiceFactory::GetForBrowserState(
51 chrome_browser_state))); 51 chrome_browser_state)));
52 reconcilor->Initialize(true /* start_reconcile_if_tokens_available */); 52 reconcilor->Initialize(true /* start_reconcile_if_tokens_available */);
53 return reconcilor.Pass(); 53 return reconcilor.Pass();
54 } 54 }
55 55
56 } // namespace ios 56 } // namespace ios
OLDNEW
« no previous file with comments | « ios/chrome/browser/signin/account_reconcilor_factory.h ('k') | ios/chrome/browser/signin/account_tracker_service_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698