Chromium Code Reviews| Index: chrome/browser/profiles/profile_manager.cc |
| diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc |
| index 5256afc691898388a0c47fdc239908601dca96f8..aa1b7b95d52a3f7acef5c2a27445ee64a8bf990c 100644 |
| --- a/chrome/browser/profiles/profile_manager.cc |
| +++ b/chrome/browser/profiles/profile_manager.cc |
| @@ -552,6 +552,7 @@ bool ProfileManager::AddProfile(Profile* profile) { |
| } |
| RegisterProfile(profile, true); |
| + InitProfileUserPrefs(profile); |
| DoFinalInit(profile, ShouldGoOffTheRecord(profile)); |
| return true; |
| } |
| @@ -731,7 +732,6 @@ void ProfileManager::BrowserListObserver::OnBrowserSetLastActive( |
| #endif // !defined(OS_ANDROID) && !defined(OS_IOS) |
| void ProfileManager::DoFinalInit(Profile* profile, bool go_off_the_record) { |
| - InitProfileUserPrefs(profile); |
| DoFinalInitForServices(profile, go_off_the_record); |
| AddProfileToCache(profile); |
| DoFinalInitLogging(profile); |
| @@ -1013,8 +1013,14 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) { |
| if (!profile->GetPrefs()->HasPrefPath(prefs::kProfileName)) |
| profile->GetPrefs()->SetString(prefs::kProfileName, profile_name); |
| - if (!profile->GetPrefs()->HasPrefPath(prefs::kManagedUserId)) |
| + if (!profile->GetPrefs()->HasPrefPath(prefs::kManagedUserId)) { |
| + if (managed_user_id.empty() && |
| + CommandLine::ForCurrentProcess()->HasSwitch( |
| + switches::kNewProfileIsSupervised)) { |
| + managed_user_id = "Test ID"; |
|
rpetterson
2013/10/16 19:40:03
This seems an odd id to have in real life. Does it
Bernhard Bauer
2013/10/16 19:47:20
Yes, this only happens if the command line switch
|
| + } |
| profile->GetPrefs()->SetString(prefs::kManagedUserId, managed_user_id); |
| + } |
| } |
| void ProfileManager::SetGuestProfilePrefs(Profile* profile) { |