| Index: chrome/browser/permissions/permission_manager.cc
|
| diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
|
| index d8697a265619b7b48d86e65248d85c3dfda69114..e6d4c7d7d8b9136f749bb3e1748a49de64e5c0ec 100644
|
| --- a/chrome/browser/permissions/permission_manager.cc
|
| +++ b/chrome/browser/permissions/permission_manager.cc
|
| @@ -64,6 +64,10 @@ ContentSettingsType PermissionTypeToContentSetting(PermissionType permission) {
|
| case PermissionType::MIDI:
|
| // This will hit the NOTREACHED below.
|
| break;
|
| + case PermissionType::AUDIO_CAPTURE:
|
| + return CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC;
|
| + case PermissionType::VIDEO_CAPTURE:
|
| + return CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA;
|
| case PermissionType::NUM:
|
| // This will hit the NOTREACHED below.
|
| break;
|
| @@ -219,9 +223,8 @@ PermissionStatus PermissionManager::GetPermissionStatus(
|
| if (!context)
|
| return content::PERMISSION_STATUS_DENIED;
|
|
|
| - return ContentSettingToPermissionStatus(
|
| - context->GetPermissionStatus(requesting_origin.GetOrigin(),
|
| - embedding_origin.GetOrigin()));
|
| + return ContentSettingToPermissionStatus(context->GetPermissionStatus(
|
| + requesting_origin.GetOrigin(), embedding_origin.GetOrigin()));
|
| }
|
|
|
| void PermissionManager::RegisterPermissionUsage(PermissionType permission,
|
|
|