| Index: chrome/browser/managed_mode/managed_user_service.cc
|
| diff --git a/chrome/browser/managed_mode/managed_user_service.cc b/chrome/browser/managed_mode/managed_user_service.cc
|
| index 756c97da8592625d9f2693fd2bf111862cfc8bf3..97db73ca4ade11471c75c3c14eb641c5ce570ecf 100644
|
| --- a/chrome/browser/managed_mode/managed_user_service.cc
|
| +++ b/chrome/browser/managed_mode/managed_user_service.cc
|
| @@ -97,6 +97,14 @@ bool ManagedUserService::ProfileIsManaged() const {
|
| return profile_->GetPrefs()->GetBoolean(prefs::kProfileIsManaged);
|
| }
|
|
|
| +bool ManagedUserService::IsElevated() const {
|
| + PrefService* pref_service = profile_->GetPrefs();
|
| + // If there is no passphrase set, the profile is considered to be elevated.
|
| + if (pref_service->GetString(prefs::kManagedModeLocalPassphrase).empty())
|
| + return true;
|
| + return is_elevated_;
|
| +}
|
| +
|
| // static
|
| void ManagedUserService::RegisterUserPrefs(PrefServiceSyncable* prefs) {
|
| prefs->RegisterDictionaryPref(prefs::kManagedModeManualHosts,
|
| @@ -106,6 +114,12 @@ void ManagedUserService::RegisterUserPrefs(PrefServiceSyncable* prefs) {
|
| prefs->RegisterIntegerPref(prefs::kDefaultManagedModeFilteringBehavior,
|
| ManagedModeURLFilter::BLOCK,
|
| PrefServiceSyncable::UNSYNCABLE_PREF);
|
| + prefs->RegisterStringPref(prefs::kManagedModeLocalPassphrase,
|
| + "",
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| + prefs->RegisterStringPref(prefs::kManagedModeLocalSalt,
|
| + "",
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| }
|
|
|
| scoped_refptr<const ManagedModeURLFilter>
|
| @@ -307,7 +321,7 @@ void ManagedUserService::SetManualBehaviorForURLs(const std::vector<GURL>& urls,
|
| UpdateManualURLs();
|
| }
|
|
|
| -void ManagedUserService::SetElevatedForTesting(bool is_elevated) {
|
| +void ManagedUserService::SetElevated(bool is_elevated) {
|
| is_elevated_ = is_elevated;
|
| }
|
|
|
|
|