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

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

Issue 1545243002: Convert Pass()→std::move() in //content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/web_contents_video_capture_device.cc
diff --git a/content/browser/media/capture/web_contents_video_capture_device.cc b/content/browser/media/capture/web_contents_video_capture_device.cc
index 0f5de4ef5e54085deb5f6c1ef88c7c9e9e443357..311669fbc3baec8139355038cddd86e1841df9e8 100644
--- a/content/browser/media/capture/web_contents_video_capture_device.cc
+++ b/content/browser/media/capture/web_contents_video_capture_device.cc
@@ -50,9 +50,9 @@
#include "content/browser/media/capture/web_contents_video_capture_device.h"
-#include <algorithm>
-
#include <stdint.h>
+#include <algorithm>
+#include <utility>
#include "base/bind.h"
#include "base/callback_helpers.h"
@@ -466,7 +466,7 @@ ContentCaptureSubscription::ContentCaptureSubscription(
: base::WeakPtr<CursorRenderer>(),
window_activity_tracker_ ? window_activity_tracker_->GetWeakPtr()
: base::WeakPtr<WindowActivityTracker>()));
- view->BeginFrameSubscription(subscriber.Pass());
+ view->BeginFrameSubscription(std::move(subscriber));
}
// Subscribe to timer events. This instance will service these as well.
@@ -966,7 +966,7 @@ void WebContentsVideoCaptureDevice::AllocateAndStart(
const media::VideoCaptureParams& params,
scoped_ptr<Client> client) {
DVLOG(1) << "Allocating " << params.requested_format.frame_size.ToString();
- core_->AllocateAndStart(params, client.Pass());
+ core_->AllocateAndStart(params, std::move(client));
}
void WebContentsVideoCaptureDevice::StopAndDeAllocate() {

Powered by Google App Engine
This is Rietveld 408576698