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/logging.h" | 7 #include "base/logging.h" |
8 #include "content/renderer/media/media_stream_dispatcher.h" | 8 #include "content/renderer/media/media_stream_dispatcher.h" |
9 #include "content/renderer/render_view_impl.h" | 9 #include "content/renderer/render_view_impl.h" |
10 #include "ppapi/shared_impl/ppb_device_ref_shared.h" | 10 #include "ppapi/shared_impl/ppb_device_ref_shared.h" |
(...skipping 27 matching lines...) Expand all Loading... |
38 next_id_(1) { | 38 next_id_(1) { |
39 } | 39 } |
40 | 40 |
41 PepperMediaDeviceManager::~PepperMediaDeviceManager() { | 41 PepperMediaDeviceManager::~PepperMediaDeviceManager() { |
42 DCHECK(enumerate_callbacks_.empty()); | 42 DCHECK(enumerate_callbacks_.empty()); |
43 DCHECK(open_callbacks_.empty()); | 43 DCHECK(open_callbacks_.empty()); |
44 } | 44 } |
45 | 45 |
46 int PepperMediaDeviceManager::EnumerateDevices( | 46 int PepperMediaDeviceManager::EnumerateDevices( |
47 PP_DeviceType_Dev type, | 47 PP_DeviceType_Dev type, |
| 48 const GURL& document_url, |
48 const EnumerateDevicesCallback& callback) { | 49 const EnumerateDevicesCallback& callback) { |
49 enumerate_callbacks_[next_id_] = callback; | 50 enumerate_callbacks_[next_id_] = callback; |
50 int request_id = next_id_++; | 51 int request_id = next_id_++; |
51 | 52 |
52 #if defined(ENABLE_WEBRTC) | 53 #if defined(ENABLE_WEBRTC) |
53 GetRenderViewImpl()->media_stream_dispatcher()->EnumerateDevices( | 54 GetRenderViewImpl()->media_stream_dispatcher()->EnumerateDevices( |
54 request_id, AsWeakPtr(), | 55 request_id, AsWeakPtr(), |
55 PepperMediaDeviceManager::FromPepperDeviceType(type), | 56 PepperMediaDeviceManager::FromPepperDeviceType(type), |
56 GURL()); | 57 document_url.GetOrigin()); |
57 #else | 58 #else |
58 base::MessageLoop::current()->PostTask( | 59 base::MessageLoop::current()->PostTask( |
59 FROM_HERE, | 60 FROM_HERE, |
60 base::Bind( | 61 base::Bind( |
61 &PepperMediaDeviceManager::OnDevicesEnumerationFailed, | 62 &PepperMediaDeviceManager::OnDevicesEnumerationFailed, |
62 AsWeakPtr(), | 63 AsWeakPtr(), |
63 request_id)); | 64 request_id)); |
64 #endif | 65 #endif |
65 | 66 |
66 return request_id; | 67 return request_id; |
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
247 open_callbacks_.erase(iter); | 248 open_callbacks_.erase(iter); |
248 | 249 |
249 callback.Run(request_id, succeeded, label); | 250 callback.Run(request_id, succeeded, label); |
250 } | 251 } |
251 | 252 |
252 RenderViewImpl* PepperMediaDeviceManager::GetRenderViewImpl() { | 253 RenderViewImpl* PepperMediaDeviceManager::GetRenderViewImpl() { |
253 return static_cast<RenderViewImpl*>(render_view()); | 254 return static_cast<RenderViewImpl*>(render_view()); |
254 } | 255 } |
255 | 256 |
256 } // namespace content | 257 } // namespace content |
OLD | NEW |