| 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/browser/renderer_host/media/video_capture_manager.h" | 5 #include "content/browser/renderer_host/media/video_capture_manager.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 1126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1137 new DeviceEntry(device_info.type, device_info.id, | 1137 new DeviceEntry(device_info.type, device_info.id, |
| 1138 std::move(video_capture_controller), params); | 1138 std::move(video_capture_controller), params); |
| 1139 devices_.emplace_back(new_device); | 1139 devices_.emplace_back(new_device); |
| 1140 return new_device; | 1140 return new_device; |
| 1141 } | 1141 } |
| 1142 | 1142 |
| 1143 void VideoCaptureManager::SetDesktopCaptureWindowIdOnDeviceThread( | 1143 void VideoCaptureManager::SetDesktopCaptureWindowIdOnDeviceThread( |
| 1144 media::VideoCaptureDevice* device, | 1144 media::VideoCaptureDevice* device, |
| 1145 gfx::NativeViewId window_id) { | 1145 gfx::NativeViewId window_id) { |
| 1146 DCHECK(IsOnDeviceThread()); | 1146 DCHECK(IsOnDeviceThread()); |
| 1147 #if !defined(OS_ANDROID) | 1147 #if defined(ENABLE_SCREEN_CAPTURE) && !defined(OS_ANDROID) |
| 1148 DesktopCaptureDevice* desktop_device = | 1148 DesktopCaptureDevice* desktop_device = |
| 1149 static_cast<DesktopCaptureDevice*>(device); | 1149 static_cast<DesktopCaptureDevice*>(device); |
| 1150 desktop_device->SetNotificationWindowId(window_id); | 1150 desktop_device->SetNotificationWindowId(window_id); |
| 1151 VLOG(2) << "Screen capture notification window passed on device thread."; | 1151 VLOG(2) << "Screen capture notification window passed on device thread."; |
| 1152 #endif | 1152 #endif |
| 1153 } | 1153 } |
| 1154 | 1154 |
| 1155 void VideoCaptureManager::DoGetPhotoCapabilities( | 1155 void VideoCaptureManager::DoGetPhotoCapabilities( |
| 1156 VideoCaptureDevice::GetPhotoCapabilitiesCallback callback, | 1156 VideoCaptureDevice::GetPhotoCapabilitiesCallback callback, |
| 1157 VideoCaptureDevice* device) { | 1157 VideoCaptureDevice* device) { |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1264 if (!device_in_queue) { | 1264 if (!device_in_queue) { |
| 1265 // Session ID is only valid for Screen capture. So we can fake it to | 1265 // Session ID is only valid for Screen capture. So we can fake it to |
| 1266 // resume video capture devices here. | 1266 // resume video capture devices here. |
| 1267 QueueStartDevice(kFakeSessionId, entry.get(), entry->parameters); | 1267 QueueStartDevice(kFakeSessionId, entry.get(), entry->parameters); |
| 1268 } | 1268 } |
| 1269 } | 1269 } |
| 1270 } | 1270 } |
| 1271 #endif // defined(OS_ANDROID) | 1271 #endif // defined(OS_ANDROID) |
| 1272 | 1272 |
| 1273 } // namespace content | 1273 } // namespace content |
| OLD | NEW |