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

Side by Side Diff: chrome/browser/managed_mode/managed_user_service.cc

Issue 11783008: Add a lock to the managed user settings page and require authentication for unlocking. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add browser test for ManagedUserSetPassphraseOverlay Created 7 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/managed_mode/managed_user_service.h" 5 #include "chrome/browser/managed_mode/managed_user_service.h"
6 6
7 #include "base/memory/ref_counted.h" 7 #include "base/memory/ref_counted.h"
8 #include "base/sequenced_task_runner.h" 8 #include "base/sequenced_task_runner.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/extensions/extension_system.h" 10 #include "chrome/browser/extensions/extension_system.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 Init(); 98 Init();
99 } 99 }
100 100
101 ManagedUserService::~ManagedUserService() { 101 ManagedUserService::~ManagedUserService() {
102 } 102 }
103 103
104 bool ManagedUserService::ProfileIsManaged() const { 104 bool ManagedUserService::ProfileIsManaged() const {
105 return profile_->GetPrefs()->GetBoolean(prefs::kProfileIsManaged); 105 return profile_->GetPrefs()->GetBoolean(prefs::kProfileIsManaged);
106 } 106 }
107 107
108 bool ManagedUserService::IsElevated() const {
109 PrefService* pref_service = profile_->GetPrefs();
110 // If there is no passphrase set, the profile is considered to be elevated.
111 if (pref_service->GetString(prefs::kManagedModeLocalPassphrase).empty())
112 return true;
113 return is_elevated_;
114 }
115
108 // static 116 // static
109 void ManagedUserService::RegisterUserPrefs(PrefServiceSyncable* prefs) { 117 void ManagedUserService::RegisterUserPrefs(PrefServiceSyncable* prefs) {
110 prefs->RegisterListPref(prefs::kManagedModeWhitelist, 118 prefs->RegisterListPref(prefs::kManagedModeWhitelist,
111 PrefServiceSyncable::UNSYNCABLE_PREF); 119 PrefServiceSyncable::UNSYNCABLE_PREF);
112 prefs->RegisterListPref(prefs::kManagedModeBlacklist, 120 prefs->RegisterListPref(prefs::kManagedModeBlacklist,
113 PrefServiceSyncable::UNSYNCABLE_PREF); 121 PrefServiceSyncable::UNSYNCABLE_PREF);
114 prefs->RegisterIntegerPref(prefs::kDefaultManagedModeFilteringBehavior, 122 prefs->RegisterIntegerPref(prefs::kDefaultManagedModeFilteringBehavior,
115 ManagedModeURLFilter::BLOCK, 123 ManagedModeURLFilter::BLOCK,
116 PrefServiceSyncable::UNSYNCABLE_PREF); 124 PrefServiceSyncable::UNSYNCABLE_PREF);
125 prefs->RegisterStringPref(prefs::kManagedModeLocalPassphrase,
126 "",
127 PrefServiceSyncable::UNSYNCABLE_PREF);
128 prefs->RegisterStringPref(prefs::kManagedModeLocalSalt,
129 "",
130 PrefServiceSyncable::UNSYNCABLE_PREF);
131 prefs->RegisterBooleanPref(prefs::kManagedModeLocked,
Pam (message me for reviews) 2013/01/28 13:53:27 What's the difference between locked == false and
Adrian Kuegel 2013/01/28 15:41:44 Logically there is no difference, it would have ju
132 false,
133 PrefServiceSyncable::UNSYNCABLE_PREF);
117 } 134 }
118 135
119 scoped_refptr<const ManagedModeURLFilter> 136 scoped_refptr<const ManagedModeURLFilter>
120 ManagedUserService::GetURLFilterForIOThread() { 137 ManagedUserService::GetURLFilterForIOThread() {
121 return url_filter_context_.io_url_filter(); 138 return url_filter_context_.io_url_filter();
122 } 139 }
123 140
124 ManagedModeURLFilter* ManagedUserService::GetURLFilterForUIThread() { 141 ManagedModeURLFilter* ManagedUserService::GetURLFilterForUIThread() {
125 return url_filter_context_.ui_url_filter(); 142 return url_filter_context_.ui_url_filter();
126 } 143 }
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 } 319 }
303 320
304 void ManagedUserService::UpdateSiteLists() { 321 void ManagedUserService::UpdateSiteLists() {
305 url_filter_context_.LoadWhitelists(GetActiveSiteLists()); 322 url_filter_context_.LoadWhitelists(GetActiveSiteLists());
306 } 323 }
307 324
308 void ManagedUserService::UpdateManualLists() { 325 void ManagedUserService::UpdateManualLists() {
309 url_filter_context_.SetManualLists(GetWhitelist(), GetBlacklist()); 326 url_filter_context_.SetManualLists(GetWhitelist(), GetBlacklist());
310 } 327 }
311 328
312 void ManagedUserService::SetElevatedForTesting(bool is_elevated) { 329 void ManagedUserService::SetElevated(bool is_elevated) {
313 is_elevated_ = is_elevated; 330 is_elevated_ = is_elevated;
314 } 331 }
315 332
316 void ManagedUserService::Init() { 333 void ManagedUserService::Init() {
317 if (!ProfileIsManaged()) 334 if (!ProfileIsManaged())
318 return; 335 return;
319 336
320 extensions::ExtensionSystem* extension_system = 337 extensions::ExtensionSystem* extension_system =
321 extensions::ExtensionSystem::Get(profile_); 338 extensions::ExtensionSystem::Get(profile_);
322 extensions::ManagementPolicy* management_policy = 339 extensions::ManagementPolicy* management_policy =
(...skipping 21 matching lines...) Expand all
344 scoped_ptr<base::ListValue> ManagedUserService::GetWhitelist() { 361 scoped_ptr<base::ListValue> ManagedUserService::GetWhitelist() {
345 return make_scoped_ptr( 362 return make_scoped_ptr(
346 profile_->GetPrefs()->GetList(prefs::kManagedModeWhitelist)->DeepCopy()); 363 profile_->GetPrefs()->GetList(prefs::kManagedModeWhitelist)->DeepCopy());
347 } 364 }
348 365
349 void ManagedUserService::AddURLPatternToManualList( 366 void ManagedUserService::AddURLPatternToManualList(
350 bool is_whitelist, 367 bool is_whitelist,
351 const std::string& url_pattern) { 368 const std::string& url_pattern) {
352 url_filter_context_.AddURLPatternToManualList(true, url_pattern); 369 url_filter_context_.AddURLPatternToManualList(true, url_pattern);
353 } 370 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698