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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/capture/video/scoped_result_callback.h

Issue 2062333002: mojo::Callback -> base::Callback (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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 | « media/capture/video/fake_video_capture_device_unittest.cc ('k') | media/mojo/services/mojo_cdm_promise.cc » ('j') | mojo/public/cpp/bindings/callback.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/capture/video/scoped_result_callback.h
diff --git a/media/capture/video/scoped_result_callback.h b/media/capture/video/scoped_result_callback.h
index d61100f7aae1fd3a1f3f8ee1ad9440749fcd0d10..59727ed05f4b6293da1bff8febe7b6f9a1cbce42 100644
--- a/media/capture/video/scoped_result_callback.h
+++ b/media/capture/video/scoped_result_callback.h
@@ -32,7 +32,7 @@ class ScopedResultCallback {
ScopedResultCallback& operator=(ScopedResultCallback&& other) {
callback_ = other.callback_;
- other.callback_.reset();
+ other.callback_.Reset();
on_error_callback_ = other.on_error_callback_;
other.on_error_callback_.Reset();
return *this;
@@ -44,7 +44,7 @@ class ScopedResultCallback {
// TODO(mcasas): Use base::ResetAndReturn() when mojo::Callback<> is
// compatible with base::Callback<>, see https://crbug.com/596521.
callback_.Run(std::forward<Args>(args)...);
- callback_.reset();
+ callback_.Reset();
}
private:
« no previous file with comments | « media/capture/video/fake_video_capture_device_unittest.cc ('k') | media/mojo/services/mojo_cdm_promise.cc » ('j') | mojo/public/cpp/bindings/callback.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698