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

Unified Diff: content/renderer/media/media_stream_video_capturer_source.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
Index: content/renderer/media/media_stream_video_capturer_source.cc
diff --git a/content/renderer/media/media_stream_video_capturer_source.cc b/content/renderer/media/media_stream_video_capturer_source.cc
index 1c905ccc2468cd857ce8688fa915f82fa4663a26..f0516a43ec47be2c577fdf8516d79711a4afbbf9 100644
--- a/content/renderer/media/media_stream_video_capturer_source.cc
+++ b/content/renderer/media/media_stream_video_capturer_source.cc
@@ -5,11 +5,11 @@
#include "content/renderer/media/media_stream_video_capturer_source.h"
#include "base/bind.h"
+#include "base/bind_to_current_loop.h"
#include "base/callback_helpers.h"
#include "base/location.h"
#include "content/renderer/media/video_capture_impl_manager.h"
#include "content/renderer/render_thread_impl.h"
-#include "media/base/bind_to_current_loop.h"
#include "media/base/video_frame.h"
namespace {
@@ -95,7 +95,7 @@ void VideoCapturerDelegate::GetCurrentSupportedFormats(
source_formats_callback_ = callback;
manager->GetDeviceFormatsInUse(
session_id_,
- media::BindToCurrentLoop(
+ base::BindToCurrentLoop(
base::Bind(
&VideoCapturerDelegate::OnDeviceFormatsInUseReceived,
weak_factory_.GetWeakPtr())));
@@ -128,7 +128,7 @@ void VideoCapturerDelegate::StartCapture(
manager->StartCapture(
session_id_,
params,
- media::BindToCurrentLoop(base::Bind(
+ base::BindToCurrentLoop(base::Bind(
&VideoCapturerDelegate::OnStateUpdate,
weak_factory_.GetWeakPtr())),
new_frame_callback);
@@ -184,7 +184,7 @@ void VideoCapturerDelegate::OnDeviceFormatsInUseReceived(
manager->GetDeviceSupportedFormats(
session_id_,
- media::BindToCurrentLoop(
+ base::BindToCurrentLoop(
base::Bind(
&VideoCapturerDelegate::OnDeviceSupportedFormatsEnumerated,
weak_factory_.GetWeakPtr())));

Powered by Google App Engine
This is Rietveld 408576698