Index: chrome/browser/profiles/profile_manager.cc |
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc |
index b524dc385c337a064bfc5e98f55168bb9db6161e..075b536d7e289fe297040fb71a8adb1da5859dae 100644 |
--- a/chrome/browser/profiles/profile_manager.cc |
+++ b/chrome/browser/profiles/profile_manager.cc |
@@ -812,6 +812,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() && |
+#endif |
command_line->HasSwitch(switches::kSupervisedUserId); |
if (force_supervised_user_id) { |
supervised_user_id = |