chrome/browser/media/media_capture_devices_dispatcher.cc - Issue 965103004: Stop using the MEDIASTREAM content setting.

Unified Diff: chrome/browser/media/media_capture_devices_dispatcher.cc

Issue 965103004: Stop using the MEDIASTREAM content setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase over 1004733003. Created 5 years, 9 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/content_settings/host_content_settings_map_unittest.cc ('k') | chrome/browser/media/media_stream_device_permissions.h » ('j') | components/content_settings/core/browser/content_settings_default_provider.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/media_capture_devices_dispatcher.cc

diff --git a/chrome/browser/media/media_capture_devices_dispatcher.cc b/chrome/browser/media/media_capture_devices_dispatcher.cc

index ef6127b337e5a3a6aaec44dac7a5c4bee431a59b..f4e538187b3df0b10df6ac7aedbcea7a3b24cc27 100644

--- a/chrome/browser/media/media_capture_devices_dispatcher.cc

+++ b/chrome/browser/media/media_capture_devices_dispatcher.cc

@@ -397,8 +397,15 @@ bool MediaCaptureDevicesDispatcher::CheckMediaAccessPermission(

}

#endif

- if (CheckAllowAllMediaStreamContentForOrigin(profile, security_origin))

+ ContentSettingsType contentSettingsType =

+ type == content::MEDIA_DEVICE_AUDIO_CAPTURE

+ ? CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC

+ : CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA;

+ if (CheckAllowAllMediaStreamContentForOrigin(

+ profile, security_origin, contentSettingsType)) {

return true;

+ }

const char* policy_name = type == content::MEDIA_DEVICE_AUDIO_CAPTURE

? prefs::kAudioCaptureAllowed

@@ -417,9 +424,7 @@ bool MediaCaptureDevicesDispatcher::CheckMediaAccessPermission(

if (profile->GetHostContentSettingsMap()->GetContentSetting(

security_origin,

- type == content::MEDIA_DEVICE_AUDIO_CAPTURE

- ? CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC

- : CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,

+ contentSettingsType,

NO_RESOURCE_IDENTIFIER) == CONTENT_SETTING_ALLOW) {

return true;

}

@@ -438,8 +443,15 @@ bool MediaCaptureDevicesDispatcher::CheckMediaAccessPermission(

Profile* profile =

Profile::FromBrowserContext(web_contents->GetBrowserContext());

- if (CheckAllowAllMediaStreamContentForOrigin(profile, security_origin))

+ ContentSettingsType contentSettingsType =

+ type == content::MEDIA_DEVICE_AUDIO_CAPTURE

+ ? CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC

+ : CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA;

+ if (CheckAllowAllMediaStreamContentForOrigin(

+ profile, security_origin, contentSettingsType)) {

return true;

+ }

const char* policy_name = type == content::MEDIA_DEVICE_AUDIO_CAPTURE

? prefs::kAudioCaptureAllowed

@@ -458,9 +470,7 @@ bool MediaCaptureDevicesDispatcher::CheckMediaAccessPermission(

if (profile->GetHostContentSettingsMap()->GetContentSetting(

security_origin,

- type == content::MEDIA_DEVICE_AUDIO_CAPTURE

- ? CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC

- : CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,

+ contentSettingsType,

NO_RESOURCE_IDENTIFIER) == CONTENT_SETTING_ALLOW) {

return true;

}