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

Unified Diff: media/base/callback_holder.h

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 | « media/base/bind_to_current_loop_unittest.cc ('k') | media/base/test_helpers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/callback_holder.h
diff --git a/media/base/callback_holder.h b/media/base/callback_holder.h
index f69e03de4c3f89f4e768fa5cf889cd6d1786ab23..fe1d5fe4d47b0477c3cc1863310d5b4b5066800b 100644
--- a/media/base/callback_holder.h
+++ b/media/base/callback_holder.h
@@ -6,9 +6,9 @@
#define MEDIA_BASE_CALLBACK_HOLDER_H_
#include "base/bind.h"
+#include "base/bind_to_current_loop.h"
#include "base/callback.h"
#include "base/callback_helpers.h"
-#include "media/base/bind_to_current_loop.h"
namespace media {
@@ -52,7 +52,7 @@ template <typename CB> class CallbackHolder {
DCHECK(held_cb_.is_null());
if (hold_) {
held_cb_ = base::Bind(base::ResetAndReturn(&original_cb_),
- internal::TrampolineForward(a1));
+ base::internal::TrampolineForward(a1));
} else {
base::ResetAndReturn(&original_cb_).Run(a1);
}
@@ -62,8 +62,8 @@ template <typename CB> class CallbackHolder {
DCHECK(held_cb_.is_null());
if (hold_) {
held_cb_ = base::Bind(base::ResetAndReturn(&original_cb_),
- internal::TrampolineForward(a1),
- internal::TrampolineForward(a2));
+ base::internal::TrampolineForward(a1),
+ base::internal::TrampolineForward(a2));
} else {
base::ResetAndReturn(&original_cb_).Run(a1, a2);
}
« no previous file with comments | « media/base/bind_to_current_loop_unittest.cc ('k') | media/base/test_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698