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

Unified Diff: content/browser/renderer_host/media/video_capture_manager.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/browser/renderer_host/media/video_capture_manager.cc
diff --git a/content/browser/renderer_host/media/video_capture_manager.cc b/content/browser/renderer_host/media/video_capture_manager.cc
index f1c14ebc7e140c912cd8a2d3bf7b442456dcda30..f5e7651fc5e7a9d04b09df8530cd532f3b810f73 100644
--- a/content/browser/renderer_host/media/video_capture_manager.cc
+++ b/content/browser/renderer_host/media/video_capture_manager.cc
@@ -9,6 +9,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/bind_to_current_loop.h"
#include "base/logging.h"
#include "base/message_loop/message_loop.h"
#include "base/metrics/histogram_macros.h"
@@ -22,7 +23,6 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/desktop_media_id.h"
#include "content/public/common/media_stream_request.h"
-#include "media/base/bind_to_current_loop.h"
#include "media/video/capture/video_capture_device.h"
#include "media/video/capture/video_capture_device_factory.h"
@@ -192,7 +192,7 @@ void VideoCaptureManager::EnumerateDevices(MediaStreamType stream_type) {
devices_enumerated_callback =
base::Bind(&VideoCaptureManager::ConsolidateDevicesInfoOnDeviceThread,
this,
- media::BindToCurrentLoop(base::Bind(
+ base::BindToCurrentLoop(base::Bind(
&VideoCaptureManager::OnDevicesInfoEnumerated,
this,
stream_type,

Powered by Google App Engine
This is Rietveld 408576698