Index: content/renderer/media/media_permission_dispatcher.cc |
diff --git a/content/renderer/media/media_permission_dispatcher.cc b/content/renderer/media/media_permission_dispatcher.cc |
index 7c08edd4ab883cb8867b7e17696d6502ef4ac2de..db5f36c0d638dee2d02a9de82b2385b655c409e0 100644 |
--- a/content/renderer/media/media_permission_dispatcher.cc |
+++ b/content/renderer/media/media_permission_dispatcher.cc |
@@ -11,6 +11,26 @@ |
#include "third_party/WebKit/public/web/WebUserGestureIndicator.h" |
#include "url/gurl.h" |
+namespace { |
+ |
+using Type = media::MediaPermission::Type; |
+ |
+content::PermissionName MediaPermissionTypeToPermissionName(Type type) { |
+ switch (type) { |
+ case Type::PROTECTED_MEDIA_IDENTIFIER: |
+ return content::PERMISSION_NAME_PROTECTED_MEDIA_IDENTIFIER; |
+ case Type::AUDIO_RECORDING: |
+ return content::PERMISSION_NAME_AUDIO_RECORDING; |
+ case Type::VIDEO_RECORDING: |
+ return content::PERMISSION_NAME_VIDEO_RECORDING; |
+ default: |
+ NOTREACHED(); |
+ return content::PERMISSION_NAME_PROTECTED_MEDIA_IDENTIFIER; |
+ } |
xhwang
2015/08/28 05:08:41
remove "default" and move l.27-28 out of the "swit
|
+} |
+ |
+} // namespace |
+ |
namespace content { |
MediaPermissionDispatcher::MediaPermissionDispatcher(RenderFrame* render_frame) |
@@ -32,7 +52,6 @@ void MediaPermissionDispatcher::HasPermission( |
const GURL& security_origin, |
const PermissionStatusCB& permission_status_cb) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
- CHECK_EQ(PROTECTED_MEDIA_IDENTIFIER, type); |
if (!permission_service_.get()) { |
render_frame()->GetServiceRegistry()->ConnectToRemoteService( |
@@ -46,7 +65,7 @@ void MediaPermissionDispatcher::HasPermission( |
DVLOG(2) << __FUNCTION__ << ": request ID " << request_id; |
permission_service_->HasPermission( |
- PERMISSION_NAME_PROTECTED_MEDIA_IDENTIFIER, security_origin.spec(), |
+ MediaPermissionTypeToPermissionName(type), security_origin.spec(), |
base::Bind(&MediaPermissionDispatcher::OnPermissionStatus, |
base::Unretained(this), request_id)); |
} |
@@ -56,7 +75,6 @@ void MediaPermissionDispatcher::RequestPermission( |
const GURL& security_origin, |
const PermissionStatusCB& permission_status_cb) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
- CHECK_EQ(PROTECTED_MEDIA_IDENTIFIER, type); |
if (!permission_service_.get()) { |
render_frame()->GetServiceRegistry()->ConnectToRemoteService( |
@@ -70,7 +88,7 @@ void MediaPermissionDispatcher::RequestPermission( |
DVLOG(2) << __FUNCTION__ << ": request ID " << request_id; |
permission_service_->RequestPermission( |
- PERMISSION_NAME_PROTECTED_MEDIA_IDENTIFIER, security_origin.spec(), |
+ MediaPermissionTypeToPermissionName(type), security_origin.spec(), |
blink::WebUserGestureIndicator::isProcessingUserGesture(), |
base::Bind(&MediaPermissionDispatcher::OnPermissionStatus, |
base::Unretained(this), request_id)); |