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

Unified Diff: content/browser/renderer_host/media/video_capture_manager.h

Issue 2518143004: [Mojo Video Capture] Replace RESOURCE_UTILIZATION with interface ReceiverLoadObserver (Closed)
Patch Set: Fixes for failing bots Created 4 years, 1 month 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_manager.h
diff --git a/content/browser/renderer_host/media/video_capture_manager.h b/content/browser/renderer_host/media/video_capture_manager.h
index cc309de1b7acc61631816872377937e792ebcfe9..e3cc5c3861df811c1c65aed5430e3d88b3ded300 100644
--- a/content/browser/renderer_host/media/video_capture_manager.h
+++ b/content/browser/renderer_host/media/video_capture_manager.h
@@ -37,6 +37,10 @@
#include "base/android/application_status_listener.h"
#endif
+namespace media {
+class VideoCaptureDeviceClient;
+}
+
namespace content {
class VideoCaptureController;
class VideoCaptureControllerEventHandler;
@@ -240,6 +244,7 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
DeviceEntry* entry,
const media::VideoCaptureParams& params);
void OnDeviceStarted(int serial_id,
+ media::VideoCaptureDeviceClient* device_client_ptr,
std::unique_ptr<VideoCaptureDevice> device);
void DoStopDevice(DeviceEntry* entry);
void HandleQueuedStartRequest();
@@ -251,17 +256,17 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
std::unique_ptr<VideoCaptureDevice> DoStartDeviceCaptureOnDeviceThread(
const VideoCaptureDeviceDescriptor& descriptor,
const media::VideoCaptureParams& params,
- std::unique_ptr<VideoCaptureDevice::Client> client);
+ std::unique_ptr<media::VideoCaptureDeviceClient> client);
std::unique_ptr<VideoCaptureDevice> DoStartTabCaptureOnDeviceThread(
const std::string& device_id,
const media::VideoCaptureParams& params,
- std::unique_ptr<VideoCaptureDevice::Client> client);
+ std::unique_ptr<media::VideoCaptureDeviceClient> client);
std::unique_ptr<VideoCaptureDevice> DoStartDesktopCaptureOnDeviceThread(
const std::string& device_id,
const media::VideoCaptureParams& params,
- std::unique_ptr<VideoCaptureDevice::Client> client);
+ std::unique_ptr<media::VideoCaptureDeviceClient> client);
// Stops and destroys the VideoCaptureDevice held in |device|.
void DoStopDeviceOnDeviceThread(std::unique_ptr<VideoCaptureDevice> device);

Powered by Google App Engine
This is Rietveld 408576698