OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/device_request_message_filter.h" | 5 #include "content/browser/renderer_host/media/device_request_message_filter.h" |
6 | 6 |
7 #include "content/browser/browser_main_loop.h" | 7 #include "content/browser/browser_main_loop.h" |
8 #include "content/browser/renderer_host/media/media_stream_manager.h" | 8 #include "content/browser/renderer_host/media/media_stream_manager.h" |
9 #include "content/common/media/media_stream_messages.h" | 9 #include "content/common/media/media_stream_messages.h" |
10 #include "content/public/browser/resource_context.h" | 10 #include "content/public/browser/resource_context.h" |
11 | 11 |
12 // Clears the MediaStreamDevice.name from all devices in |device_list|. | 12 // Clears the MediaStreamDevice.name from all devices in |device_list|. |
13 static void ClearDeviceLabels(content::StreamDeviceInfoArray* devices) { | 13 static void ClearDeviceLabels(content::StreamDeviceInfoArray* devices) { |
14 for (content::StreamDeviceInfoArray::iterator device_itr = devices->begin(); | 14 for (content::StreamDeviceInfoArray::iterator device_itr = devices->begin(); |
15 device_itr != devices->end(); | 15 device_itr != devices->end(); |
16 ++device_itr) { | 16 ++device_itr) { |
17 device_itr->device.name.clear(); | 17 device_itr->device.name.clear(); |
18 } | 18 } |
19 } | 19 } |
20 | 20 |
21 namespace content { | 21 namespace content { |
22 | 22 |
23 DeviceRequestMessageFilter::DeviceRequestMessageFilter( | 23 DeviceRequestMessageFilter::DeviceRequestMessageFilter( |
24 ResourceContext* resource_context, | 24 ResourceContext* resource_context, |
25 MediaStreamManager* media_stream_manager) | 25 MediaStreamManager* media_stream_manager) |
26 : BrowserMessageFilter(MediaStreamMsgStart), | 26 : resource_context_(resource_context), |
27 resource_context_(resource_context), | |
28 media_stream_manager_(media_stream_manager) { | 27 media_stream_manager_(media_stream_manager) { |
29 DCHECK(resource_context); | 28 DCHECK(resource_context); |
30 DCHECK(media_stream_manager); | 29 DCHECK(media_stream_manager); |
31 } | 30 } |
32 | 31 |
33 DeviceRequestMessageFilter::~DeviceRequestMessageFilter() { | 32 DeviceRequestMessageFilter::~DeviceRequestMessageFilter() { |
34 // CHECK rather than DCHECK to make sure this never happens in the | 33 // CHECK rather than DCHECK to make sure this never happens in the |
35 // wild. We want to be sure due to http://crbug.com/341211 | 34 // wild. We want to be sure due to http://crbug.com/341211 |
36 CHECK(requests_.empty()); | 35 CHECK(requests_.empty()); |
37 } | 36 } |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 const std::string& video_label = media_stream_manager_->EnumerateDevices( | 144 const std::string& video_label = media_stream_manager_->EnumerateDevices( |
146 this, -1, -1, resource_context_->GetMediaDeviceIDSalt(), -1, | 145 this, -1, -1, resource_context_->GetMediaDeviceIDSalt(), -1, |
147 MEDIA_DEVICE_VIDEO_CAPTURE, security_origin); | 146 MEDIA_DEVICE_VIDEO_CAPTURE, security_origin); |
148 DCHECK(!video_label.empty()); | 147 DCHECK(!video_label.empty()); |
149 | 148 |
150 requests_.push_back(DeviceRequest( | 149 requests_.push_back(DeviceRequest( |
151 request_id, security_origin, audio_label, video_label)); | 150 request_id, security_origin, audio_label, video_label)); |
152 } | 151 } |
153 | 152 |
154 } // namespace content | 153 } // namespace content |
OLD | NEW |