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/renderer_host/media/video_capture_controller.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/renderer_host/media/video_capture_controller.h
diff --git a/content/browser/renderer_host/media/video_capture_controller.h b/content/browser/renderer_host/media/video_capture_controller.h
index a9b93206405f5d4a777ecdb0687bf18e9226a912..710312d0cbc910ce386314180fe777f7d3e5886c 100644
--- a/content/browser/renderer_host/media/video_capture_controller.h
+++ b/content/browser/renderer_host/media/video_capture_controller.h
@@ -51,8 +51,8 @@
#include "content/browser/renderer_host/media/video_capture_controller_event_handler.h"
#include "content/common/content_export.h"
#include "content/common/media/video_capture.h"
+#include "device/capture/video/video_capture_device.h"
#include "media/base/video_capture_types.h"
-#include "media/capture/video/video_capture_device.h"
namespace content {
class VideoCaptureBufferPool;
@@ -71,7 +71,7 @@ class CONTENT_EXPORT VideoCaptureController {
// Return a new VideoCaptureDeviceClient to forward capture events to this
// instance.
- std::unique_ptr<media::VideoCaptureDevice::Client> NewDeviceClient();
+ std::unique_ptr<device::VideoCaptureDevice::Client> NewDeviceClient();
// Start video capturing and try to use the resolution specified in |params|.
// Buffers will be shared to the client as necessary. The client will continue
@@ -127,7 +127,7 @@ class CONTENT_EXPORT VideoCaptureController {
// Worker functions on IO thread. Called by the VideoCaptureDeviceClient.
virtual void DoIncomingCapturedVideoFrameOnIOThread(
- std::unique_ptr<media::VideoCaptureDevice::Client::Buffer> buffer,
+ std::unique_ptr<device::VideoCaptureDevice::Client::Buffer> buffer,
const scoped_refptr<media::VideoFrame>& frame);
virtual void DoErrorOnIOThread();
virtual void DoLogOnIOThread(const std::string& message);
@@ -139,7 +139,7 @@ class CONTENT_EXPORT VideoCaptureController {
// Notify renderer that a new buffer has been created.
void DoNewBufferOnIOThread(ControllerClient* client,
- media::VideoCaptureDevice::Client::Buffer* buffer,
+ device::VideoCaptureDevice::Client::Buffer* buffer,
const scoped_refptr<media::VideoFrame>& frame);
// Find a client of |id| and |handler| in |clients|.

Powered by Google App Engine
This is Rietveld 408576698