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

Unified Diff: content/renderer/pepper/pepper_video_encoder_host.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/pepper/pepper_video_encoder_host.cc
diff --git a/content/renderer/pepper/pepper_video_encoder_host.cc b/content/renderer/pepper/pepper_video_encoder_host.cc
index 39292bbcb677031ba002023cf063a0333475a699..d8398afd1d713f34ae9972dd5e46dfe60ab87f13 100644
--- a/content/renderer/pepper/pepper_video_encoder_host.cc
+++ b/content/renderer/pepper/pepper_video_encoder_host.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/bind.h"
+#include "base/bind_to_current_loop.h"
#include "base/memory/shared_memory.h"
#include "base/numerics/safe_math.h"
#include "content/common/gpu/client/command_buffer_proxy_impl.h"
@@ -14,7 +15,6 @@
#include "content/renderer/pepper/pepper_video_encoder_host.h"
#include "content/renderer/pepper/video_encoder_shim.h"
#include "content/renderer/render_thread_impl.h"
-#include "media/base/bind_to_current_loop.h"
#include "media/base/video_frame.h"
#include "media/renderers/gpu_video_accelerator_factories.h"
#include "media/video/video_encode_accelerator.h"
@@ -513,7 +513,7 @@ bool PepperVideoEncoderHost::EnsureGpuChannel() {
return false;
}
- command_buffer_->SetChannelErrorCallback(media::BindToCurrentLoop(
+ command_buffer_->SetChannelErrorCallback(base::BindToCurrentLoop(
base::Bind(&PepperVideoEncoderHost::NotifyPepperError,
weak_ptr_factory_.GetWeakPtr(), PP_ERROR_RESOURCE_FAILED)));
if (!command_buffer_->Initialize()) {
« no previous file with comments | « content/renderer/pepper/pepper_platform_video_capture.cc ('k') | media/audio/mac/audio_device_listener_mac_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698