| 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/thread_task_runner_handle.h" | 10 #include "base/thread_task_runner_handle.h" |
| 11 #include "media/base/bind_to_current_loop.h" | 11 #include "media/base/bind_to_current_loop.h" |
| 12 #include "url/gurl.h" | 12 #include "url/gurl.h" |
| 13 | 13 |
| 14 namespace { | 14 namespace { |
| 15 | 15 |
| 16 using Type = media::MediaPermission::Type; | 16 using Type = media::MediaPermission::Type; |
| 17 | 17 |
| 18 content::PermissionName MediaPermissionTypeToPermissionName(Type type) { | 18 content::mojom::PermissionName MediaPermissionTypeToPermissionName(Type type) { |
| 19 switch (type) { | 19 switch (type) { |
| 20 case Type::PROTECTED_MEDIA_IDENTIFIER: | 20 case Type::PROTECTED_MEDIA_IDENTIFIER: |
| 21 return content::PermissionName::PROTECTED_MEDIA_IDENTIFIER; | 21 return content::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER; |
| 22 case Type::AUDIO_CAPTURE: | 22 case Type::AUDIO_CAPTURE: |
| 23 return content::PermissionName::AUDIO_CAPTURE; | 23 return content::mojom::PermissionName::AUDIO_CAPTURE; |
| 24 case Type::VIDEO_CAPTURE: | 24 case Type::VIDEO_CAPTURE: |
| 25 return content::PermissionName::VIDEO_CAPTURE; | 25 return content::mojom::PermissionName::VIDEO_CAPTURE; |
| 26 } | 26 } |
| 27 NOTREACHED(); | 27 NOTREACHED(); |
| 28 return content::PermissionName::PROTECTED_MEDIA_IDENTIFIER; | 28 return content::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER; |
| 29 } | 29 } |
| 30 | 30 |
| 31 } // namespace | 31 } // namespace |
| 32 | 32 |
| 33 namespace content { | 33 namespace content { |
| 34 | 34 |
| 35 MediaPermissionDispatcher::MediaPermissionDispatcher( | 35 MediaPermissionDispatcher::MediaPermissionDispatcher( |
| 36 const ConnectToServiceCB& connect_to_service_cb) | 36 const ConnectToServiceCB& connect_to_service_cb) |
| 37 : connect_to_service_cb_(connect_to_service_cb), | 37 : connect_to_service_cb_(connect_to_service_cb), |
| 38 task_runner_(base::ThreadTaskRunnerHandle::Get()), | 38 task_runner_(base::ThreadTaskRunnerHandle::Get()), |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 const PermissionStatusCB& permission_status_cb) { | 106 const PermissionStatusCB& permission_status_cb) { |
| 107 DCHECK(task_runner_->RunsTasksOnCurrentThread()); | 107 DCHECK(task_runner_->RunsTasksOnCurrentThread()); |
| 108 | 108 |
| 109 uint32_t request_id = next_request_id_++; | 109 uint32_t request_id = next_request_id_++; |
| 110 DCHECK(!requests_.count(request_id)); | 110 DCHECK(!requests_.count(request_id)); |
| 111 requests_[request_id] = permission_status_cb; | 111 requests_[request_id] = permission_status_cb; |
| 112 | 112 |
| 113 return request_id; | 113 return request_id; |
| 114 } | 114 } |
| 115 | 115 |
| 116 void MediaPermissionDispatcher::OnPermissionStatus(uint32_t request_id, | 116 void MediaPermissionDispatcher::OnPermissionStatus( |
| 117 PermissionStatus status) { | 117 uint32_t request_id, |
| 118 mojom::PermissionStatus status) { |
| 118 DVLOG(2) << __FUNCTION__ << ": (" << request_id << ", " << status << ")"; | 119 DVLOG(2) << __FUNCTION__ << ": (" << request_id << ", " << status << ")"; |
| 119 DCHECK(task_runner_->RunsTasksOnCurrentThread()); | 120 DCHECK(task_runner_->RunsTasksOnCurrentThread()); |
| 120 | 121 |
| 121 RequestMap::iterator iter = requests_.find(request_id); | 122 RequestMap::iterator iter = requests_.find(request_id); |
| 122 DCHECK(iter != requests_.end()) << "Request not found."; | 123 DCHECK(iter != requests_.end()) << "Request not found."; |
| 123 | 124 |
| 124 PermissionStatusCB permission_status_cb = iter->second; | 125 PermissionStatusCB permission_status_cb = iter->second; |
| 125 requests_.erase(iter); | 126 requests_.erase(iter); |
| 126 | 127 |
| 127 permission_status_cb.Run(status == PermissionStatus::GRANTED); | 128 permission_status_cb.Run(status == mojom::PermissionStatus::GRANTED); |
| 128 } | 129 } |
| 129 | 130 |
| 130 } // namespace content | 131 } // namespace content |
| OLD | NEW |