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

Unified Diff: content/renderer/media/video_capture_impl.cc

Issue 1083883003: Move BindToCurrentLoop from media/base/ to base/ Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix media/base/callback_holder.h compile Created 5 years, 8 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/renderer/media/rtc_video_renderer.cc ('k') | content/renderer/media/video_capture_impl_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/video_capture_impl.cc
diff --git a/content/renderer/media/video_capture_impl.cc b/content/renderer/media/video_capture_impl.cc
index 9b104d28a7a1dd0517843d55e1a18f10a0fd6d13..14eb7a15f3acf6e12a2d643c1d78e453ebf9cec2 100644
--- a/content/renderer/media/video_capture_impl.cc
+++ b/content/renderer/media/video_capture_impl.cc
@@ -12,10 +12,10 @@
#include "content/renderer/media/video_capture_impl.h"
#include "base/bind.h"
+#include "base/bind_to_current_loop.h"
#include "base/stl_util.h"
#include "content/child/child_process.h"
#include "content/common/media/video_capture_messages.h"
-#include "media/base/bind_to_current_loop.h"
#include "media/base/limits.h"
#include "media/base/video_frame.h"
@@ -247,7 +247,7 @@ void VideoCaptureImpl::OnBufferReceived(int buffer_id,
buffer->buffer->handle(),
0,
timestamp - first_frame_timestamp_,
- media::BindToCurrentLoop(
+ base::BindToCurrentLoop(
base::Bind(&VideoCaptureImpl::OnClientBufferFinished,
weak_factory_.GetWeakPtr(),
buffer_id,
@@ -277,7 +277,7 @@ void VideoCaptureImpl::OnMailboxBufferReceived(
scoped_refptr<media::VideoFrame> frame = media::VideoFrame::WrapNativeTexture(
make_scoped_ptr(new gpu::MailboxHolder(mailbox_holder)),
- media::BindToCurrentLoop(base::Bind(
+ base::BindToCurrentLoop(base::Bind(
&VideoCaptureImpl::OnClientBufferFinished, weak_factory_.GetWeakPtr(),
buffer_id, scoped_refptr<ClientBuffer>())),
packed_frame_size, gfx::Rect(packed_frame_size), packed_frame_size,
« no previous file with comments | « content/renderer/media/rtc_video_renderer.cc ('k') | content/renderer/media/video_capture_impl_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698