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

Side by Side Diff: components/content_settings/core/browser/content_settings_policy_provider.cc

Issue 1102733002: Remove most occurences of PrefRegistrySyncable::UNSYNCABLE_PREF (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@prefs-add-reg-funcs
Patch Set: Created 5 years, 7 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "components/content_settings/core/browser/content_settings_policy_provi der.h" 5 #include "components/content_settings/core/browser/content_settings_policy_provi der.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 } 115 }
116 }; 116 };
117 117
118 } // namespace 118 } // namespace
119 119
120 namespace content_settings { 120 namespace content_settings {
121 121
122 // static 122 // static
123 void PolicyProvider::RegisterProfilePrefs( 123 void PolicyProvider::RegisterProfilePrefs(
124 user_prefs::PrefRegistrySyncable* registry) { 124 user_prefs::PrefRegistrySyncable* registry) {
125 registry->RegisterListPref(prefs::kManagedAutoSelectCertificateForUrls, 125 registry->RegisterListPref(prefs::kManagedAutoSelectCertificateForUrls);
126 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 126 registry->RegisterListPref(prefs::kManagedCookiesAllowedForUrls);
127 registry->RegisterListPref(prefs::kManagedCookiesAllowedForUrls, 127 registry->RegisterListPref(prefs::kManagedCookiesBlockedForUrls);
128 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 128 registry->RegisterListPref(prefs::kManagedCookiesSessionOnlyForUrls);
129 registry->RegisterListPref(prefs::kManagedCookiesBlockedForUrls, 129 registry->RegisterListPref(prefs::kManagedImagesAllowedForUrls);
130 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 130 registry->RegisterListPref(prefs::kManagedImagesBlockedForUrls);
131 registry->RegisterListPref(prefs::kManagedCookiesSessionOnlyForUrls, 131 registry->RegisterListPref(prefs::kManagedJavaScriptAllowedForUrls);
132 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 132 registry->RegisterListPref(prefs::kManagedJavaScriptBlockedForUrls);
133 registry->RegisterListPref(prefs::kManagedImagesAllowedForUrls, 133 registry->RegisterListPref(prefs::kManagedPluginsAllowedForUrls);
134 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 134 registry->RegisterListPref(prefs::kManagedPluginsBlockedForUrls);
135 registry->RegisterListPref(prefs::kManagedImagesBlockedForUrls, 135 registry->RegisterListPref(prefs::kManagedPopupsAllowedForUrls);
136 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 136 registry->RegisterListPref(prefs::kManagedPopupsBlockedForUrls);
137 registry->RegisterListPref(prefs::kManagedJavaScriptAllowedForUrls, 137 registry->RegisterListPref(prefs::kManagedNotificationsAllowedForUrls);
138 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 138 registry->RegisterListPref(prefs::kManagedNotificationsBlockedForUrls);
139 registry->RegisterListPref(prefs::kManagedJavaScriptBlockedForUrls,
140 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
141 registry->RegisterListPref(prefs::kManagedPluginsAllowedForUrls,
142 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
143 registry->RegisterListPref(prefs::kManagedPluginsBlockedForUrls,
144 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
145 registry->RegisterListPref(prefs::kManagedPopupsAllowedForUrls,
146 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
147 registry->RegisterListPref(prefs::kManagedPopupsBlockedForUrls,
148 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
149 registry->RegisterListPref(prefs::kManagedNotificationsAllowedForUrls,
150 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
151 registry->RegisterListPref(prefs::kManagedNotificationsBlockedForUrls,
152 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
153 // Preferences for default content setting policies. If a policy is not set of 139 // Preferences for default content setting policies. If a policy is not set of
154 // the corresponding preferences below is set to CONTENT_SETTING_DEFAULT. 140 // the corresponding preferences below is set to CONTENT_SETTING_DEFAULT.
155 registry->RegisterIntegerPref( 141 registry->RegisterIntegerPref(prefs::kManagedDefaultCookiesSetting,
156 prefs::kManagedDefaultCookiesSetting, 142 CONTENT_SETTING_DEFAULT);
157 CONTENT_SETTING_DEFAULT, 143 registry->RegisterIntegerPref(prefs::kManagedDefaultImagesSetting,
158 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 144 CONTENT_SETTING_DEFAULT);
159 registry->RegisterIntegerPref( 145 registry->RegisterIntegerPref(prefs::kManagedDefaultJavaScriptSetting,
160 prefs::kManagedDefaultImagesSetting, 146 CONTENT_SETTING_DEFAULT);
161 CONTENT_SETTING_DEFAULT, 147 registry->RegisterIntegerPref(prefs::kManagedDefaultPluginsSetting,
162 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 148 CONTENT_SETTING_DEFAULT);
163 registry->RegisterIntegerPref( 149 registry->RegisterIntegerPref(prefs::kManagedDefaultPopupsSetting,
164 prefs::kManagedDefaultJavaScriptSetting, 150 CONTENT_SETTING_DEFAULT);
165 CONTENT_SETTING_DEFAULT, 151 registry->RegisterIntegerPref(prefs::kManagedDefaultGeolocationSetting,
166 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 152 CONTENT_SETTING_DEFAULT);
167 registry->RegisterIntegerPref( 153 registry->RegisterIntegerPref(prefs::kManagedDefaultNotificationsSetting,
168 prefs::kManagedDefaultPluginsSetting, 154 CONTENT_SETTING_DEFAULT);
169 CONTENT_SETTING_DEFAULT, 155 registry->RegisterIntegerPref(prefs::kManagedDefaultMediaStreamSetting,
170 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 156 CONTENT_SETTING_DEFAULT);
171 registry->RegisterIntegerPref(
172 prefs::kManagedDefaultPopupsSetting,
173 CONTENT_SETTING_DEFAULT,
174 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
175 registry->RegisterIntegerPref(
176 prefs::kManagedDefaultGeolocationSetting,
177 CONTENT_SETTING_DEFAULT,
178 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
179 registry->RegisterIntegerPref(
180 prefs::kManagedDefaultNotificationsSetting,
181 CONTENT_SETTING_DEFAULT,
182 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
183 registry->RegisterIntegerPref(
184 prefs::kManagedDefaultMediaStreamSetting,
185 CONTENT_SETTING_DEFAULT,
186 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
187 } 157 }
188 158
189 PolicyProvider::PolicyProvider(PrefService* prefs) : prefs_(prefs) { 159 PolicyProvider::PolicyProvider(PrefService* prefs) : prefs_(prefs) {
190 ReadManagedDefaultSettings(); 160 ReadManagedDefaultSettings();
191 ReadManagedContentSettings(false); 161 ReadManagedContentSettings(false);
192 162
193 pref_change_registrar_.Init(prefs_); 163 pref_change_registrar_.Init(prefs_);
194 PrefChangeRegistrar::NamedChangeCallback callback = 164 PrefChangeRegistrar::NamedChangeCallback callback =
195 base::Bind(&PolicyProvider::OnPreferenceChanged, base::Unretained(this)); 165 base::Bind(&PolicyProvider::OnPreferenceChanged, base::Unretained(this));
196 pref_change_registrar_.Add( 166 pref_change_registrar_.Add(
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 ReadManagedDefaultSettings(); 454 ReadManagedDefaultSettings();
485 } 455 }
486 456
487 NotifyObservers(ContentSettingsPattern(), 457 NotifyObservers(ContentSettingsPattern(),
488 ContentSettingsPattern(), 458 ContentSettingsPattern(),
489 CONTENT_SETTINGS_TYPE_DEFAULT, 459 CONTENT_SETTINGS_TYPE_DEFAULT,
490 std::string()); 460 std::string());
491 } 461 }
492 462
493 } // namespace content_settings 463 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698