| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/pepper/pepper_media_device_manager.h" | 5 #include "content/renderer/pepper/pepper_media_device_manager.h" |
| 6 | 6 |
| 7 #include "base/location.h" | 7 #include "base/location.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 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 256 static_cast<RenderFrameImpl*>(render_frame())->GetMediaStreamDispatcher(); | 256 static_cast<RenderFrameImpl*>(render_frame())->GetMediaStreamDispatcher(); |
| 257 DCHECK(dispatcher); | 257 DCHECK(dispatcher); |
| 258 return dispatcher; | 258 return dispatcher; |
| 259 } | 259 } |
| 260 | 260 |
| 261 const ::mojom::MediaDevicesDispatcherHostPtr& | 261 const ::mojom::MediaDevicesDispatcherHostPtr& |
| 262 PepperMediaDeviceManager::GetMediaDevicesDispatcher() { | 262 PepperMediaDeviceManager::GetMediaDevicesDispatcher() { |
| 263 if (!media_devices_dispatcher_) { | 263 if (!media_devices_dispatcher_) { |
| 264 DCHECK(render_frame()); | 264 DCHECK(render_frame()); |
| 265 render_frame()->GetRemoteInterfaces()->GetInterface( | 265 render_frame()->GetRemoteInterfaces()->GetInterface( |
| 266 mojo::GetProxy(&media_devices_dispatcher_)); | 266 mojo::MakeRequest(&media_devices_dispatcher_)); |
| 267 } | 267 } |
| 268 | 268 |
| 269 return media_devices_dispatcher_; | 269 return media_devices_dispatcher_; |
| 270 } | 270 } |
| 271 | 271 |
| 272 void PepperMediaDeviceManager::OnDestruct() { | 272 void PepperMediaDeviceManager::OnDestruct() { |
| 273 delete this; | 273 delete this; |
| 274 } | 274 } |
| 275 | 275 |
| 276 } // namespace content | 276 } // namespace content |
| OLD | NEW |