| 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 task_runner_->PostTask( | 68 task_runner_->PostTask( |
| 69 FROM_HERE, base::Bind(&MediaPermissionDispatcher::HasPermission, | 69 FROM_HERE, base::Bind(&MediaPermissionDispatcher::HasPermission, |
| 70 weak_ptr_, type, security_origin, | 70 weak_ptr_, type, security_origin, |
| 71 media::BindToCurrentLoop(permission_status_cb))); | 71 media::BindToCurrentLoop(permission_status_cb))); |
| 72 return; | 72 return; |
| 73 } | 73 } |
| 74 | 74 |
| 75 DCHECK(task_runner_->RunsTasksOnCurrentThread()); | 75 DCHECK(task_runner_->RunsTasksOnCurrentThread()); |
| 76 | 76 |
| 77 if (!permission_service_) | 77 if (!permission_service_) |
| 78 connect_to_service_cb_.Run(mojo::GetProxy(&permission_service_)); | 78 connect_to_service_cb_.Run(mojo::MakeRequest(&permission_service_)); |
| 79 | 79 |
| 80 int request_id = RegisterCallback(permission_status_cb); | 80 int request_id = RegisterCallback(permission_status_cb); |
| 81 DVLOG(2) << __func__ << ": request ID " << request_id; | 81 DVLOG(2) << __func__ << ": request ID " << request_id; |
| 82 | 82 |
| 83 permission_service_->HasPermission( | 83 permission_service_->HasPermission( |
| 84 MediaPermissionTypeToPermissionDescriptor(type), | 84 MediaPermissionTypeToPermissionDescriptor(type), |
| 85 url::Origin(security_origin), | 85 url::Origin(security_origin), |
| 86 base::Bind(&MediaPermissionDispatcher::OnPermissionStatus, weak_ptr_, | 86 base::Bind(&MediaPermissionDispatcher::OnPermissionStatus, weak_ptr_, |
| 87 request_id)); | 87 request_id)); |
| 88 } | 88 } |
| 89 | 89 |
| 90 void MediaPermissionDispatcher::RequestPermission( | 90 void MediaPermissionDispatcher::RequestPermission( |
| 91 Type type, | 91 Type type, |
| 92 const GURL& security_origin, | 92 const GURL& security_origin, |
| 93 const PermissionStatusCB& permission_status_cb) { | 93 const PermissionStatusCB& permission_status_cb) { |
| 94 if (!task_runner_->RunsTasksOnCurrentThread()) { | 94 if (!task_runner_->RunsTasksOnCurrentThread()) { |
| 95 task_runner_->PostTask( | 95 task_runner_->PostTask( |
| 96 FROM_HERE, base::Bind(&MediaPermissionDispatcher::RequestPermission, | 96 FROM_HERE, base::Bind(&MediaPermissionDispatcher::RequestPermission, |
| 97 weak_ptr_, type, security_origin, | 97 weak_ptr_, type, security_origin, |
| 98 media::BindToCurrentLoop(permission_status_cb))); | 98 media::BindToCurrentLoop(permission_status_cb))); |
| 99 return; | 99 return; |
| 100 } | 100 } |
| 101 | 101 |
| 102 DCHECK(task_runner_->RunsTasksOnCurrentThread()); | 102 DCHECK(task_runner_->RunsTasksOnCurrentThread()); |
| 103 | 103 |
| 104 if (!permission_service_) | 104 if (!permission_service_) |
| 105 connect_to_service_cb_.Run(mojo::GetProxy(&permission_service_)); | 105 connect_to_service_cb_.Run(mojo::MakeRequest(&permission_service_)); |
| 106 | 106 |
| 107 int request_id = RegisterCallback(permission_status_cb); | 107 int request_id = RegisterCallback(permission_status_cb); |
| 108 DVLOG(2) << __func__ << ": request ID " << request_id; | 108 DVLOG(2) << __func__ << ": request ID " << request_id; |
| 109 | 109 |
| 110 permission_service_->RequestPermission( | 110 permission_service_->RequestPermission( |
| 111 MediaPermissionTypeToPermissionDescriptor(type), | 111 MediaPermissionTypeToPermissionDescriptor(type), |
| 112 url::Origin(security_origin), | 112 url::Origin(security_origin), |
| 113 blink::WebUserGestureIndicator::isProcessingUserGesture(), | 113 blink::WebUserGestureIndicator::isProcessingUserGesture(), |
| 114 base::Bind(&MediaPermissionDispatcher::OnPermissionStatus, weak_ptr_, | 114 base::Bind(&MediaPermissionDispatcher::OnPermissionStatus, weak_ptr_, |
| 115 request_id)); | 115 request_id)); |
| (...skipping 19 matching lines...) Expand all Loading... |
| 135 RequestMap::iterator iter = requests_.find(request_id); | 135 RequestMap::iterator iter = requests_.find(request_id); |
| 136 DCHECK(iter != requests_.end()) << "Request not found."; | 136 DCHECK(iter != requests_.end()) << "Request not found."; |
| 137 | 137 |
| 138 PermissionStatusCB permission_status_cb = iter->second; | 138 PermissionStatusCB permission_status_cb = iter->second; |
| 139 requests_.erase(iter); | 139 requests_.erase(iter); |
| 140 | 140 |
| 141 permission_status_cb.Run(status == blink::mojom::PermissionStatus::GRANTED); | 141 permission_status_cb.Run(status == blink::mojom::PermissionStatus::GRANTED); |
| 142 } | 142 } |
| 143 | 143 |
| 144 } // namespace content | 144 } // namespace content |
| OLD | NEW |