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 20cb9d5d2b6f0975a101f129eff1cbe358c3098b..9cdd31cce69d34652ab745c7dc3f06ae9b4143bf 100644 |
| --- a/chrome/browser/profiles/profile_manager.cc |
| +++ b/chrome/browser/profiles/profile_manager.cc |
| @@ -794,6 +794,12 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) { |
| profile->GetPrefs()->SetString(prefs::kSupervisedUserId, |
| supervised_user_id); |
| } |
| + |
| +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) |
|
msw
2014/09/19 21:47:40
This will include Chrome OS, which defines both OS
Mike Lerman
2014/09/21 00:19:35
That is not the intent - I want to target Linux De
Mike Lerman
2014/09/22 13:18:56
I'll flip the OS defs around so I check iOS, Andro
msw
2014/09/22 19:58:09
Acknowledged.
|
| + // If the lock enabled algorithm changed, update this profile's lock status. |
| + if (switches::IsNewProfileManagement()) |
| + profiles::UpdateIsProfileLockEnabledIfNeeded(profile); |
| +#endif |
| } |
| void ProfileManager::RegisterTestingProfile(Profile* profile, |