| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/browser/media/media_devices_permission_checker.h" | 5 #include "content/browser/media/media_devices_permission_checker.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 return override_value_; | 89 return override_value_; |
| 90 | 90 |
| 91 return CheckSinglePermissionOnUIThread(device_type, render_process_id, | 91 return CheckSinglePermissionOnUIThread(device_type, render_process_id, |
| 92 render_frame_id); | 92 render_frame_id); |
| 93 } | 93 } |
| 94 | 94 |
| 95 void MediaDevicesPermissionChecker::CheckPermission( | 95 void MediaDevicesPermissionChecker::CheckPermission( |
| 96 MediaDeviceType device_type, | 96 MediaDeviceType device_type, |
| 97 int render_process_id, | 97 int render_process_id, |
| 98 int render_frame_id, | 98 int render_frame_id, |
| 99 const base::Callback<void(bool)>& callback) const { | 99 base::OnceCallback<void(bool)> callback) const { |
| 100 if (use_override_) { | 100 if (use_override_) { |
| 101 callback.Run(override_value_); | 101 std::move(callback).Run(override_value_); |
| 102 return; | 102 return; |
| 103 } | 103 } |
| 104 | 104 |
| 105 BrowserThread::PostTaskAndReplyWithResult( | 105 BrowserThread::PostTaskAndReplyWithResult( |
| 106 BrowserThread::UI, FROM_HERE, | 106 BrowserThread::UI, FROM_HERE, |
| 107 base::Bind(&CheckSinglePermissionOnUIThread, device_type, | 107 base::BindOnce(&CheckSinglePermissionOnUIThread, device_type, |
| 108 render_process_id, render_frame_id), | 108 render_process_id, render_frame_id), |
| 109 callback); | 109 std::move(callback)); |
| 110 } | 110 } |
| 111 | 111 |
| 112 void MediaDevicesPermissionChecker::CheckPermissions( | 112 void MediaDevicesPermissionChecker::CheckPermissions( |
| 113 MediaDevicesManager::BoolDeviceTypes requested, | 113 MediaDevicesManager::BoolDeviceTypes requested, |
| 114 int render_process_id, | 114 int render_process_id, |
| 115 int render_frame_id, | 115 int render_frame_id, |
| 116 const base::Callback<void(const MediaDevicesManager::BoolDeviceTypes&)>& | 116 base::OnceCallback<void(const MediaDevicesManager::BoolDeviceTypes&)> |
| 117 callback) const { | 117 callback) const { |
| 118 if (use_override_) { | 118 if (use_override_) { |
| 119 MediaDevicesManager::BoolDeviceTypes result; | 119 MediaDevicesManager::BoolDeviceTypes result; |
| 120 result.fill(override_value_); | 120 result.fill(override_value_); |
| 121 callback.Run(result); | 121 std::move(callback).Run(result); |
| 122 return; | 122 return; |
| 123 } | 123 } |
| 124 | 124 |
| 125 BrowserThread::PostTaskAndReplyWithResult( | 125 BrowserThread::PostTaskAndReplyWithResult( |
| 126 BrowserThread::UI, FROM_HERE, | 126 BrowserThread::UI, FROM_HERE, |
| 127 base::Bind(&DoCheckPermissionsOnUIThread, requested, render_process_id, | 127 base::BindOnce(&DoCheckPermissionsOnUIThread, requested, |
| 128 render_frame_id), | 128 render_process_id, render_frame_id), |
| 129 callback); | 129 std::move(callback)); |
| 130 } | 130 } |
| 131 | 131 |
| 132 } // namespace content | 132 } // namespace content |
| OLD | NEW |