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

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

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.cc
diff --git a/content/browser/media/capture/desktop_capture_device_aura.cc b/content/browser/media/capture/desktop_capture_device_aura.cc
index ac8929bfa8d68fca0997ff19fd094f95ee38013b..3d6cde79ee5c0d40aac9d5a61b3364b0bff79a29 100644
--- a/content/browser/media/capture/desktop_capture_device_aura.cc
+++ b/content/browser/media/capture/desktop_capture_device_aura.cc
@@ -31,7 +31,7 @@ void SetCaptureSource(AuraWindowCaptureMachine* machine,
DesktopCaptureDeviceAura::DesktopCaptureDeviceAura(
const DesktopMediaID& source) {
AuraWindowCaptureMachine* machine = new AuraWindowCaptureMachine();
- core_.reset(new media::ScreenCaptureDeviceCore(base::WrapUnique(machine)));
+ core_.reset(new device::ScreenCaptureDeviceCore(base::WrapUnique(machine)));
// |core_| owns |machine| and deletes it on UI thread so passing the raw
// pointer to the UI thread is safe here.
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
@@ -43,11 +43,11 @@ DesktopCaptureDeviceAura::~DesktopCaptureDeviceAura() {
}
// static
-std::unique_ptr<media::VideoCaptureDevice> DesktopCaptureDeviceAura::Create(
+std::unique_ptr<device::VideoCaptureDevice> DesktopCaptureDeviceAura::Create(
const DesktopMediaID& source) {
if (source.aura_id == DesktopMediaID::kNullId)
return nullptr;
- return std::unique_ptr<media::VideoCaptureDevice>(
+ return std::unique_ptr<device::VideoCaptureDevice>(
new DesktopCaptureDeviceAura(source));
}

Powered by Google App Engine
This is Rietveld 408576698