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

Unified Diff: chrome/browser/chromeos/customization/customization_document.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
Index: chrome/browser/chromeos/customization/customization_document.cc
diff --git a/chrome/browser/chromeos/customization/customization_document.cc b/chrome/browser/chromeos/customization/customization_document.cc
index 780ba16d10da0c1db481c09e40ff0b79132c9913..9363a57f4d4783d617496a1c2e17a1cd54915611 100644
--- a/chrome/browser/chromeos/customization/customization_document.cc
+++ b/chrome/browser/chromeos/customization/customization_document.cc
@@ -277,8 +277,9 @@ StartupCustomizationDocument::StartupCustomizationDocument(
StartupCustomizationDocument::~StartupCustomizationDocument() {}
StartupCustomizationDocument* StartupCustomizationDocument::GetInstance() {
- return Singleton<StartupCustomizationDocument,
- DefaultSingletonTraits<StartupCustomizationDocument> >::get();
+ return base::Singleton<
+ StartupCustomizationDocument,
+ base::DefaultSingletonTraits<StartupCustomizationDocument>>::get();
}
void StartupCustomizationDocument::Init(
@@ -427,8 +428,9 @@ ServicesCustomizationDocument* ServicesCustomizationDocument::GetInstance() {
if (g_test_services_customization_document)
return g_test_services_customization_document;
- return Singleton<ServicesCustomizationDocument,
- DefaultSingletonTraits<ServicesCustomizationDocument> >::get();
+ return base::Singleton<
+ ServicesCustomizationDocument,
+ base::DefaultSingletonTraits<ServicesCustomizationDocument>>::get();
}
// static
« no previous file with comments | « chrome/browser/chromeos/customization/customization_document.h ('k') | chrome/browser/chromeos/device_uma.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698