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

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

Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/supervised_user_pref_store.h" 5 #include "chrome/browser/managed_mode/supervised_user_pref_store.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/prefs/pref_value_map.h" 8 #include "base/prefs/pref_value_map.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/managed_mode/managed_mode_url_filter.h" 10 #include "chrome/browser/managed_mode/managed_mode_url_filter.h"
11 #include "chrome/browser/managed_mode/managed_user_constants.h" 11 #include "chrome/browser/managed_mode/managed_user_constants.h"
12 #include "chrome/browser/managed_mode/managed_user_settings_service.h" 12 #include "chrome/browser/managed_mode/managed_user_settings_service.h"
13 #include "chrome/browser/prefs/incognito_mode_prefs.h" 13 #include "chrome/browser/prefs/incognito_mode_prefs.h"
14 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
15 15
16 using base::FundamentalValue; 16 using base::FundamentalValue;
17 17
18 namespace { 18 namespace {
19 19
20 struct ManagedUserSettingsPrefMappingEntry { 20 struct ManagedUserSettingsPrefMappingEntry {
21 const char* settings_name; 21 const char* settings_name;
22 const char* pref_name; 22 const char* pref_name;
23 }; 23 };
24 24
25 ManagedUserSettingsPrefMappingEntry kManagedUserSettingsPrefMapping[] = { 25 ManagedUserSettingsPrefMappingEntry kManagedUserSettingsPrefMapping[] = {
26 { 26 {
27 managed_users::kContentPackDefaultFilteringBehavior, 27 managed_users::kContentPackDefaultFilteringBehavior,
28 prefs::kDefaultManagedModeFilteringBehavior, 28 prefs::kDefaultSupervisedUserFilteringBehavior,
29 }, 29 },
30 { 30 {
31 managed_users::kContentPackManualBehaviorHosts, 31 managed_users::kContentPackManualBehaviorHosts,
32 prefs::kManagedModeManualHosts, 32 prefs::kSupervisedUserManualHosts,
33 }, 33 },
34 { 34 {
35 managed_users::kContentPackManualBehaviorURLs, 35 managed_users::kContentPackManualBehaviorURLs,
36 prefs::kManagedModeManualURLs, 36 prefs::kSupervisedUserManualURLs,
37 }, 37 },
38 { 38 {
39 managed_users::kForceSafeSearch, 39 managed_users::kForceSafeSearch,
40 prefs::kForceSafeSearch, 40 prefs::kForceSafeSearch,
41 }, 41 },
42 { 42 {
43 managed_users::kSigninAllowed, 43 managed_users::kSigninAllowed,
44 prefs::kSigninAllowed, 44 prefs::kSigninAllowed,
45 }, 45 },
46 { 46 {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 } 85 }
86 86
87 void SupervisedUserPrefStore::OnNewSettingsAvailable( 87 void SupervisedUserPrefStore::OnNewSettingsAvailable(
88 const base::DictionaryValue* settings) { 88 const base::DictionaryValue* settings) {
89 scoped_ptr<PrefValueMap> old_prefs = prefs_.Pass(); 89 scoped_ptr<PrefValueMap> old_prefs = prefs_.Pass();
90 prefs_.reset(new PrefValueMap); 90 prefs_.reset(new PrefValueMap);
91 if (settings) { 91 if (settings) {
92 // Set hardcoded prefs. 92 // Set hardcoded prefs.
93 prefs_->SetValue(prefs::kAllowDeletingBrowserHistory, 93 prefs_->SetValue(prefs::kAllowDeletingBrowserHistory,
94 new FundamentalValue(false)); 94 new FundamentalValue(false));
95 prefs_->SetValue(prefs::kDefaultManagedModeFilteringBehavior, 95 prefs_->SetValue(prefs::kDefaultSupervisedUserFilteringBehavior,
96 new FundamentalValue(ManagedModeURLFilter::ALLOW)); 96 new FundamentalValue(ManagedModeURLFilter::ALLOW));
97 prefs_->SetValue(prefs::kForceSafeSearch, new FundamentalValue(true)); 97 prefs_->SetValue(prefs::kForceSafeSearch, new FundamentalValue(true));
98 prefs_->SetValue(prefs::kHideWebStoreIcon, new FundamentalValue(true)); 98 prefs_->SetValue(prefs::kHideWebStoreIcon, new FundamentalValue(true));
99 prefs_->SetValue(prefs::kIncognitoModeAvailability, 99 prefs_->SetValue(prefs::kIncognitoModeAvailability,
100 new FundamentalValue(IncognitoModePrefs::DISABLED)); 100 new FundamentalValue(IncognitoModePrefs::DISABLED));
101 prefs_->SetValue(prefs::kSigninAllowed, new FundamentalValue(false)); 101 prefs_->SetValue(prefs::kSigninAllowed, new FundamentalValue(false));
102 102
103 // Copy managed user settings to prefs. 103 // Copy managed user settings to prefs.
104 for (size_t i = 0; i < arraysize(kManagedUserSettingsPrefMapping); ++i) { 104 for (size_t i = 0; i < arraysize(kManagedUserSettingsPrefMapping); ++i) {
105 const ManagedUserSettingsPrefMappingEntry& entry = 105 const ManagedUserSettingsPrefMappingEntry& entry =
(...skipping 12 matching lines...) Expand all
118 std::vector<std::string> changed_prefs; 118 std::vector<std::string> changed_prefs;
119 prefs_->GetDifferingKeys(old_prefs.get(), &changed_prefs); 119 prefs_->GetDifferingKeys(old_prefs.get(), &changed_prefs);
120 120
121 // Send out change notifications. 121 // Send out change notifications.
122 for (std::vector<std::string>::const_iterator pref(changed_prefs.begin()); 122 for (std::vector<std::string>::const_iterator pref(changed_prefs.begin());
123 pref != changed_prefs.end(); 123 pref != changed_prefs.end();
124 ++pref) { 124 ++pref) {
125 FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(*pref)); 125 FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(*pref));
126 } 126 }
127 } 127 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698