Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 107 | 107 |
| 108 // static | 108 // static |
| 109 void ManagedUserService::RegisterUserPrefs(PrefServiceSyncable* prefs) { | 109 void ManagedUserService::RegisterUserPrefs(PrefServiceSyncable* prefs) { |
| 110 prefs->RegisterListPref(prefs::kManagedModeWhitelist, | 110 prefs->RegisterListPref(prefs::kManagedModeWhitelist, |
| 111 PrefServiceSyncable::UNSYNCABLE_PREF); | 111 PrefServiceSyncable::UNSYNCABLE_PREF); |
| 112 prefs->RegisterListPref(prefs::kManagedModeBlacklist, | 112 prefs->RegisterListPref(prefs::kManagedModeBlacklist, |
| 113 PrefServiceSyncable::UNSYNCABLE_PREF); | 113 PrefServiceSyncable::UNSYNCABLE_PREF); |
| 114 prefs->RegisterIntegerPref(prefs::kDefaultManagedModeFilteringBehavior, | 114 prefs->RegisterIntegerPref(prefs::kDefaultManagedModeFilteringBehavior, |
| 115 ManagedModeURLFilter::BLOCK, | 115 ManagedModeURLFilter::BLOCK, |
| 116 PrefServiceSyncable::UNSYNCABLE_PREF); | 116 PrefServiceSyncable::UNSYNCABLE_PREF); |
| 117 prefs->RegisterBooleanPref(prefs::kManagedUserNoSignin, | |
|
Pam (message me for reviews)
2013/01/30 10:03:41
There are a lot of old counterexamples, but we've
| |
| 118 false, | |
| 119 PrefServiceSyncable::UNSYNCABLE_PREF); | |
| 117 } | 120 } |
| 118 | 121 |
| 119 scoped_refptr<const ManagedModeURLFilter> | 122 scoped_refptr<const ManagedModeURLFilter> |
| 120 ManagedUserService::GetURLFilterForIOThread() { | 123 ManagedUserService::GetURLFilterForIOThread() { |
| 121 return url_filter_context_.io_url_filter(); | 124 return url_filter_context_.io_url_filter(); |
| 122 } | 125 } |
| 123 | 126 |
| 124 ManagedModeURLFilter* ManagedUserService::GetURLFilterForUIThread() { | 127 ManagedModeURLFilter* ManagedUserService::GetURLFilterForUIThread() { |
| 125 return url_filter_context_.ui_url_filter(); | 128 return url_filter_context_.ui_url_filter(); |
| 126 } | 129 } |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 344 scoped_ptr<base::ListValue> ManagedUserService::GetWhitelist() { | 347 scoped_ptr<base::ListValue> ManagedUserService::GetWhitelist() { |
| 345 return make_scoped_ptr( | 348 return make_scoped_ptr( |
| 346 profile_->GetPrefs()->GetList(prefs::kManagedModeWhitelist)->DeepCopy()); | 349 profile_->GetPrefs()->GetList(prefs::kManagedModeWhitelist)->DeepCopy()); |
| 347 } | 350 } |
| 348 | 351 |
| 349 void ManagedUserService::AddURLPatternToManualList( | 352 void ManagedUserService::AddURLPatternToManualList( |
| 350 bool is_whitelist, | 353 bool is_whitelist, |
| 351 const std::string& url_pattern) { | 354 const std::string& url_pattern) { |
| 352 url_filter_context_.AddURLPatternToManualList(true, url_pattern); | 355 url_filter_context_.AddURLPatternToManualList(true, url_pattern); |
| 353 } | 356 } |
| OLD | NEW |