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

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

Issue 2080513002: Deletes mojo::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/scoped_result_callback.h ('k') | media/mojo/clients/mojo_demuxer_stream_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/capture/video/video_capture_device.h
diff --git a/media/capture/video/video_capture_device.h b/media/capture/video/video_capture_device.h
index 4cd89b54df0e0d606dc3fdd7128bfb98b29c1ef2..ece443299db7cfe7afc6888e0dd79d4d44812c14 100644
--- a/media/capture/video/video_capture_device.h
+++ b/media/capture/video/video_capture_device.h
@@ -19,6 +19,7 @@
#include <memory>
#include <string>
+#include "base/callback.h"
#include "base/files/file.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
@@ -30,7 +31,6 @@
#include "media/base/video_frame.h"
#include "media/capture/video/scoped_result_callback.h"
#include "mojo/public/cpp/bindings/array.h"
-#include "mojo/public/cpp/bindings/callback.h"
#include "ui/gfx/gpu_memory_buffer.h"
namespace tracked_objects {
@@ -315,7 +315,7 @@ class MEDIA_EXPORT VideoCaptureDevice {
// and/or interrupting the capture flow. Runs |callback| on the thread
// where TakePhoto() is called, if the photo was successfully taken.
using TakePhotoCallback =
- mojo::Callback<void(mojo::String, mojo::Array<uint8_t>)>;
+ base::Callback<void(mojo::String, mojo::Array<uint8_t>)>;
virtual void TakePhoto(ScopedResultCallback<TakePhotoCallback> callback);
// Gets the power line frequency, either from the params if specified by the
« no previous file with comments | « media/capture/video/scoped_result_callback.h ('k') | media/mojo/clients/mojo_demuxer_stream_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698