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

Unified Diff: content/browser/renderer_host/media/video_capture_provider_switcher.cc

Issue 2902203002: [Mojo Video Capture] Hook up connection lost events (Closed)
Patch Set: Fix duplicate member introduced during merging Created 3 years, 7 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
« no previous file with comments | « content/browser/renderer_host/media/video_capture_provider.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/video_capture_provider_switcher.cc
diff --git a/content/browser/renderer_host/media/video_capture_provider_switcher.cc b/content/browser/renderer_host/media/video_capture_provider_switcher.cc
index eaeb799d405c0e0de53a594bbb6c5ffd22009c0c..3cc09afc01bc42bdda53e683d532b734fd060b0f 100644
--- a/content/browser/renderer_host/media/video_capture_provider_switcher.cc
+++ b/content/browser/renderer_host/media/video_capture_provider_switcher.cc
@@ -24,6 +24,7 @@ class VideoCaptureDeviceLauncherSwitcher : public VideoCaptureDeviceLauncher {
MediaStreamType stream_type,
const media::VideoCaptureParams& params,
base::WeakPtr<media::VideoFrameReceiver> receiver,
+ base::OnceClosure connection_lost_cb,
Callbacks* callbacks,
base::OnceClosure done_cb) override {
if (stream_type == content::MEDIA_DEVICE_VIDEO_CAPTURE) {
@@ -33,8 +34,8 @@ class VideoCaptureDeviceLauncherSwitcher : public VideoCaptureDeviceLauncher {
base::Bind(&VideoCaptureDeviceLauncher::AbortLaunch,
base::Unretained(media_device_launcher_.get()));
return media_device_launcher_->LaunchDeviceAsync(
- device_id, stream_type, params, std::move(receiver), callbacks,
- std::move(done_cb));
+ device_id, stream_type, params, std::move(receiver),
+ std::move(connection_lost_cb), callbacks, std::move(done_cb));
}
// Use of Unretained() is safe, because |other_types_launcher_| is owned by
// |this|.
@@ -42,8 +43,8 @@ class VideoCaptureDeviceLauncherSwitcher : public VideoCaptureDeviceLauncher {
base::Bind(&VideoCaptureDeviceLauncher::AbortLaunch,
base::Unretained(other_types_launcher_.get()));
return other_types_launcher_->LaunchDeviceAsync(
- device_id, stream_type, params, std::move(receiver), callbacks,
- std::move(done_cb));
+ device_id, stream_type, params, std::move(receiver),
+ std::move(connection_lost_cb), callbacks, std::move(done_cb));
}
void AbortLaunch() override {
« no previous file with comments | « content/browser/renderer_host/media/video_capture_provider.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698