| Index: content/browser/media/capture/web_contents_video_capture_device.h
|
| diff --git a/content/browser/media/capture/web_contents_video_capture_device.h b/content/browser/media/capture/web_contents_video_capture_device.h
|
| index ea92b3b2f0f1db573cd53d3ecb5ced4e48bfceab..4fd68088a9f73ec126128e8000d0209a54751a12 100644
|
| --- a/content/browser/media/capture/web_contents_video_capture_device.h
|
| +++ b/content/browser/media/capture/web_contents_video_capture_device.h
|
| @@ -10,8 +10,8 @@
|
|
|
| #include "base/macros.h"
|
| #include "content/common/content_export.h"
|
| -#include "media/capture/content/screen_capture_device_core.h"
|
| -#include "media/capture/video/video_capture_device.h"
|
| +#include "device/capture/content/screen_capture_device_core.h"
|
| +#include "device/capture/video/video_capture_device.h"
|
|
|
| namespace content {
|
|
|
| @@ -26,16 +26,16 @@ namespace content {
|
| // WebContents instance. As the RenderFrameHost tree mutates (e.g., due to page
|
| // navigations, or crashes/reloads), capture will continue without interruption.
|
| class CONTENT_EXPORT WebContentsVideoCaptureDevice
|
| - : public media::VideoCaptureDevice {
|
| + : public device::VideoCaptureDevice {
|
| public:
|
| // Create a WebContentsVideoCaptureDevice instance from the given
|
| // |device_id|. Returns NULL if |device_id| is invalid.
|
| - static media::VideoCaptureDevice* Create(const std::string& device_id);
|
| + static device::VideoCaptureDevice* Create(const std::string& device_id);
|
|
|
| ~WebContentsVideoCaptureDevice() override;
|
|
|
| // VideoCaptureDevice implementation.
|
| - void AllocateAndStart(const media::VideoCaptureParams& params,
|
| + void AllocateAndStart(const device::VideoCaptureParams& params,
|
| std::unique_ptr<Client> client) override;
|
| void RequestRefreshFrame() override;
|
| void StopAndDeAllocate() override;
|
| @@ -46,7 +46,7 @@ class CONTENT_EXPORT WebContentsVideoCaptureDevice
|
| int main_render_frame_id,
|
| bool enable_auto_throttling);
|
|
|
| - const std::unique_ptr<media::ScreenCaptureDeviceCore> core_;
|
| + const std::unique_ptr<device::ScreenCaptureDeviceCore> core_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WebContentsVideoCaptureDevice);
|
| };
|
|
|