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

Unified Diff: chromeos/system/statistics_provider.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/settings/timezone_settings.cc ('k') | components/app_modal/app_modal_dialog_queue.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/system/statistics_provider.cc
diff --git a/chromeos/system/statistics_provider.cc b/chromeos/system/statistics_provider.cc
index bac717360345205f2b0fa6e9d399d8ae2c3e1f37..c2cfcdbf7c9830e46aafc5001aaa196d6f2b0e41 100644
--- a/chromeos/system/statistics_provider.cc
+++ b/chromeos/system/statistics_provider.cc
@@ -113,7 +113,7 @@ class StatisticsProviderImpl : public StatisticsProvider {
protected:
typedef std::map<std::string, bool> MachineFlags;
- friend struct DefaultSingletonTraits<StatisticsProviderImpl>;
+ friend struct base::DefaultSingletonTraits<StatisticsProviderImpl>;
StatisticsProviderImpl();
~StatisticsProviderImpl() override;
@@ -342,8 +342,9 @@ void StatisticsProviderImpl::LoadOemManifestFromFile(
}
StatisticsProviderImpl* StatisticsProviderImpl::GetInstance() {
- return Singleton<StatisticsProviderImpl,
- DefaultSingletonTraits<StatisticsProviderImpl> >::get();
+ return base::Singleton<
+ StatisticsProviderImpl,
+ base::DefaultSingletonTraits<StatisticsProviderImpl>>::get();
}
static StatisticsProvider* g_test_statistics_provider = NULL;
« no previous file with comments | « chromeos/settings/timezone_settings.cc ('k') | components/app_modal/app_modal_dialog_queue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698