chrome/browser/chromeos/login/session/user_session_manager.h - Issue 1308823002: Move Singleton and related structs to namespace base

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

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 | « chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.cc ('k') | chrome/browser/chromeos/login/session/user_session_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/session/user_session_manager.h

diff --git a/chrome/browser/chromeos/login/session/user_session_manager.h b/chrome/browser/chromeos/login/session/user_session_manager.h

index 51f7bbaf9462f6bb6a93425538d22ba7e9dea0bf..dee2273dc6aeb43664101d8e7e5f75b17a3e8abb 100644

--- a/chrome/browser/chromeos/login/session/user_session_manager.h

+++ b/chrome/browser/chromeos/login/session/user_session_manager.h

@@ -246,7 +246,7 @@ class UserSessionManager

private:

friend class test::UserSessionManagerTestApi;

- friend struct DefaultSingletonTraits<UserSessionManager>;

+ friend struct base::DefaultSingletonTraits<UserSessionManager>;

typedef std::set<std::string> SigninSessionRestoreStateSet;