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

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

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add to PrefRegistrySyncable and PrefServiceSyncable to let sync know of pre-registered prefs. 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"
11 #include "chrome/browser/managed_mode/managed_mode_site_list.h" 11 #include "chrome/browser/managed_mode/managed_mode_site_list.h"
12 #include "chrome/browser/prefs/pref_registry_syncable.h"
12 #include "chrome/browser/prefs/pref_service.h" 13 #include "chrome/browser/prefs/pref_service.h"
13 #include "chrome/browser/prefs/scoped_user_pref_update.h" 14 #include "chrome/browser/prefs/scoped_user_pref_update.h"
14 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/common/chrome_notification_types.h" 16 #include "chrome/common/chrome_notification_types.h"
16 #include "chrome/common/extensions/extension_set.h" 17 #include "chrome/common/extensions/extension_set.h"
17 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
18 #include "content/public/browser/browser_thread.h" 19 #include "content/public/browser/browser_thread.h"
19 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
20 #include "ui/base/l10n/l10n_util.h" 21 #include "ui/base/l10n/l10n_util.h"
21 22
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 } 100 }
100 101
101 ManagedUserService::~ManagedUserService() { 102 ManagedUserService::~ManagedUserService() {
102 } 103 }
103 104
104 bool ManagedUserService::ProfileIsManaged() const { 105 bool ManagedUserService::ProfileIsManaged() const {
105 return profile_->GetPrefs()->GetBoolean(prefs::kProfileIsManaged); 106 return profile_->GetPrefs()->GetBoolean(prefs::kProfileIsManaged);
106 } 107 }
107 108
108 // static 109 // static
109 void ManagedUserService::RegisterUserPrefs(PrefServiceSyncable* prefs) { 110 void ManagedUserService::RegisterUserPrefs(PrefRegistrySyncable* registry) {
110 prefs->RegisterListPref(prefs::kManagedModeWhitelist, 111 registry->RegisterListPref(prefs::kManagedModeWhitelist,
111 PrefServiceSyncable::UNSYNCABLE_PREF); 112 PrefRegistrySyncable::UNSYNCABLE_PREF);
112 prefs->RegisterListPref(prefs::kManagedModeBlacklist, 113 registry->RegisterListPref(prefs::kManagedModeBlacklist,
113 PrefServiceSyncable::UNSYNCABLE_PREF); 114 PrefRegistrySyncable::UNSYNCABLE_PREF);
114 prefs->RegisterIntegerPref(prefs::kDefaultManagedModeFilteringBehavior, 115 registry->RegisterIntegerPref(prefs::kDefaultManagedModeFilteringBehavior,
115 ManagedModeURLFilter::BLOCK, 116 ManagedModeURLFilter::BLOCK,
116 PrefServiceSyncable::UNSYNCABLE_PREF); 117 PrefRegistrySyncable::UNSYNCABLE_PREF);
117 } 118 }
118 119
119 scoped_refptr<const ManagedModeURLFilter> 120 scoped_refptr<const ManagedModeURLFilter>
120 ManagedUserService::GetURLFilterForIOThread() { 121 ManagedUserService::GetURLFilterForIOThread() {
121 return url_filter_context_.io_url_filter(); 122 return url_filter_context_.io_url_filter();
122 } 123 }
123 124
124 ManagedModeURLFilter* ManagedUserService::GetURLFilterForUIThread() { 125 ManagedModeURLFilter* ManagedUserService::GetURLFilterForUIThread() {
125 return url_filter_context_.ui_url_filter(); 126 return url_filter_context_.ui_url_filter();
126 } 127 }
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 scoped_ptr<base::ListValue> ManagedUserService::GetWhitelist() { 345 scoped_ptr<base::ListValue> ManagedUserService::GetWhitelist() {
345 return make_scoped_ptr( 346 return make_scoped_ptr(
346 profile_->GetPrefs()->GetList(prefs::kManagedModeWhitelist)->DeepCopy()); 347 profile_->GetPrefs()->GetList(prefs::kManagedModeWhitelist)->DeepCopy());
347 } 348 }
348 349
349 void ManagedUserService::AddURLPatternToManualList( 350 void ManagedUserService::AddURLPatternToManualList(
350 bool is_whitelist, 351 bool is_whitelist,
351 const std::string& url_pattern) { 352 const std::string& url_pattern) {
352 url_filter_context_.AddURLPatternToManualList(true, url_pattern); 353 url_filter_context_.AddURLPatternToManualList(true, url_pattern);
353 } 354 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698