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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 | 93 |
94 return CheckSinglePermissionOnUIThread(device_type, render_process_id, | 94 return CheckSinglePermissionOnUIThread(device_type, render_process_id, |
95 render_frame_id, security_origin); | 95 render_frame_id, security_origin); |
96 } | 96 } |
97 | 97 |
98 void MediaDevicesPermissionChecker::CheckPermission( | 98 void MediaDevicesPermissionChecker::CheckPermission( |
99 MediaDeviceType device_type, | 99 MediaDeviceType device_type, |
100 int render_process_id, | 100 int render_process_id, |
101 int render_frame_id, | 101 int render_frame_id, |
102 const url::Origin& security_origin, | 102 const url::Origin& security_origin, |
103 const base::Callback<void(bool)>& callback) const { | 103 base::OnceCallback<void(bool)> callback) const { |
104 if (use_override_) { | 104 if (use_override_) { |
105 callback.Run(override_value_); | 105 std::move(callback).Run(override_value_); |
106 return; | 106 return; |
107 } | 107 } |
108 | 108 |
109 BrowserThread::PostTaskAndReplyWithResult( | 109 BrowserThread::PostTaskAndReplyWithResult( |
110 BrowserThread::UI, FROM_HERE, | 110 BrowserThread::UI, FROM_HERE, |
111 base::Bind(&CheckSinglePermissionOnUIThread, device_type, | 111 base::BindOnce(&CheckSinglePermissionOnUIThread, device_type, |
112 render_process_id, render_frame_id, security_origin), | 112 render_process_id, render_frame_id, security_origin), |
113 callback); | 113 std::move(callback)); |
114 } | 114 } |
115 | 115 |
116 void MediaDevicesPermissionChecker::CheckPermissions( | 116 void MediaDevicesPermissionChecker::CheckPermissions( |
117 MediaDevicesManager::BoolDeviceTypes requested, | 117 MediaDevicesManager::BoolDeviceTypes requested, |
118 int render_process_id, | 118 int render_process_id, |
119 int render_frame_id, | 119 int render_frame_id, |
120 const url::Origin& security_origin, | 120 const url::Origin& security_origin, |
121 const base::Callback<void(const MediaDevicesManager::BoolDeviceTypes&)>& | 121 base::OnceCallback<void(const MediaDevicesManager::BoolDeviceTypes&)> |
122 callback) const { | 122 callback) const { |
123 if (use_override_) { | 123 if (use_override_) { |
124 MediaDevicesManager::BoolDeviceTypes result; | 124 MediaDevicesManager::BoolDeviceTypes result; |
125 result.fill(override_value_); | 125 result.fill(override_value_); |
126 callback.Run(result); | 126 std::move(callback).Run(result); |
127 return; | 127 return; |
128 } | 128 } |
129 | 129 |
130 BrowserThread::PostTaskAndReplyWithResult( | 130 BrowserThread::PostTaskAndReplyWithResult( |
131 BrowserThread::UI, FROM_HERE, | 131 BrowserThread::UI, FROM_HERE, |
132 base::Bind(&DoCheckPermissionsOnUIThread, requested, render_process_id, | 132 base::BindOnce(&DoCheckPermissionsOnUIThread, requested, |
133 render_frame_id, security_origin), | 133 render_process_id, render_frame_id, security_origin), |
134 callback); | 134 std::move(callback)); |
135 } | 135 } |
136 | 136 |
137 } // namespace content | 137 } // namespace content |
OLD | NEW |