OLD | NEW |
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 "base/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
10 #include "base/threading/thread_task_runner_handle.h" | 10 #include "base/threading/thread_task_runner_handle.h" |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 media::BindToCurrentLoop(permission_status_cb))); | 62 media::BindToCurrentLoop(permission_status_cb))); |
63 return; | 63 return; |
64 } | 64 } |
65 | 65 |
66 DCHECK(task_runner_->RunsTasksOnCurrentThread()); | 66 DCHECK(task_runner_->RunsTasksOnCurrentThread()); |
67 | 67 |
68 if (!permission_service_) | 68 if (!permission_service_) |
69 connect_to_service_cb_.Run(mojo::GetProxy(&permission_service_)); | 69 connect_to_service_cb_.Run(mojo::GetProxy(&permission_service_)); |
70 | 70 |
71 int request_id = RegisterCallback(permission_status_cb); | 71 int request_id = RegisterCallback(permission_status_cb); |
72 DVLOG(2) << __FUNCTION__ << ": request ID " << request_id; | 72 DVLOG(2) << __func__ << ": request ID " << request_id; |
73 | 73 |
74 permission_service_->HasPermission( | 74 permission_service_->HasPermission( |
75 MediaPermissionTypeToPermissionName(type), security_origin.spec(), | 75 MediaPermissionTypeToPermissionName(type), security_origin.spec(), |
76 base::Bind(&MediaPermissionDispatcher::OnPermissionStatus, weak_ptr_, | 76 base::Bind(&MediaPermissionDispatcher::OnPermissionStatus, weak_ptr_, |
77 request_id)); | 77 request_id)); |
78 } | 78 } |
79 | 79 |
80 void MediaPermissionDispatcher::RequestPermission( | 80 void MediaPermissionDispatcher::RequestPermission( |
81 Type type, | 81 Type type, |
82 const GURL& security_origin, | 82 const GURL& security_origin, |
83 const PermissionStatusCB& permission_status_cb) { | 83 const PermissionStatusCB& permission_status_cb) { |
84 if (!task_runner_->RunsTasksOnCurrentThread()) { | 84 if (!task_runner_->RunsTasksOnCurrentThread()) { |
85 task_runner_->PostTask( | 85 task_runner_->PostTask( |
86 FROM_HERE, base::Bind(&MediaPermissionDispatcher::RequestPermission, | 86 FROM_HERE, base::Bind(&MediaPermissionDispatcher::RequestPermission, |
87 weak_ptr_, type, security_origin, | 87 weak_ptr_, type, security_origin, |
88 media::BindToCurrentLoop(permission_status_cb))); | 88 media::BindToCurrentLoop(permission_status_cb))); |
89 return; | 89 return; |
90 } | 90 } |
91 | 91 |
92 DCHECK(task_runner_->RunsTasksOnCurrentThread()); | 92 DCHECK(task_runner_->RunsTasksOnCurrentThread()); |
93 | 93 |
94 if (!permission_service_) | 94 if (!permission_service_) |
95 connect_to_service_cb_.Run(mojo::GetProxy(&permission_service_)); | 95 connect_to_service_cb_.Run(mojo::GetProxy(&permission_service_)); |
96 | 96 |
97 int request_id = RegisterCallback(permission_status_cb); | 97 int request_id = RegisterCallback(permission_status_cb); |
98 DVLOG(2) << __FUNCTION__ << ": request ID " << request_id; | 98 DVLOG(2) << __func__ << ": request ID " << request_id; |
99 | 99 |
100 permission_service_->RequestPermission( | 100 permission_service_->RequestPermission( |
101 MediaPermissionTypeToPermissionName(type), security_origin.spec(), | 101 MediaPermissionTypeToPermissionName(type), security_origin.spec(), |
102 blink::WebUserGestureIndicator::isProcessingUserGesture(), | 102 blink::WebUserGestureIndicator::isProcessingUserGesture(), |
103 base::Bind(&MediaPermissionDispatcher::OnPermissionStatus, weak_ptr_, | 103 base::Bind(&MediaPermissionDispatcher::OnPermissionStatus, weak_ptr_, |
104 request_id)); | 104 request_id)); |
105 } | 105 } |
106 | 106 |
107 uint32_t MediaPermissionDispatcher::RegisterCallback( | 107 uint32_t MediaPermissionDispatcher::RegisterCallback( |
108 const PermissionStatusCB& permission_status_cb) { | 108 const PermissionStatusCB& permission_status_cb) { |
109 DCHECK(task_runner_->RunsTasksOnCurrentThread()); | 109 DCHECK(task_runner_->RunsTasksOnCurrentThread()); |
110 | 110 |
111 uint32_t request_id = next_request_id_++; | 111 uint32_t request_id = next_request_id_++; |
112 DCHECK(!requests_.count(request_id)); | 112 DCHECK(!requests_.count(request_id)); |
113 requests_[request_id] = permission_status_cb; | 113 requests_[request_id] = permission_status_cb; |
114 | 114 |
115 return request_id; | 115 return request_id; |
116 } | 116 } |
117 | 117 |
118 void MediaPermissionDispatcher::OnPermissionStatus( | 118 void MediaPermissionDispatcher::OnPermissionStatus( |
119 uint32_t request_id, | 119 uint32_t request_id, |
120 blink::mojom::PermissionStatus status) { | 120 blink::mojom::PermissionStatus status) { |
121 DVLOG(2) << __FUNCTION__ << ": (" << request_id << ", " << status << ")"; | 121 DVLOG(2) << __func__ << ": (" << request_id << ", " << status << ")"; |
122 DCHECK(task_runner_->RunsTasksOnCurrentThread()); | 122 DCHECK(task_runner_->RunsTasksOnCurrentThread()); |
123 | 123 |
124 RequestMap::iterator iter = requests_.find(request_id); | 124 RequestMap::iterator iter = requests_.find(request_id); |
125 DCHECK(iter != requests_.end()) << "Request not found."; | 125 DCHECK(iter != requests_.end()) << "Request not found."; |
126 | 126 |
127 PermissionStatusCB permission_status_cb = iter->second; | 127 PermissionStatusCB permission_status_cb = iter->second; |
128 requests_.erase(iter); | 128 requests_.erase(iter); |
129 | 129 |
130 permission_status_cb.Run(status == blink::mojom::PermissionStatus::GRANTED); | 130 permission_status_cb.Run(status == blink::mojom::PermissionStatus::GRANTED); |
131 } | 131 } |
132 | 132 |
133 } // namespace content | 133 } // namespace content |
OLD | NEW |