Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(818)

Unified Diff: content/browser/media/capture/desktop_capture_device_aura.h

Issue 2214533002: move //media/capture to //device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/media/capture/desktop_capture_device_aura.h
diff --git a/content/browser/media/capture/desktop_capture_device_aura.h b/content/browser/media/capture/desktop_capture_device_aura.h
index 73a7d53761cdb59a6fa53560dab5cefdffa027a5..f2b49d386f1c159ed3f631a755398cf5380e5562 100644
--- a/content/browser/media/capture/desktop_capture_device_aura.h
+++ b/content/browser/media/capture/desktop_capture_device_aura.h
@@ -11,8 +11,8 @@
#include "base/macros.h"
#include "content/common/content_export.h"
#include "content/public/browser/desktop_media_id.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 aura {
class Window;
@@ -22,11 +22,11 @@ namespace content {
// An implementation of VideoCaptureDevice that mirrors an Aura window.
class CONTENT_EXPORT DesktopCaptureDeviceAura
- : public media::VideoCaptureDevice {
+ : public device::VideoCaptureDevice {
public:
// Creates a VideoCaptureDevice for the Aura desktop. If |source| does not
// reference a registered aura window, returns nullptr instead.
- static std::unique_ptr<media::VideoCaptureDevice> Create(
+ static std::unique_ptr<device::VideoCaptureDevice> Create(
const DesktopMediaID& source);
~DesktopCaptureDeviceAura() override;
@@ -40,7 +40,7 @@ class CONTENT_EXPORT DesktopCaptureDeviceAura
private:
explicit DesktopCaptureDeviceAura(const DesktopMediaID& source);
- std::unique_ptr<media::ScreenCaptureDeviceCore> core_;
+ std::unique_ptr<device::ScreenCaptureDeviceCore> core_;
DISALLOW_COPY_AND_ASSIGN(DesktopCaptureDeviceAura);
};
« no previous file with comments | « content/browser/media/capture/desktop_capture_device.cc ('k') | content/browser/media/capture/desktop_capture_device_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698