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

Side by Side Diff: chrome/browser/signin/profile_oauth2_token_service_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 (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/profile_oauth2_token_service_factory.h" 5 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
6 6
7 #include "chrome/browser/profiles/profile.h" 7 #include "chrome/browser/profiles/profile.h"
8 #include "chrome/browser/signin/account_tracker_service_factory.h" 8 #include "chrome/browser/signin/account_tracker_service_factory.h"
9 #include "chrome/browser/signin/chrome_signin_client_factory.h" 9 #include "chrome/browser/signin/chrome_signin_client_factory.h"
10 #include "chrome/browser/signin/signin_error_controller_factory.h" 10 #include "chrome/browser/signin/signin_error_controller_factory.h"
(...skipping 24 matching lines...) Expand all
35 35
36 ProfileOAuth2TokenService* 36 ProfileOAuth2TokenService*
37 ProfileOAuth2TokenServiceFactory::GetForProfile(Profile* profile) { 37 ProfileOAuth2TokenServiceFactory::GetForProfile(Profile* profile) {
38 return static_cast<ProfileOAuth2TokenService*>( 38 return static_cast<ProfileOAuth2TokenService*>(
39 GetInstance()->GetServiceForBrowserContext(profile, true)); 39 GetInstance()->GetServiceForBrowserContext(profile, true));
40 } 40 }
41 41
42 // static 42 // static
43 ProfileOAuth2TokenServiceFactory* 43 ProfileOAuth2TokenServiceFactory*
44 ProfileOAuth2TokenServiceFactory::GetInstance() { 44 ProfileOAuth2TokenServiceFactory::GetInstance() {
45 return Singleton<ProfileOAuth2TokenServiceFactory>::get(); 45 return base::Singleton<ProfileOAuth2TokenServiceFactory>::get();
46 } 46 }
47 47
48 KeyedService* ProfileOAuth2TokenServiceFactory::BuildServiceInstanceFor( 48 KeyedService* ProfileOAuth2TokenServiceFactory::BuildServiceInstanceFor(
49 content::BrowserContext* context) const { 49 content::BrowserContext* context) const {
50 #if defined(OS_ANDROID) 50 #if defined(OS_ANDROID)
51 OAuth2TokenServiceDelegateAndroid* delegate = 51 OAuth2TokenServiceDelegateAndroid* delegate =
52 new OAuth2TokenServiceDelegateAndroid(); 52 new OAuth2TokenServiceDelegateAndroid();
53 delegate->Initialize(); 53 delegate->Initialize();
54 #else 54 #else
55 Profile* profile = static_cast<Profile*>(context); 55 Profile* profile = static_cast<Profile*>(context);
56 MutableProfileOAuth2TokenServiceDelegate* delegate = 56 MutableProfileOAuth2TokenServiceDelegate* delegate =
57 new MutableProfileOAuth2TokenServiceDelegate( 57 new MutableProfileOAuth2TokenServiceDelegate(
58 ChromeSigninClientFactory::GetInstance()->GetForProfile(profile), 58 ChromeSigninClientFactory::GetInstance()->GetForProfile(profile),
59 SigninErrorControllerFactory::GetInstance()->GetForProfile(profile), 59 SigninErrorControllerFactory::GetInstance()->GetForProfile(profile),
60 AccountTrackerServiceFactory::GetInstance()->GetForProfile(profile)); 60 AccountTrackerServiceFactory::GetInstance()->GetForProfile(profile));
61 #endif 61 #endif
62 ProfileOAuth2TokenService* service = new ProfileOAuth2TokenService(delegate); 62 ProfileOAuth2TokenService* service = new ProfileOAuth2TokenService(delegate);
63 return service; 63 return service;
64 } 64 }
OLDNEW
« no previous file with comments | « chrome/browser/signin/profile_oauth2_token_service_factory.h ('k') | chrome/browser/signin/signin_error_controller_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698