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

Unified Diff: mojo/public/cpp/bindings/callback.h

Issue 294833002: Mojo: more idiomatic C++ bindings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix windows bustage Created 6 years, 7 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: mojo/public/cpp/bindings/callback.h
diff --git a/mojo/public/cpp/bindings/callback.h b/mojo/public/cpp/bindings/callback.h
index 4192f895f9ac02f8d837a0a83bf23d852f026266..11554a5fa6c8d7af786dd88d0a2a3c6091b7631c 100644
--- a/mojo/public/cpp/bindings/callback.h
+++ b/mojo/public/cpp/bindings/callback.h
@@ -78,7 +78,7 @@ class Callback<void(A1)> {
typename internal::Callback_ParamTraits<A1>::ForwardType a1) const {
if (sink_.get())
sink_->Run(
- internal::Callback_Forward(a1));
+ internal::Forward(a1));
}
private:
@@ -89,7 +89,7 @@ class Callback<void(A1)> {
typename internal::Callback_ParamTraits<A1>::ForwardType a1) const
MOJO_OVERRIDE {
sink.Run(
- internal::Callback_Forward(a1));
+ internal::Forward(a1));
}
Sink sink;
};
@@ -122,8 +122,8 @@ class Callback<void(A1, A2)> {
typename internal::Callback_ParamTraits<A2>::ForwardType a2) const {
if (sink_.get())
sink_->Run(
- internal::Callback_Forward(a1),
- internal::Callback_Forward(a2));
+ internal::Forward(a1),
+ internal::Forward(a2));
}
private:
@@ -135,8 +135,8 @@ class Callback<void(A1, A2)> {
typename internal::Callback_ParamTraits<A2>::ForwardType a2) const
MOJO_OVERRIDE {
sink.Run(
- internal::Callback_Forward(a1),
- internal::Callback_Forward(a2));
+ internal::Forward(a1),
+ internal::Forward(a2));
}
Sink sink;
};
@@ -171,9 +171,9 @@ class Callback<void(A1, A2, A3)> {
typename internal::Callback_ParamTraits<A3>::ForwardType a3) const {
if (sink_.get())
sink_->Run(
- internal::Callback_Forward(a1),
- internal::Callback_Forward(a2),
- internal::Callback_Forward(a3));
+ internal::Forward(a1),
+ internal::Forward(a2),
+ internal::Forward(a3));
}
private:
@@ -186,9 +186,9 @@ class Callback<void(A1, A2, A3)> {
typename internal::Callback_ParamTraits<A3>::ForwardType a3) const
MOJO_OVERRIDE {
sink.Run(
- internal::Callback_Forward(a1),
- internal::Callback_Forward(a2),
- internal::Callback_Forward(a3));
+ internal::Forward(a1),
+ internal::Forward(a2),
+ internal::Forward(a3));
}
Sink sink;
};
@@ -225,10 +225,10 @@ class Callback<void(A1, A2, A3, A4)> {
typename internal::Callback_ParamTraits<A4>::ForwardType a4) const {
if (sink_.get())
sink_->Run(
- internal::Callback_Forward(a1),
- internal::Callback_Forward(a2),
- internal::Callback_Forward(a3),
- internal::Callback_Forward(a4));
+ internal::Forward(a1),
+ internal::Forward(a2),
+ internal::Forward(a3),
+ internal::Forward(a4));
}
private:
@@ -242,10 +242,10 @@ class Callback<void(A1, A2, A3, A4)> {
typename internal::Callback_ParamTraits<A4>::ForwardType a4) const
MOJO_OVERRIDE {
sink.Run(
- internal::Callback_Forward(a1),
- internal::Callback_Forward(a2),
- internal::Callback_Forward(a3),
- internal::Callback_Forward(a4));
+ internal::Forward(a1),
+ internal::Forward(a2),
+ internal::Forward(a3),
+ internal::Forward(a4));
}
Sink sink;
};
@@ -284,11 +284,11 @@ class Callback<void(A1, A2, A3, A4, A5)> {
typename internal::Callback_ParamTraits<A5>::ForwardType a5) const {
if (sink_.get())
sink_->Run(
- internal::Callback_Forward(a1),
- internal::Callback_Forward(a2),
- internal::Callback_Forward(a3),
- internal::Callback_Forward(a4),
- internal::Callback_Forward(a5));
+ internal::Forward(a1),
+ internal::Forward(a2),
+ internal::Forward(a3),
+ internal::Forward(a4),
+ internal::Forward(a5));
}
private:
@@ -303,11 +303,11 @@ class Callback<void(A1, A2, A3, A4, A5)> {
typename internal::Callback_ParamTraits<A5>::ForwardType a5) const
MOJO_OVERRIDE {
sink.Run(
- internal::Callback_Forward(a1),
- internal::Callback_Forward(a2),
- internal::Callback_Forward(a3),
- internal::Callback_Forward(a4),
- internal::Callback_Forward(a5));
+ internal::Forward(a1),
+ internal::Forward(a2),
+ internal::Forward(a3),
+ internal::Forward(a4),
+ internal::Forward(a5));
}
Sink sink;
};
@@ -349,12 +349,12 @@ class Callback<void(A1, A2, A3, A4, A5, A6)> {
typename internal::Callback_ParamTraits<A6>::ForwardType a6) const {
if (sink_.get())
sink_->Run(
- internal::Callback_Forward(a1),
- internal::Callback_Forward(a2),
- internal::Callback_Forward(a3),
- internal::Callback_Forward(a4),
- internal::Callback_Forward(a5),
- internal::Callback_Forward(a6));
+ internal::Forward(a1),
+ internal::Forward(a2),
+ internal::Forward(a3),
+ internal::Forward(a4),
+ internal::Forward(a5),
+ internal::Forward(a6));
}
private:
@@ -370,12 +370,12 @@ class Callback<void(A1, A2, A3, A4, A5, A6)> {
typename internal::Callback_ParamTraits<A6>::ForwardType a6) const
MOJO_OVERRIDE {
sink.Run(
- internal::Callback_Forward(a1),
- internal::Callback_Forward(a2),
- internal::Callback_Forward(a3),
- internal::Callback_Forward(a4),
- internal::Callback_Forward(a5),
- internal::Callback_Forward(a6));
+ internal::Forward(a1),
+ internal::Forward(a2),
+ internal::Forward(a3),
+ internal::Forward(a4),
+ internal::Forward(a5),
+ internal::Forward(a6));
}
Sink sink;
};
@@ -419,13 +419,13 @@ class Callback<void(A1, A2, A3, A4, A5, A6, A7)> {
typename internal::Callback_ParamTraits<A7>::ForwardType a7) const {
if (sink_.get())
sink_->Run(
- internal::Callback_Forward(a1),
- internal::Callback_Forward(a2),
- internal::Callback_Forward(a3),
- internal::Callback_Forward(a4),
- internal::Callback_Forward(a5),
- internal::Callback_Forward(a6),
- internal::Callback_Forward(a7));
+ internal::Forward(a1),
+ internal::Forward(a2),
+ internal::Forward(a3),
+ internal::Forward(a4),
+ internal::Forward(a5),
+ internal::Forward(a6),
+ internal::Forward(a7));
}
private:
@@ -442,13 +442,13 @@ class Callback<void(A1, A2, A3, A4, A5, A6, A7)> {
typename internal::Callback_ParamTraits<A7>::ForwardType a7) const
MOJO_OVERRIDE {
sink.Run(
- internal::Callback_Forward(a1),
- internal::Callback_Forward(a2),
- internal::Callback_Forward(a3),
- internal::Callback_Forward(a4),
- internal::Callback_Forward(a5),
- internal::Callback_Forward(a6),
- internal::Callback_Forward(a7));
+ internal::Forward(a1),
+ internal::Forward(a2),
+ internal::Forward(a3),
+ internal::Forward(a4),
+ internal::Forward(a5),
+ internal::Forward(a6),
+ internal::Forward(a7));
}
Sink sink;
};

Powered by Google App Engine
This is Rietveld 408576698