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

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

Issue 2047633002: Revert of Remove base/move.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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..9c937e8a2815b2ecbd883f3397d2a40344ff9e4d 100644
--- a/media/capture/video/scoped_result_callback.h
+++ b/media/capture/video/scoped_result_callback.h
@@ -6,7 +6,6 @@
#define MEDIA_CAPTURE_VIDEO_SCOPED_RESULT_CALLBACK_H_
#include "base/callback_forward.h"
-#include "base/macros.h"
#include "mojo/public/cpp/bindings/callback.h"
namespace media {
@@ -15,6 +14,8 @@
// to |on_error_callback_| on destruction. Inspired by ScopedWebCallbacks<>.
template <typename CallbackType>
class ScopedResultCallback {
+ MOVE_ONLY_TYPE_FOR_CPP_03(ScopedResultCallback);
+
public:
using OnErrorCallback = base::Callback<void(const CallbackType&)>;
ScopedResultCallback(const CallbackType& callback,
@@ -50,8 +51,6 @@
private:
CallbackType callback_;
OnErrorCallback on_error_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedResultCallback);
};
} // namespace media

Powered by Google App Engine
This is Rietveld 408576698