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

Side by Side Diff: chrome/browser/sync/sync_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/sync/sync_global_error_factory.h" 5 #include "chrome/browser/sync/sync_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/sync/profile_sync_service.h" 9 #include "chrome/browser/sync/profile_sync_service.h"
10 #include "chrome/browser/sync/profile_sync_service_factory.h" 10 #include "chrome/browser/sync/profile_sync_service_factory.h"
(...skipping 17 matching lines...) Expand all
28 28
29 // static 29 // static
30 SyncGlobalError* SyncGlobalErrorFactory::GetForProfile( 30 SyncGlobalError* SyncGlobalErrorFactory::GetForProfile(
31 Profile* profile) { 31 Profile* profile) {
32 return static_cast<SyncGlobalError*>( 32 return static_cast<SyncGlobalError*>(
33 GetInstance()->GetServiceForBrowserContext(profile, true)); 33 GetInstance()->GetServiceForBrowserContext(profile, true));
34 } 34 }
35 35
36 // static 36 // static
37 SyncGlobalErrorFactory* SyncGlobalErrorFactory::GetInstance() { 37 SyncGlobalErrorFactory* SyncGlobalErrorFactory::GetInstance() {
38 return Singleton<SyncGlobalErrorFactory>::get(); 38 return base::Singleton<SyncGlobalErrorFactory>::get();
39 } 39 }
40 40
41 KeyedService* SyncGlobalErrorFactory::BuildServiceInstanceFor( 41 KeyedService* SyncGlobalErrorFactory::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 ProfileSyncService* profile_sync_service = 49 ProfileSyncService* profile_sync_service =
50 ProfileSyncServiceFactory::GetForProfile(profile); 50 ProfileSyncServiceFactory::GetForProfile(profile);
51 51
52 if (!profile_sync_service) 52 if (!profile_sync_service)
53 return NULL; 53 return NULL;
54 54
55 SyncErrorController* sync_error_controller = 55 SyncErrorController* sync_error_controller =
56 profile_sync_service->sync_error_controller(); 56 profile_sync_service->sync_error_controller();
57 if (!sync_error_controller) 57 if (!sync_error_controller)
58 return NULL; 58 return NULL;
59 59
60 return new SyncGlobalError(sync_error_controller, 60 return new SyncGlobalError(sync_error_controller,
61 profile_sync_service); 61 profile_sync_service);
62 } 62 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/sync_global_error_factory.h ('k') | chrome/browser/sync/test/integration/sync_app_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698