Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(476)

Unified Diff: chrome/browser/profiles/profile_manager.cc

Issue 566933005: Do not display lock for hosted domains (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Handle a null in unit tests Created 6 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
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,

Powered by Google App Engine
This is Rietveld 408576698