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

Unified Diff: chrome/browser/chromeos/login/ui/user_adding_screen.cc

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add \n Created 5 years, 4 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/login/ui/user_adding_screen.cc
diff --git a/chrome/browser/chromeos/login/ui/user_adding_screen.cc b/chrome/browser/chromeos/login/ui/user_adding_screen.cc
index 46cd6e83af55d94f61faaded46b15e9f5fabf9ab..8f6ba741d6b301aaf6daf84893c46bfbb9526099 100644
--- a/chrome/browser/chromeos/login/ui/user_adding_screen.cc
+++ b/chrome/browser/chromeos/login/ui/user_adding_screen.cc
@@ -34,7 +34,7 @@ class UserAddingScreenImpl : public UserAddingScreen {
static UserAddingScreenImpl* GetInstance();
private:
- friend struct DefaultSingletonTraits<UserAddingScreenImpl>;
+ friend struct base::DefaultSingletonTraits<UserAddingScreenImpl>;
void OnDisplayHostCompletion();
@@ -97,7 +97,7 @@ void UserAddingScreenImpl::OnDisplayHostCompletion() {
// static
UserAddingScreenImpl* UserAddingScreenImpl::GetInstance() {
- return Singleton<UserAddingScreenImpl>::get();
+ return base::Singleton<UserAddingScreenImpl>::get();
}
UserAddingScreenImpl::UserAddingScreenImpl()

Powered by Google App Engine
This is Rietveld 408576698