| Index: content/browser/media/capture/desktop_capture_device.h
|
| diff --git a/content/browser/media/capture/desktop_capture_device.h b/content/browser/media/capture/desktop_capture_device.h
|
| index 2cb77e668bd74d9c8ba9622d0de602254ff84ca5..2133cdb2e57a43a29b5772477a070bdfcd9418f3 100644
|
| --- a/content/browser/media/capture/desktop_capture_device.h
|
| +++ b/content/browser/media/capture/desktop_capture_device.h
|
| @@ -12,7 +12,7 @@
|
| #include "base/threading/thread.h"
|
| #include "content/common/content_export.h"
|
| #include "content/public/browser/desktop_media_id.h"
|
| -#include "media/capture/video/video_capture_device.h"
|
| +#include "device/capture/video/video_capture_device.h"
|
| #include "ui/gfx/native_widget_types.h"
|
|
|
| namespace base {
|
| @@ -29,12 +29,12 @@ namespace content {
|
| // DesktopCaptureDevice implements VideoCaptureDevice for screens and windows.
|
| // It's essentially an adapter between webrtc::DesktopCapturer and
|
| // VideoCaptureDevice.
|
| -class CONTENT_EXPORT DesktopCaptureDevice : public media::VideoCaptureDevice {
|
| +class CONTENT_EXPORT DesktopCaptureDevice : public device::VideoCaptureDevice {
|
| public:
|
| // Creates capturer for the specified |source| and then creates
|
| // DesktopCaptureDevice for it. May return NULL in case of a failure (e.g. if
|
| // requested window was destroyed).
|
| - static std::unique_ptr<media::VideoCaptureDevice> Create(
|
| + static std::unique_ptr<device::VideoCaptureDevice> Create(
|
| const DesktopMediaID& source);
|
|
|
| ~DesktopCaptureDevice() override;
|
|
|