| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_stream_device_settings.h" | 5 #include "content/browser/renderer_host/media/media_stream_device_settings.h" |
| 6 | 6 |
| 7 #include "base/stl_util.h" | 7 #include "base/stl_util.h" |
| 8 #include "base/task.h" | 8 #include "base/task.h" |
| 9 #include "content/browser/renderer_host/media/media_stream_settings_requester.h" | 9 #include "content/browser/renderer_host/media/media_stream_settings_requester.h" |
| 10 #include "content/common/media/media_stream_options.h" | 10 #include "content/common/media/media_stream_options.h" |
| 11 #include "content/public/browser/browser_thread.h" | 11 #include "content/public/browser/browser_thread.h" |
| 12 | 12 |
| 13 using content::BrowserThread; |
| 14 |
| 13 namespace media_stream { | 15 namespace media_stream { |
| 14 | 16 |
| 15 typedef std::map<MediaStreamType, StreamDeviceInfoArray> DeviceMap; | 17 typedef std::map<MediaStreamType, StreamDeviceInfoArray> DeviceMap; |
| 16 | 18 |
| 17 // Device request contains all data needed to keep track of requests between the | 19 // Device request contains all data needed to keep track of requests between the |
| 18 // different calls. | 20 // different calls. |
| 19 struct MediaStreamDeviceSettings::SettingsRequest { | 21 struct MediaStreamDeviceSettings::SettingsRequest { |
| 20 SettingsRequest(int render_pid, int render_vid, const std::string& origin, | 22 SettingsRequest(int render_pid, int render_vid, const std::string& origin, |
| 21 StreamOptions request_options) | 23 StreamOptions request_options) |
| 22 : render_process_id(render_pid), | 24 : render_process_id(render_pid), |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 } | 131 } |
| 130 } | 132 } |
| 131 } | 133 } |
| 132 | 134 |
| 133 void MediaStreamDeviceSettings::UseFakeUI() { | 135 void MediaStreamDeviceSettings::UseFakeUI() { |
| 134 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 136 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 135 use_fake_ui_ = true; | 137 use_fake_ui_ = true; |
| 136 } | 138 } |
| 137 | 139 |
| 138 } // namespace media_stream | 140 } // namespace media_stream |
| OLD | NEW |