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

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

Issue 1576073003: Support Audio for Desktop Capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Style Fix Created 4 years, 11 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 <utility> 7 #include <utility>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, 255 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
256 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 256 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
257 257
258 Register(CONTENT_SETTINGS_TYPE_KEYGEN, "keygen", 258 Register(CONTENT_SETTINGS_TYPE_KEYGEN, "keygen",
259 CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::SYNCABLE, 259 CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::SYNCABLE,
260 WhitelistedSchemes(), 260 WhitelistedSchemes(),
261 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), 261 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),
262 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, 262 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
263 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 263 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
264 264
265 Register(CONTENT_SETTINGS_TYPE_DESKTOP_AUDIO_SHARE, "desktop-audio-share",
raymes 2016/01/17 23:27:34 Could you please explain why the content setting i
qiangchen 2016/01/19 17:33:22 Sure. We are going to attach the audio stream when
msramek 2016/01/19 18:02:20 Drive by! Disclaimer: I'm not generally opposed to
qiangchen 2016/01/20 18:00:18 Thanks for your comment. Several options in my min
266 CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::SYNCABLE,
267 WhitelistedSchemes(),
268 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),
269 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
270 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
271
265 // Content settings that aren't used to store any data. TODO(raymes): use a 272 // Content settings that aren't used to store any data. TODO(raymes): use a
266 // different mechanism rather than content settings to represent these. 273 // different mechanism rather than content settings to represent these.
267 // Since nothing is stored in them, there is no real point in them being a 274 // Since nothing is stored in them, there is no real point in them being a
268 // content setting. 275 // content setting.
269 Register(CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, "protocol-handler", 276 Register(CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, "protocol-handler",
270 CONTENT_SETTING_DEFAULT, WebsiteSettingsInfo::UNSYNCABLE, 277 CONTENT_SETTING_DEFAULT, WebsiteSettingsInfo::UNSYNCABLE,
271 WhitelistedSchemes(), ValidSettings(), 278 WhitelistedSchemes(), ValidSettings(),
272 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE, 279 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,
273 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 280 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
274 281
(...skipping 26 matching lines...) Expand all
301 website_settings_registry_->Register( 308 website_settings_registry_->Register(
302 type, name, std::move(default_value), sync_status, 309 type, name, std::move(default_value), sync_status,
303 WebsiteSettingsInfo::NOT_LOSSY, scoping_type); 310 WebsiteSettingsInfo::NOT_LOSSY, scoping_type);
304 DCHECK(!ContainsKey(content_settings_info_, type)); 311 DCHECK(!ContainsKey(content_settings_info_, type));
305 content_settings_info_[type] = make_scoped_ptr( 312 content_settings_info_[type] = make_scoped_ptr(
306 new ContentSettingsInfo(website_settings_info, whitelisted_schemes, 313 new ContentSettingsInfo(website_settings_info, whitelisted_schemes,
307 valid_settings, incognito_behavior)); 314 valid_settings, incognito_behavior));
308 } 315 }
309 316
310 } // namespace content_settings 317 } // namespace content_settings
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/desktop_media_picker_views.cc ('k') | components/content_settings/core/common/content_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698