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

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

Issue 2458453002: [sensors] Add Permission guard to the generic sensor apis.
Patch Set: Move permissions stuff to SensorProxy, remove aw related stuff Created 4 years, 1 month 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 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 248
249 Register(CONTENT_SETTINGS_TYPE_MIDI_SYSEX, "midi-sysex", CONTENT_SETTING_ASK, 249 Register(CONTENT_SETTINGS_TYPE_MIDI_SYSEX, "midi-sysex", CONTENT_SETTING_ASK,
250 WebsiteSettingsInfo::SYNCABLE, WhitelistedSchemes(), 250 WebsiteSettingsInfo::SYNCABLE, WhitelistedSchemes(),
251 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, 251 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
252 CONTENT_SETTING_ASK), 252 CONTENT_SETTING_ASK),
253 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE, 253 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE,
254 WebsiteSettingsRegistry::DESKTOP | 254 WebsiteSettingsRegistry::DESKTOP |
255 WebsiteSettingsRegistry::PLATFORM_ANDROID, 255 WebsiteSettingsRegistry::PLATFORM_ANDROID,
256 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 256 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
257 257
258 Register(CONTENT_SETTINGS_TYPE_SENSORS, "sensors", CONTENT_SETTING_ASK,
259 WebsiteSettingsInfo::SYNCABLE, WhitelistedSchemes(),
260 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
261 CONTENT_SETTING_ASK),
262 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE,
263 WebsiteSettingsRegistry::DESKTOP |
264 WebsiteSettingsRegistry::PLATFORM_ANDROID,
265 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
266
258 Register(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, 267 Register(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
259 "protected-media-identifier", CONTENT_SETTING_ASK, 268 "protected-media-identifier", CONTENT_SETTING_ASK,
260 WebsiteSettingsInfo::UNSYNCABLE, WhitelistedSchemes(), 269 WebsiteSettingsInfo::UNSYNCABLE, WhitelistedSchemes(),
261 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, 270 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
262 CONTENT_SETTING_ASK), 271 CONTENT_SETTING_ASK),
263 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE, 272 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE,
264 WebsiteSettingsRegistry::PLATFORM_ANDROID | 273 WebsiteSettingsRegistry::PLATFORM_ANDROID |
265 WebsiteSettingsRegistry::PLATFORM_CHROMEOS, 274 WebsiteSettingsRegistry::PLATFORM_CHROMEOS,
266 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 275 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
267 276
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 if (!website_settings_info) 366 if (!website_settings_info)
358 return; 367 return;
359 368
360 DCHECK(!base::ContainsKey(content_settings_info_, type)); 369 DCHECK(!base::ContainsKey(content_settings_info_, type));
361 content_settings_info_[type] = base::MakeUnique<ContentSettingsInfo>( 370 content_settings_info_[type] = base::MakeUnique<ContentSettingsInfo>(
362 website_settings_info, whitelisted_schemes, valid_settings, 371 website_settings_info, whitelisted_schemes, valid_settings,
363 incognito_behavior); 372 incognito_behavior);
364 } 373 }
365 374
366 } // namespace content_settings 375 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698