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

Side by Side Diff: chrome/browser/sync/sync_error_notifier_factory_ash.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_error_notifier_factory_ash.h" 5 #include "chrome/browser/sync/sync_error_notifier_factory_ash.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/sync/profile_sync_service.h" 10 #include "chrome/browser/sync/profile_sync_service.h"
(...skipping 12 matching lines...) Expand all
23 23
24 // static 24 // static
25 SyncErrorNotifier* SyncErrorNotifierFactory::GetForProfile( 25 SyncErrorNotifier* SyncErrorNotifierFactory::GetForProfile(
26 Profile* profile) { 26 Profile* profile) {
27 return static_cast<SyncErrorNotifier*>( 27 return static_cast<SyncErrorNotifier*>(
28 GetInstance()->GetServiceForBrowserContext(profile, true)); 28 GetInstance()->GetServiceForBrowserContext(profile, true));
29 } 29 }
30 30
31 // static 31 // static
32 SyncErrorNotifierFactory* SyncErrorNotifierFactory::GetInstance() { 32 SyncErrorNotifierFactory* SyncErrorNotifierFactory::GetInstance() {
33 return Singleton<SyncErrorNotifierFactory>::get(); 33 return base::Singleton<SyncErrorNotifierFactory>::get();
34 } 34 }
35 35
36 KeyedService* SyncErrorNotifierFactory::BuildServiceInstanceFor( 36 KeyedService* SyncErrorNotifierFactory::BuildServiceInstanceFor(
37 content::BrowserContext* context) const { 37 content::BrowserContext* context) const {
38 if (!ash::Shell::HasInstance()) 38 if (!ash::Shell::HasInstance())
39 return NULL; 39 return NULL;
40 40
41 Profile* profile = static_cast<Profile*>(context); 41 Profile* profile = static_cast<Profile*>(context);
42 ProfileSyncService* profile_sync_service = 42 ProfileSyncService* profile_sync_service =
43 ProfileSyncServiceFactory::GetForProfile(profile); 43 ProfileSyncServiceFactory::GetForProfile(profile);
44 44
45 if (!profile_sync_service) 45 if (!profile_sync_service)
46 return NULL; 46 return NULL;
47 47
48 SyncErrorController* sync_error_controller = 48 SyncErrorController* sync_error_controller =
49 profile_sync_service->sync_error_controller(); 49 profile_sync_service->sync_error_controller();
50 if (!sync_error_controller) 50 if (!sync_error_controller)
51 return NULL; 51 return NULL;
52 52
53 return new SyncErrorNotifier(sync_error_controller, profile); 53 return new SyncErrorNotifier(sync_error_controller, profile);
54 } 54 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/sync_error_notifier_factory_ash.h ('k') | chrome/browser/sync/sync_global_error_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698