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

Unified Diff: content/browser/renderer_host/media/video_capture_controller.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/renderer_host/media/video_capture_controller.cc
diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc
index 1094773bd2e13deec66c714559f1fca0bb2d6627..002f893ea72cb97d04158d1f109f7b6ae0f2c022 100644
--- a/content/browser/renderer_host/media/video_capture_controller.cc
+++ b/content/browser/renderer_host/media/video_capture_controller.cc
@@ -144,7 +144,7 @@ VideoCaptureController::GetWeakPtrForIOThread() {
return weak_ptr_factory_.GetWeakPtr();
}
-std::unique_ptr<media::VideoCaptureDevice::Client>
+std::unique_ptr<device::VideoCaptureDevice::Client>
VideoCaptureController::NewDeviceClient() {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
return base::WrapUnique(new VideoCaptureDeviceClient(
@@ -355,7 +355,7 @@ VideoCaptureController::~VideoCaptureController() {
}
void VideoCaptureController::DoIncomingCapturedVideoFrameOnIOThread(
- std::unique_ptr<media::VideoCaptureDevice::Client::Buffer> buffer,
+ std::unique_ptr<device::VideoCaptureDevice::Client::Buffer> buffer,
const scoped_refptr<VideoFrame>& frame) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
const int buffer_id = buffer->id();
@@ -458,7 +458,7 @@ void VideoCaptureController::DoBufferDestroyedOnIOThread(
void VideoCaptureController::DoNewBufferOnIOThread(
ControllerClient* client,
- media::VideoCaptureDevice::Client::Buffer* buffer,
+ device::VideoCaptureDevice::Client::Buffer* buffer,
const scoped_refptr<media::VideoFrame>& frame) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
const int buffer_id = buffer->id();

Powered by Google App Engine
This is Rietveld 408576698