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

Side by Side Diff: content/renderer/media/media_permission_dispatcher.cc

Issue 1314923007: Add support for MediaPermissionDispatcher to use other permission types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
« no previous file with comments | « no previous file | media/base/media_permission.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "content/renderer/media/media_permission_dispatcher.h" 5 #include "content/renderer/media/media_permission_dispatcher.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "content/public/common/service_registry.h" 9 #include "content/public/common/service_registry.h"
10 #include "content/public/renderer/render_frame.h" 10 #include "content/public/renderer/render_frame.h"
11 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h" 11 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
12 #include "url/gurl.h" 12 #include "url/gurl.h"
13 13
14 namespace {
15
16 using Type = media::MediaPermission::Type;
17
18 content::PermissionName MediaPermissionTypeToPermissionName(Type type) {
19 switch (type) {
20 case Type::PROTECTED_MEDIA_IDENTIFIER:
21 return content::PERMISSION_NAME_PROTECTED_MEDIA_IDENTIFIER;
22 case Type::AUDIO_CAPTURE:
23 return content::PERMISSION_NAME_AUDIO_CAPTURE;
24 case Type::VIDEO_CAPTURE:
25 return content::PERMISSION_NAME_VIDEO_CAPTURE;
26 }
27 NOTREACHED();
28 return content::PERMISSION_NAME_PROTECTED_MEDIA_IDENTIFIER;
29 }
30
31 } // namespace
32
14 namespace content { 33 namespace content {
15 34
16 MediaPermissionDispatcher::MediaPermissionDispatcher(RenderFrame* render_frame) 35 MediaPermissionDispatcher::MediaPermissionDispatcher(RenderFrame* render_frame)
17 : RenderFrameObserver(render_frame), next_request_id_(0) { 36 : RenderFrameObserver(render_frame), next_request_id_(0) {
18 } 37 }
19 38
20 MediaPermissionDispatcher::~MediaPermissionDispatcher() { 39 MediaPermissionDispatcher::~MediaPermissionDispatcher() {
21 DCHECK(thread_checker_.CalledOnValidThread()); 40 DCHECK(thread_checker_.CalledOnValidThread());
22 41
23 // Fire all pending callbacks with |false|. 42 // Fire all pending callbacks with |false|.
24 for (auto& request : requests_) 43 for (auto& request : requests_)
25 request.second.Run(false); 44 request.second.Run(false);
26 45
27 requests_.clear(); 46 requests_.clear();
28 } 47 }
29 48
30 void MediaPermissionDispatcher::HasPermission( 49 void MediaPermissionDispatcher::HasPermission(
31 Type type, 50 Type type,
32 const GURL& security_origin, 51 const GURL& security_origin,
33 const PermissionStatusCB& permission_status_cb) { 52 const PermissionStatusCB& permission_status_cb) {
34 DCHECK(thread_checker_.CalledOnValidThread()); 53 DCHECK(thread_checker_.CalledOnValidThread());
35 CHECK_EQ(PROTECTED_MEDIA_IDENTIFIER, type);
36 54
37 if (!permission_service_.get()) { 55 if (!permission_service_.get()) {
38 render_frame()->GetServiceRegistry()->ConnectToRemoteService( 56 render_frame()->GetServiceRegistry()->ConnectToRemoteService(
39 mojo::GetProxy(&permission_service_)); 57 mojo::GetProxy(&permission_service_));
40 } 58 }
41 59
42 uint32_t request_id = next_request_id_++; 60 uint32_t request_id = next_request_id_++;
43 DCHECK(!requests_.count(request_id)); 61 DCHECK(!requests_.count(request_id));
44 requests_[request_id] = permission_status_cb; 62 requests_[request_id] = permission_status_cb;
45 63
46 DVLOG(2) << __FUNCTION__ << ": request ID " << request_id; 64 DVLOG(2) << __FUNCTION__ << ": request ID " << request_id;
47 65
48 permission_service_->HasPermission( 66 permission_service_->HasPermission(
49 PERMISSION_NAME_PROTECTED_MEDIA_IDENTIFIER, security_origin.spec(), 67 MediaPermissionTypeToPermissionName(type), security_origin.spec(),
50 base::Bind(&MediaPermissionDispatcher::OnPermissionStatus, 68 base::Bind(&MediaPermissionDispatcher::OnPermissionStatus,
51 base::Unretained(this), request_id)); 69 base::Unretained(this), request_id));
52 } 70 }
53 71
54 void MediaPermissionDispatcher::RequestPermission( 72 void MediaPermissionDispatcher::RequestPermission(
55 Type type, 73 Type type,
56 const GURL& security_origin, 74 const GURL& security_origin,
57 const PermissionStatusCB& permission_status_cb) { 75 const PermissionStatusCB& permission_status_cb) {
58 DCHECK(thread_checker_.CalledOnValidThread()); 76 DCHECK(thread_checker_.CalledOnValidThread());
59 CHECK_EQ(PROTECTED_MEDIA_IDENTIFIER, type);
60 77
61 if (!permission_service_.get()) { 78 if (!permission_service_.get()) {
62 render_frame()->GetServiceRegistry()->ConnectToRemoteService( 79 render_frame()->GetServiceRegistry()->ConnectToRemoteService(
63 mojo::GetProxy(&permission_service_)); 80 mojo::GetProxy(&permission_service_));
64 } 81 }
65 82
66 uint32_t request_id = next_request_id_++; 83 uint32_t request_id = next_request_id_++;
67 DCHECK(!requests_.count(request_id)); 84 DCHECK(!requests_.count(request_id));
68 requests_[request_id] = permission_status_cb; 85 requests_[request_id] = permission_status_cb;
69 86
70 DVLOG(2) << __FUNCTION__ << ": request ID " << request_id; 87 DVLOG(2) << __FUNCTION__ << ": request ID " << request_id;
71 88
72 permission_service_->RequestPermission( 89 permission_service_->RequestPermission(
73 PERMISSION_NAME_PROTECTED_MEDIA_IDENTIFIER, security_origin.spec(), 90 MediaPermissionTypeToPermissionName(type), security_origin.spec(),
74 blink::WebUserGestureIndicator::isProcessingUserGesture(), 91 blink::WebUserGestureIndicator::isProcessingUserGesture(),
75 base::Bind(&MediaPermissionDispatcher::OnPermissionStatus, 92 base::Bind(&MediaPermissionDispatcher::OnPermissionStatus,
76 base::Unretained(this), request_id)); 93 base::Unretained(this), request_id));
77 } 94 }
78 95
79 void MediaPermissionDispatcher::OnPermissionStatus(uint32_t request_id, 96 void MediaPermissionDispatcher::OnPermissionStatus(uint32_t request_id,
80 PermissionStatus status) { 97 PermissionStatus status) {
81 DVLOG(2) << __FUNCTION__ << ": (" << request_id << ", " << status << ")"; 98 DVLOG(2) << __FUNCTION__ << ": (" << request_id << ", " << status << ")";
82 DCHECK(thread_checker_.CalledOnValidThread()); 99 DCHECK(thread_checker_.CalledOnValidThread());
83 100
84 RequestMap::iterator iter = requests_.find(request_id); 101 RequestMap::iterator iter = requests_.find(request_id);
85 if (iter == requests_.end()) { 102 if (iter == requests_.end()) {
86 DVLOG(2) << "Request not found."; 103 DVLOG(2) << "Request not found.";
87 return; 104 return;
88 } 105 }
89 106
90 PermissionStatusCB permission_status_cb = iter->second; 107 PermissionStatusCB permission_status_cb = iter->second;
91 requests_.erase(iter); 108 requests_.erase(iter);
92 109
93 permission_status_cb.Run(status == PERMISSION_STATUS_GRANTED); 110 permission_status_cb.Run(status == PERMISSION_STATUS_GRANTED);
94 } 111 }
95 112
96 } // namespace content 113 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | media/base/media_permission.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698