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 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
424 #endif // defined(ENABLE_SCREEN_CAPTURE) | 424 #endif // defined(ENABLE_SCREEN_CAPTURE) |
425 break; | 425 break; |
426 } | 426 } |
427 default: { | 427 default: { |
428 NOTIMPLEMENTED(); | 428 NOTIMPLEMENTED(); |
429 break; | 429 break; |
430 } | 430 } |
431 } | 431 } |
432 | 432 |
433 if (!video_capture_device) { | 433 if (!video_capture_device) { |
434 device_client->OnError("Could not create capture device"); | 434 device_client->OnError(FROM_HERE, "Could not create capture device"); |
435 return nullptr; | 435 return nullptr; |
436 } | 436 } |
437 | 437 |
438 video_capture_device->AllocateAndStart(params, device_client.Pass()); | 438 video_capture_device->AllocateAndStart(params, device_client.Pass()); |
439 return video_capture_device.Pass(); | 439 return video_capture_device.Pass(); |
440 } | 440 } |
441 | 441 |
442 void VideoCaptureManager::StartCaptureForClient( | 442 void VideoCaptureManager::StartCaptureForClient( |
443 media::VideoCaptureSessionId session_id, | 443 media::VideoCaptureSessionId session_id, |
444 const media::VideoCaptureParams& params, | 444 const media::VideoCaptureParams& params, |
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
859 DCHECK(IsOnDeviceThread()); | 859 DCHECK(IsOnDeviceThread()); |
860 #if defined(ENABLE_SCREEN_CAPTURE) | 860 #if defined(ENABLE_SCREEN_CAPTURE) |
861 DesktopCaptureDevice* desktop_device = | 861 DesktopCaptureDevice* desktop_device = |
862 static_cast<DesktopCaptureDevice*>(device); | 862 static_cast<DesktopCaptureDevice*>(device); |
863 desktop_device->SetNotificationWindowId(window_id); | 863 desktop_device->SetNotificationWindowId(window_id); |
864 VLOG(2) << "Screen capture notification window passed on device thread."; | 864 VLOG(2) << "Screen capture notification window passed on device thread."; |
865 #endif | 865 #endif |
866 } | 866 } |
867 | 867 |
868 } // namespace content | 868 } // namespace content |
OLD | NEW |