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/renderer_host/media/media_devices_dispatcher_host.h" | 5 #include "content/browser/renderer_host/media/media_devices_dispatcher_host.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 ::mojom::MediaDevicesListenerPtr media_devices_listener; | 222 ::mojom::MediaDevicesListenerPtr media_devices_listener; |
223 if (device_change_listener_) { | 223 if (device_change_listener_) { |
224 media_devices_listener = std::move(device_change_listener_); | 224 media_devices_listener = std::move(device_change_listener_); |
225 } else { | 225 } else { |
226 RenderFrameHost* render_frame_host = | 226 RenderFrameHost* render_frame_host = |
227 RenderFrameHost::FromID(render_process_id_, render_frame_id_); | 227 RenderFrameHost::FromID(render_process_id_, render_frame_id_); |
228 if (!render_frame_host) | 228 if (!render_frame_host) |
229 return; | 229 return; |
230 | 230 |
231 render_frame_host->GetRemoteInterfaces()->GetInterface( | 231 render_frame_host->GetRemoteInterfaces()->GetInterface( |
232 mojo::GetProxy(&media_devices_listener)); | 232 mojo::MakeRequest(&media_devices_listener)); |
233 if (!media_devices_listener) | 233 if (!media_devices_listener) |
234 return; | 234 return; |
235 } | 235 } |
236 | 236 |
237 for (const auto& subscription : subscriptions) { | 237 for (const auto& subscription : subscriptions) { |
238 bool has_permission = permission_checker_->CheckPermissionOnUIThread( | 238 bool has_permission = permission_checker_->CheckPermissionOnUIThread( |
239 type, render_process_id_, render_frame_id_, | 239 type, render_process_id_, render_frame_id_, |
240 subscription.security_origin); | 240 subscription.security_origin); |
241 media_devices_listener->OnDevicesChanged( | 241 media_devices_listener->OnDevicesChanged( |
242 type, subscription.subscription_id, | 242 type, subscription.subscription_id, |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
287 for (const auto& device_info : enumeration[i]) { | 287 for (const auto& device_info : enumeration[i]) { |
288 result[i].push_back(TranslateDeviceInfo(has_permissions[i], | 288 result[i].push_back(TranslateDeviceInfo(has_permissions[i], |
289 device_id_salt_, group_id_salt_, | 289 device_id_salt_, group_id_salt_, |
290 security_origin, device_info)); | 290 security_origin, device_info)); |
291 } | 291 } |
292 } | 292 } |
293 client_callback.Run(result); | 293 client_callback.Run(result); |
294 } | 294 } |
295 | 295 |
296 } // namespace content | 296 } // namespace content |
OLD | NEW |