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

Unified Diff: chrome/browser/permissions/permission_manager.cc

Issue 1311783007: refactor to Introduce AUDIO_CAPTURE and VIDEO_CAPTURE permissions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
Index: chrome/browser/permissions/permission_manager.cc
diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
index e39955ab7c364015d180c9bb05e67b771d752814..8cd21445b6b5e610335881d61e94c95aa3d95dd1 100644
--- a/chrome/browser/permissions/permission_manager.cc
+++ b/chrome/browser/permissions/permission_manager.cc
@@ -63,6 +63,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.
palmer 2015/09/01 18:31:04 Same here: just put the default case inside the sw
guoweis_left_chromium 2015/09/01 19:36:34 intentionally leave out default to have compiler c
break;
@@ -207,9 +211,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()));
palmer 2015/09/01 18:31:04 I'm still really anxious about this. I believe it
guoweis_left_chromium 2015/09/01 19:36:34 crbug.com/527149 filed for this.
}
void PermissionManager::RegisterPermissionUsage(PermissionType permission,

Powered by Google App Engine
This is Rietveld 408576698