chrome/browser/profiles/profile_manager.cc - Issue 933503004: Always load signin profile on Chrome OS startup.

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/profiles/profile_manager.cc

Issue 933503004: Always load signin profile on Chrome OS startup. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rollback unnecessary changes. Created 5 years, 10 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:

Index: chrome/browser/profiles/profile_manager.cc

diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc

index 1db7320da7e4c608bbfd9ec51cfcaee4df815dee..5b6212e218cd0fe7bf5fa9eaab42cf29be6a5719 100644

--- a/chrome/browser/profiles/profile_manager.cc

+++ b/chrome/browser/profiles/profile_manager.cc

@@ -809,6 +809,11 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) {

base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();

bool force_supervised_user_id =

+#if defined(OS_CHROMEOS)

+ g_browser_process->platform_part()

+ ->profile_helper()

+ ->GetSigninProfileDir() != profile->GetPath() &&

Mr4D (OOO till 08-26) 2015/02/17 15:46:51 You might want to add a comment that a supervised

+#endif

command_line->HasSwitch(switches::kSupervisedUserId);

if (force_supervised_user_id) {

supervised_user_id =