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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/login/session/user_session_manager.cc

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix more errors 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
« base/trace_event/trace_log.cc ('K') | « chrome/browser/chromeos/login/session/user_session_manager.h ('k') | chrome/browser/chromeos/login/signin/auth_sync_observer_factory.h » ('j') | ios/chrome/browser/favicon/favicon_service_factory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/session/user_session_manager.cc
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc
index a78aa3f8fb6de240935f56162952e0fa4a6f1e41..7c2b7128c213eba6d0c43f9a68c14ad76819023a 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
@@ -323,8 +323,8 @@ UserSessionStateObserver::~UserSessionStateObserver() {
// static
UserSessionManager* UserSessionManager::GetInstance() {
- return Singleton<UserSessionManager,
- DefaultSingletonTraits<UserSessionManager> >::get();
+ return base::Singleton<UserSessionManager, base::DefaultSingletonTraits<
+ UserSessionManager>>::get();
}
// static
« base/trace_event/trace_log.cc ('K') | « chrome/browser/chromeos/login/session/user_session_manager.h ('k') | chrome/browser/chromeos/login/signin/auth_sync_observer_factory.h » ('j') | ios/chrome/browser/favicon/favicon_service_factory.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698