| 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/media/capture/desktop_capture_device_aura.h" | 5 #include "content/browser/media/capture/desktop_capture_device_aura.h" |
| 6 | 6 |
| 7 #include <utility> |
| 8 |
| 7 #include "base/logging.h" | 9 #include "base/logging.h" |
| 8 #include "base/timer/timer.h" | 10 #include "base/timer/timer.h" |
| 9 #include "content/browser/media/capture/aura_window_capture_machine.h" | 11 #include "content/browser/media/capture/aura_window_capture_machine.h" |
| 10 #include "content/public/browser/browser_thread.h" | 12 #include "content/public/browser/browser_thread.h" |
| 11 #include "ui/aura/window.h" | 13 #include "ui/aura/window.h" |
| 12 | 14 |
| 13 namespace content { | 15 namespace content { |
| 14 | 16 |
| 15 namespace { | 17 namespace { |
| 16 | 18 |
| (...skipping 28 matching lines...) Expand all Loading... |
| 45 if (source.aura_id == DesktopMediaID::kNullId) | 47 if (source.aura_id == DesktopMediaID::kNullId) |
| 46 return nullptr; | 48 return nullptr; |
| 47 return scoped_ptr<media::VideoCaptureDevice>( | 49 return scoped_ptr<media::VideoCaptureDevice>( |
| 48 new DesktopCaptureDeviceAura(source)); | 50 new DesktopCaptureDeviceAura(source)); |
| 49 } | 51 } |
| 50 | 52 |
| 51 void DesktopCaptureDeviceAura::AllocateAndStart( | 53 void DesktopCaptureDeviceAura::AllocateAndStart( |
| 52 const media::VideoCaptureParams& params, | 54 const media::VideoCaptureParams& params, |
| 53 scoped_ptr<Client> client) { | 55 scoped_ptr<Client> client) { |
| 54 DVLOG(1) << "Allocating " << params.requested_format.frame_size.ToString(); | 56 DVLOG(1) << "Allocating " << params.requested_format.frame_size.ToString(); |
| 55 core_->AllocateAndStart(params, client.Pass()); | 57 core_->AllocateAndStart(params, std::move(client)); |
| 56 } | 58 } |
| 57 | 59 |
| 58 void DesktopCaptureDeviceAura::StopAndDeAllocate() { | 60 void DesktopCaptureDeviceAura::StopAndDeAllocate() { |
| 59 core_->StopAndDeAllocate(); | 61 core_->StopAndDeAllocate(); |
| 60 } | 62 } |
| 61 | 63 |
| 62 } // namespace content | 64 } // namespace content |
| OLD | NEW |