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

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

Issue 1991623005: Only Register() platform specific content settings types on different platforms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: split the changes and register images, plugins, mouselock in this CL Created 4 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_registry.h" 5 #include "components/content_settings/core/browser/content_settings_registry.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 117
118 // WARNING: The string names of the permissions passed in below are used to 118 // WARNING: The string names of the permissions passed in below are used to
119 // generate preference names and should never be changed! 119 // generate preference names and should never be changed!
120 120
121 Register(CONTENT_SETTINGS_TYPE_COOKIES, "cookies", CONTENT_SETTING_ALLOW, 121 Register(CONTENT_SETTINGS_TYPE_COOKIES, "cookies", CONTENT_SETTING_ALLOW,
122 WebsiteSettingsInfo::SYNCABLE, 122 WebsiteSettingsInfo::SYNCABLE,
123 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme), 123 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
124 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, 124 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
125 CONTENT_SETTING_SESSION_ONLY), 125 CONTENT_SETTING_SESSION_ONLY),
126 WebsiteSettingsInfo::REQUESTING_DOMAIN_ONLY_SCOPE, 126 WebsiteSettingsInfo::REQUESTING_DOMAIN_ONLY_SCOPE,
127 WebsiteSettingsRegistry::ALL_PLATFORMS,
127 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 128 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
128 129
129 Register(CONTENT_SETTINGS_TYPE_IMAGES, "images", CONTENT_SETTING_ALLOW, 130 Register(CONTENT_SETTINGS_TYPE_IMAGES, "images", CONTENT_SETTING_ALLOW,
130 WebsiteSettingsInfo::SYNCABLE, 131 WebsiteSettingsInfo::SYNCABLE,
131 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme, 132 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme,
132 kExtensionScheme), 133 kExtensionScheme),
133 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), 134 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),
134 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE, 135 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,
136 WebsiteSettingsRegistry::DESKTOP |
137 WebsiteSettingsRegistry::PLATFORM_ANDROID,
135 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 138 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
136 139
137 Register(CONTENT_SETTINGS_TYPE_JAVASCRIPT, "javascript", 140 Register(CONTENT_SETTINGS_TYPE_JAVASCRIPT, "javascript",
138 CONTENT_SETTING_ALLOW, WebsiteSettingsInfo::SYNCABLE, 141 CONTENT_SETTING_ALLOW, WebsiteSettingsInfo::SYNCABLE,
139 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme, 142 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme,
140 kExtensionScheme), 143 kExtensionScheme),
141 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), 144 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),
142 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE, 145 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,
146 WebsiteSettingsRegistry::DESKTOP |
147 WebsiteSettingsRegistry::PLATFORM_ANDROID,
143 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 148 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
144 149
145 Register(CONTENT_SETTINGS_TYPE_PLUGINS, "plugins", 150 Register(CONTENT_SETTINGS_TYPE_PLUGINS, "plugins",
146 CONTENT_SETTING_DETECT_IMPORTANT_CONTENT, 151 CONTENT_SETTING_DETECT_IMPORTANT_CONTENT,
147 WebsiteSettingsInfo::SYNCABLE, 152 WebsiteSettingsInfo::SYNCABLE,
148 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme), 153 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
149 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, 154 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
150 CONTENT_SETTING_ASK, 155 CONTENT_SETTING_ASK,
151 CONTENT_SETTING_DETECT_IMPORTANT_CONTENT), 156 CONTENT_SETTING_DETECT_IMPORTANT_CONTENT),
152 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE, 157 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,
158 WebsiteSettingsRegistry::DESKTOP |
159 WebsiteSettingsRegistry::PLATFORM_ANDROID,
153 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 160 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
154 161
155 Register(CONTENT_SETTINGS_TYPE_POPUPS, "popups", CONTENT_SETTING_BLOCK, 162 Register(CONTENT_SETTINGS_TYPE_POPUPS, "popups", CONTENT_SETTING_BLOCK,
156 WebsiteSettingsInfo::SYNCABLE, 163 WebsiteSettingsInfo::SYNCABLE,
157 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme, 164 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme,
158 kExtensionScheme), 165 kExtensionScheme),
159 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), 166 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),
160 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE, 167 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,
168 WebsiteSettingsRegistry::ALL_PLATFORMS,
161 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 169 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
162 170
163 Register(CONTENT_SETTINGS_TYPE_GEOLOCATION, "geolocation", 171 Register(CONTENT_SETTINGS_TYPE_GEOLOCATION, "geolocation",
164 CONTENT_SETTING_ASK, WebsiteSettingsInfo::UNSYNCABLE, 172 CONTENT_SETTING_ASK, WebsiteSettingsInfo::UNSYNCABLE,
165 WhitelistedSchemes(), 173 WhitelistedSchemes(),
166 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, 174 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
167 CONTENT_SETTING_ASK), 175 CONTENT_SETTING_ASK),
168 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE, 176 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE,
177 WebsiteSettingsRegistry::DESKTOP |
178 WebsiteSettingsRegistry::PLATFORM_ANDROID,
169 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 179 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
170 180
171 Register(CONTENT_SETTINGS_TYPE_NOTIFICATIONS, "notifications", 181 Register(CONTENT_SETTINGS_TYPE_NOTIFICATIONS, "notifications",
172 CONTENT_SETTING_ASK, WebsiteSettingsInfo::UNSYNCABLE, 182 CONTENT_SETTING_ASK, WebsiteSettingsInfo::UNSYNCABLE,
173 WhitelistedSchemes(), 183 WhitelistedSchemes(),
174 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, 184 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
175 CONTENT_SETTING_ASK), 185 CONTENT_SETTING_ASK),
176 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, 186 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
187 WebsiteSettingsRegistry::DESKTOP |
188 WebsiteSettingsRegistry::PLATFORM_ANDROID,
177 // See also NotificationPermissionContext::DecidePermission which 189 // See also NotificationPermissionContext::DecidePermission which
178 // implements additional incognito exceptions. 190 // implements additional incognito exceptions.
179 ContentSettingsInfo::INHERIT_IN_INCOGNITO_EXCEPT_ALLOW); 191 ContentSettingsInfo::INHERIT_IN_INCOGNITO_EXCEPT_ALLOW);
180 192
181 Register(CONTENT_SETTINGS_TYPE_FULLSCREEN, "fullscreen", CONTENT_SETTING_ASK, 193 Register(CONTENT_SETTINGS_TYPE_FULLSCREEN, "fullscreen", CONTENT_SETTING_ASK,
182 WebsiteSettingsInfo::SYNCABLE, 194 WebsiteSettingsInfo::SYNCABLE,
183 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme), 195 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
184 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_ASK), 196 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_ASK),
185 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE, 197 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE,
198 WebsiteSettingsRegistry::DESKTOP |
199 WebsiteSettingsRegistry::PLATFORM_ANDROID,
186 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 200 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
187 201
188 Register(CONTENT_SETTINGS_TYPE_MOUSELOCK, "mouselock", CONTENT_SETTING_ASK, 202 Register(CONTENT_SETTINGS_TYPE_MOUSELOCK, "mouselock", CONTENT_SETTING_ASK,
189 WebsiteSettingsInfo::SYNCABLE, 203 WebsiteSettingsInfo::SYNCABLE,
190 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme), 204 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
191 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, 205 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
192 CONTENT_SETTING_ASK), 206 CONTENT_SETTING_ASK),
193 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE, 207 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,
208 WebsiteSettingsRegistry::DESKTOP |
209 WebsiteSettingsRegistry::PLATFORM_ANDROID,
194 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 210 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
195 211
196 Register(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, "media-stream-mic", 212 Register(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, "media-stream-mic",
197 CONTENT_SETTING_ASK, WebsiteSettingsInfo::UNSYNCABLE, 213 CONTENT_SETTING_ASK, WebsiteSettingsInfo::UNSYNCABLE,
198 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme), 214 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
199 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, 215 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
200 CONTENT_SETTING_ASK), 216 CONTENT_SETTING_ASK),
201 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, 217 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
218 WebsiteSettingsRegistry::DESKTOP |
219 WebsiteSettingsRegistry::PLATFORM_ANDROID,
202 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 220 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
203 221
204 Register(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, "media-stream-camera", 222 Register(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, "media-stream-camera",
205 CONTENT_SETTING_ASK, WebsiteSettingsInfo::UNSYNCABLE, 223 CONTENT_SETTING_ASK, WebsiteSettingsInfo::UNSYNCABLE,
206 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme), 224 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
207 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, 225 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
208 CONTENT_SETTING_ASK), 226 CONTENT_SETTING_ASK),
209 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, 227 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
228 WebsiteSettingsRegistry::DESKTOP |
229 WebsiteSettingsRegistry::PLATFORM_ANDROID,
210 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 230 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
211 231
212 Register(CONTENT_SETTINGS_TYPE_PPAPI_BROKER, "ppapi-broker", 232 Register(CONTENT_SETTINGS_TYPE_PPAPI_BROKER, "ppapi-broker",
213 CONTENT_SETTING_ASK, WebsiteSettingsInfo::UNSYNCABLE, 233 CONTENT_SETTING_ASK, WebsiteSettingsInfo::UNSYNCABLE,
214 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme), 234 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
215 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, 235 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
216 CONTENT_SETTING_ASK), 236 CONTENT_SETTING_ASK),
217 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, 237 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
238 WebsiteSettingsRegistry::DESKTOP,
218 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 239 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
219 240
220 Register(CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, "automatic-downloads", 241 Register(CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, "automatic-downloads",
221 CONTENT_SETTING_ASK, WebsiteSettingsInfo::SYNCABLE, 242 CONTENT_SETTING_ASK, WebsiteSettingsInfo::SYNCABLE,
222 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme, 243 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme,
223 kExtensionScheme), 244 kExtensionScheme),
224 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, 245 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
225 CONTENT_SETTING_ASK), 246 CONTENT_SETTING_ASK),
226 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE, 247 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,
248 WebsiteSettingsRegistry::DESKTOP |
249 WebsiteSettingsRegistry::PLATFORM_ANDROID,
227 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 250 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
228 251
229 Register(CONTENT_SETTINGS_TYPE_MIDI_SYSEX, "midi-sysex", CONTENT_SETTING_ASK, 252 Register(CONTENT_SETTINGS_TYPE_MIDI_SYSEX, "midi-sysex", CONTENT_SETTING_ASK,
230 WebsiteSettingsInfo::SYNCABLE, WhitelistedSchemes(), 253 WebsiteSettingsInfo::SYNCABLE, WhitelistedSchemes(),
231 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, 254 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
232 CONTENT_SETTING_ASK), 255 CONTENT_SETTING_ASK),
233 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE, 256 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE,
257 WebsiteSettingsRegistry::DESKTOP |
258 WebsiteSettingsRegistry::PLATFORM_ANDROID,
234 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 259 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
235 260
236 Register(CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, "push-messaging", 261 Register(CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, "push-messaging",
237 CONTENT_SETTING_ASK, WebsiteSettingsInfo::UNSYNCABLE, 262 CONTENT_SETTING_ASK, WebsiteSettingsInfo::UNSYNCABLE,
238 WhitelistedSchemes(), 263 WhitelistedSchemes(),
239 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, 264 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
240 CONTENT_SETTING_ASK), 265 CONTENT_SETTING_ASK),
241 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE, 266 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE,
267 WebsiteSettingsRegistry::DESKTOP |
268 WebsiteSettingsRegistry::PLATFORM_ANDROID,
242 ContentSettingsInfo::INHERIT_IN_INCOGNITO_EXCEPT_ALLOW); 269 ContentSettingsInfo::INHERIT_IN_INCOGNITO_EXCEPT_ALLOW);
243 270
244 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
245 Register(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, 271 Register(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
246 "protected-media-identifier", CONTENT_SETTING_ASK, 272 "protected-media-identifier", CONTENT_SETTING_ASK,
247 WebsiteSettingsInfo::UNSYNCABLE, WhitelistedSchemes(), 273 WebsiteSettingsInfo::UNSYNCABLE, WhitelistedSchemes(),
248 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, 274 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
249 CONTENT_SETTING_ASK), 275 CONTENT_SETTING_ASK),
250 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE, 276 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE,
277 WebsiteSettingsRegistry::PLATFORM_ANDROID |
278 WebsiteSettingsRegistry::PLATFORM_CHROMEOS,
251 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 279 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
252 #endif
253 280
254 Register(CONTENT_SETTINGS_TYPE_DURABLE_STORAGE, "durable-storage", 281 Register(CONTENT_SETTINGS_TYPE_DURABLE_STORAGE, "durable-storage",
255 CONTENT_SETTING_ASK, WebsiteSettingsInfo::UNSYNCABLE, 282 CONTENT_SETTING_ASK, WebsiteSettingsInfo::UNSYNCABLE,
256 WhitelistedSchemes(), 283 WhitelistedSchemes(),
257 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), 284 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),
258 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, 285 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
286 WebsiteSettingsRegistry::DESKTOP |
287 WebsiteSettingsRegistry::PLATFORM_ANDROID,
259 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 288 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
260 289
261 Register(CONTENT_SETTINGS_TYPE_KEYGEN, "keygen", 290 Register(CONTENT_SETTINGS_TYPE_KEYGEN, "keygen", CONTENT_SETTING_BLOCK,
262 CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::SYNCABLE, 291 WebsiteSettingsInfo::SYNCABLE, WhitelistedSchemes(),
263 WhitelistedSchemes(),
264 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), 292 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),
265 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, 293 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
294 WebsiteSettingsRegistry::DESKTOP |
295 WebsiteSettingsRegistry::PLATFORM_ANDROID,
266 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 296 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
267 297
268 Register(CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC, "background-sync", 298 Register(CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC, "background-sync",
269 CONTENT_SETTING_ALLOW, WebsiteSettingsInfo::UNSYNCABLE, 299 CONTENT_SETTING_ALLOW, WebsiteSettingsInfo::UNSYNCABLE,
270 WhitelistedSchemes(), 300 WhitelistedSchemes(),
271 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), 301 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),
272 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, 302 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
303 WebsiteSettingsRegistry::DESKTOP |
304 WebsiteSettingsRegistry::PLATFORM_ANDROID,
273 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 305 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
274 306
275 Register(CONTENT_SETTINGS_TYPE_AUTOPLAY, "autoplay", 307 Register(CONTENT_SETTINGS_TYPE_AUTOPLAY, "autoplay", CONTENT_SETTING_ALLOW,
276 CONTENT_SETTING_ALLOW, WebsiteSettingsInfo::UNSYNCABLE, 308 WebsiteSettingsInfo::UNSYNCABLE, WhitelistedSchemes(),
277 WhitelistedSchemes(),
278 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), 309 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),
279 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, 310 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
311 WebsiteSettingsRegistry::DESKTOP |
312 WebsiteSettingsRegistry::PLATFORM_ANDROID,
280 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 313 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
281 314
282 // Content settings that aren't used to store any data. TODO(raymes): use a 315 // Content settings that aren't used to store any data. TODO(raymes): use a
283 // different mechanism rather than content settings to represent these. 316 // different mechanism rather than content settings to represent these.
284 // Since nothing is stored in them, there is no real point in them being a 317 // Since nothing is stored in them, there is no real point in them being a
285 // content setting. 318 // content setting.
286 Register(CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, "protocol-handler", 319 Register(CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, "protocol-handler",
287 CONTENT_SETTING_DEFAULT, WebsiteSettingsInfo::UNSYNCABLE, 320 CONTENT_SETTING_DEFAULT, WebsiteSettingsInfo::UNSYNCABLE,
288 WhitelistedSchemes(), ValidSettings(), 321 WhitelistedSchemes(), ValidSettings(),
289 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE, 322 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,
323 WebsiteSettingsRegistry::DESKTOP,
290 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 324 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
291 325
292 Register(CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, "mixed-script", 326 Register(CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, "mixed-script",
293 CONTENT_SETTING_DEFAULT, WebsiteSettingsInfo::UNSYNCABLE, 327 CONTENT_SETTING_DEFAULT, WebsiteSettingsInfo::UNSYNCABLE,
294 WhitelistedSchemes(), ValidSettings(), 328 WhitelistedSchemes(), ValidSettings(),
295 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE, 329 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,
330 WebsiteSettingsRegistry::DESKTOP,
296 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 331 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
297 332
298 Register(CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD, "bluetooth-guard", 333 Register(CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD, "bluetooth-guard",
299 CONTENT_SETTING_ASK, WebsiteSettingsInfo::UNSYNCABLE, 334 CONTENT_SETTING_ASK, WebsiteSettingsInfo::UNSYNCABLE,
300 WhitelistedSchemes(), 335 WhitelistedSchemes(),
301 ValidSettings(CONTENT_SETTING_ASK, CONTENT_SETTING_BLOCK), 336 ValidSettings(CONTENT_SETTING_ASK, CONTENT_SETTING_BLOCK),
302 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE, 337 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE,
338 WebsiteSettingsRegistry::DESKTOP |
339 WebsiteSettingsRegistry::PLATFORM_ANDROID,
303 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 340 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
304 } 341 }
305 342
306 void ContentSettingsRegistry::Register( 343 void ContentSettingsRegistry::Register(
307 ContentSettingsType type, 344 ContentSettingsType type,
308 const std::string& name, 345 const std::string& name,
309 ContentSetting initial_default_value, 346 ContentSetting initial_default_value,
310 WebsiteSettingsInfo::SyncStatus sync_status, 347 WebsiteSettingsInfo::SyncStatus sync_status,
311 const std::vector<std::string>& whitelisted_schemes, 348 const std::vector<std::string>& whitelisted_schemes,
312 const std::set<ContentSetting>& valid_settings, 349 const std::set<ContentSetting>& valid_settings,
313 WebsiteSettingsInfo::ScopingType scoping_type, 350 WebsiteSettingsInfo::ScopingType scoping_type,
351 Platforms platforms,
314 ContentSettingsInfo::IncognitoBehavior incognito_behavior) { 352 ContentSettingsInfo::IncognitoBehavior incognito_behavior) {
315 // Ensure that nothing has been registered yet for the given type. 353 // Ensure that nothing has been registered yet for the given type.
316 DCHECK(!website_settings_registry_->Get(type)); 354 DCHECK(!website_settings_registry_->Get(type));
317 DCHECK(incognito_behavior 355 DCHECK(incognito_behavior
318 != ContentSettingsInfo::INHERIT_IN_INCOGNITO_EXCEPT_ALLOW 356 != ContentSettingsInfo::INHERIT_IN_INCOGNITO_EXCEPT_ALLOW
319 || ContainsKey(valid_settings, CONTENT_SETTING_ASK)) 357 || ContainsKey(valid_settings, CONTENT_SETTING_ASK))
320 << "If INHERIT_IN_INCOGNITO_EXCEPT_ALLOW is set, ASK must be listed as a " 358 << "If INHERIT_IN_INCOGNITO_EXCEPT_ALLOW is set, ASK must be listed as a "
321 "valid setting."; 359 "valid setting.";
322 std::unique_ptr<base::Value> default_value( 360 std::unique_ptr<base::Value> default_value(
323 new base::FundamentalValue(static_cast<int>(initial_default_value))); 361 new base::FundamentalValue(static_cast<int>(initial_default_value)));
324 const WebsiteSettingsInfo* website_settings_info = 362 const WebsiteSettingsInfo* website_settings_info =
325 website_settings_registry_->Register( 363 website_settings_registry_->Register(
326 type, name, std::move(default_value), sync_status, 364 type, name, std::move(default_value), sync_status,
327 WebsiteSettingsInfo::NOT_LOSSY, scoping_type, 365 WebsiteSettingsInfo::NOT_LOSSY, scoping_type, platforms,
328 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO); 366 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);
367
368 // WebsiteSettingsInfo::Register() will return nullptr if content setting type
369 // is not used on the current platform and doesn't need to be registered.
370 if (!website_settings_info)
371 return;
372
329 DCHECK(!ContainsKey(content_settings_info_, type)); 373 DCHECK(!ContainsKey(content_settings_info_, type));
330 content_settings_info_[type] = base::WrapUnique( 374 content_settings_info_[type] = base::WrapUnique(
331 new ContentSettingsInfo(website_settings_info, whitelisted_schemes, 375 new ContentSettingsInfo(website_settings_info, whitelisted_schemes,
332 valid_settings, incognito_behavior)); 376 valid_settings, incognito_behavior));
333 } 377 }
334 378
335 } // namespace content_settings 379 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698