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

Side by Side Diff: chrome/browser/signin/signin_global_error_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 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_global_error_factory.h" 5 #include "chrome/browser/signin/signin_global_error_factory.h"
6 6
7 #include "chrome/browser/browser_process.h" 7 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/signin/signin_error_controller_factory.h" 9 #include "chrome/browser/signin/signin_error_controller_factory.h"
10 #include "chrome/browser/signin/signin_global_error.h" 10 #include "chrome/browser/signin/signin_global_error.h"
(...skipping 17 matching lines...) Expand all
28 28
29 // static 29 // static
30 SigninGlobalError* SigninGlobalErrorFactory::GetForProfile( 30 SigninGlobalError* SigninGlobalErrorFactory::GetForProfile(
31 Profile* profile) { 31 Profile* profile) {
32 return static_cast<SigninGlobalError*>( 32 return static_cast<SigninGlobalError*>(
33 GetInstance()->GetServiceForBrowserContext(profile, true)); 33 GetInstance()->GetServiceForBrowserContext(profile, true));
34 } 34 }
35 35
36 // static 36 // static
37 SigninGlobalErrorFactory* SigninGlobalErrorFactory::GetInstance() { 37 SigninGlobalErrorFactory* SigninGlobalErrorFactory::GetInstance() {
38 return Singleton<SigninGlobalErrorFactory>::get(); 38 return base::Singleton<SigninGlobalErrorFactory>::get();
39 } 39 }
40 40
41 KeyedService* SigninGlobalErrorFactory::BuildServiceInstanceFor( 41 KeyedService* SigninGlobalErrorFactory::BuildServiceInstanceFor(
42 content::BrowserContext* context) const { 42 content::BrowserContext* context) const {
43 #if defined(USE_ASH) 43 #if defined(USE_ASH)
44 if (ash::Shell::HasInstance()) 44 if (ash::Shell::HasInstance())
45 return NULL; 45 return NULL;
46 #endif 46 #endif
47 47
48 Profile* profile = static_cast<Profile*>(context); 48 Profile* profile = static_cast<Profile*>(context);
49 49
50 return new SigninGlobalError( 50 return new SigninGlobalError(
51 SigninErrorControllerFactory::GetForProfile(profile), profile); 51 SigninErrorControllerFactory::GetForProfile(profile), profile);
52 } 52 }
OLDNEW
« no previous file with comments | « chrome/browser/signin/signin_global_error_factory.h ('k') | chrome/browser/signin/signin_manager_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698