| Index: content/browser/media/capture/aura_window_capture_machine.h
|
| diff --git a/content/browser/media/capture/aura_window_capture_machine.h b/content/browser/media/capture/aura_window_capture_machine.h
|
| index 848c3251de8fd35497f52e36c0fe63ec5f27940d..72618d80584f769eaf5548dceaa1f8cbc4179649 100644
|
| --- a/content/browser/media/capture/aura_window_capture_machine.h
|
| +++ b/content/browser/media/capture/aura_window_capture_machine.h
|
| @@ -10,7 +10,7 @@
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "content/browser/media/capture/cursor_renderer_aura.h"
|
| -#include "media/capture/content/screen_capture_device_core.h"
|
| +#include "device/capture/content/screen_capture_device_core.h"
|
| #include "ui/aura/window.h"
|
| #include "ui/aura/window_observer.h"
|
| #include "ui/base/cursor/cursors_aura.h"
|
| @@ -31,16 +31,15 @@ class ReadbackYUVInterface;
|
|
|
| namespace content {
|
|
|
| -class AuraWindowCaptureMachine
|
| - : public media::VideoCaptureMachine,
|
| - public aura::WindowObserver,
|
| - public ui::CompositorAnimationObserver {
|
| +class AuraWindowCaptureMachine : public device::VideoCaptureMachine,
|
| + public aura::WindowObserver,
|
| + public ui::CompositorAnimationObserver {
|
| public:
|
| AuraWindowCaptureMachine();
|
| ~AuraWindowCaptureMachine() override;
|
|
|
| // VideoCaptureMachine overrides.
|
| - void Start(const scoped_refptr<media::ThreadSafeCaptureOracle>& oracle_proxy,
|
| + void Start(const scoped_refptr<device::ThreadSafeCaptureOracle>& oracle_proxy,
|
| const media::VideoCaptureParams& params,
|
| const base::Callback<void(bool)> callback) override;
|
| void Stop(const base::Closure& callback) override;
|
| @@ -64,7 +63,7 @@ class AuraWindowCaptureMachine
|
|
|
| private:
|
| bool InternalStart(
|
| - const scoped_refptr<media::ThreadSafeCaptureOracle>& oracle_proxy,
|
| + const scoped_refptr<device::ThreadSafeCaptureOracle>& oracle_proxy,
|
| const media::VideoCaptureParams& params);
|
| void InternalStop(const base::Closure& callback);
|
|
|
| @@ -76,7 +75,7 @@ class AuraWindowCaptureMachine
|
| void UpdateCaptureSize();
|
|
|
| using CaptureFrameCallback =
|
| - media::ThreadSafeCaptureOracle::CaptureFrameCallback;
|
| + device::ThreadSafeCaptureOracle::CaptureFrameCallback;
|
|
|
| // Response callback for cc::Layer::RequestCopyOfOutput().
|
| void DidCopyOutput(scoped_refptr<media::VideoFrame> video_frame,
|
| @@ -110,7 +109,7 @@ class AuraWindowCaptureMachine
|
| bool screen_capture_;
|
|
|
| // Makes all the decisions about which frames to copy, and how.
|
| - scoped_refptr<media::ThreadSafeCaptureOracle> oracle_proxy_;
|
| + scoped_refptr<device::ThreadSafeCaptureOracle> oracle_proxy_;
|
|
|
| // The capture parameters for this capture.
|
| media::VideoCaptureParams capture_params_;
|
|
|