Skip to content

GitLab

T
tangled
Commit 3d5f51b2 authored by xiyuan's avatar xiyuan Committed by Commit bot
Browse files
Options

Use variadic template for screen handler's AddCallback. 

BUG=none

Review URL: https://codereview.chromium.org/1038003002

Cr-Commit-Position: refs/heads/master@{#322444}
parent 2e2647b9
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 147 deletions
chrome/browser/ui/webui/chromeos/login/base_screen_handler.h
View file @ 3d5f51b2
......@@ -129,63 +129,12 @@ class BaseScreenHandler : public content::WebUIMessageHandler,
base::Bind(method, base::Unretained(static_cast<T*>(this))));
}
template<typename T>
void AddCallback(const std::string& name, void (T::*method)()) {
base::Callback<void()> callback =
base::Bind(method, base::Unretained(static_cast<T*>(this)));
web_ui()->RegisterMessageCallback(
name, base::Bind(&::login::CallbackWrapper0, callback));
}
template<typename T, typename A1>
void AddCallback(const std::string& name, void (T::*method)(A1 arg1)) {
base::Callback<void(A1)> callback =
base::Bind(method, base::Unretained(static_cast<T*>(this)));
web_ui()->RegisterMessageCallback(
name, base::Bind(&::login::CallbackWrapper1<A1>, callback));
}
template<typename T, typename A1, typename A2>
void AddCallback(const std::string& name,
void (T::*method)(A1 arg1, A2 arg2)) {
base::Callback<void(A1, A2)> callback =
base::Bind(method, base::Unretained(static_cast<T*>(this)));
web_ui()->RegisterMessageCallback(
name, base::Bind(&::login::CallbackWrapper2<A1, A2>, callback));
}
template<typename T, typename A1, typename A2, typename A3>
void AddCallback(const std::string& name,
void (T::*method)(A1 arg1, A2 arg2, A3 arg3)) {
base::Callback<void(A1, A2, A3)> callback =
base::Bind(method, base::Unretained(static_cast<T*>(this)));
web_ui()->RegisterMessageCallback(
name, base::Bind(&::login::CallbackWrapper3<A1, A2, A3>, callback));
}
template<typename T, typename A1, typename A2, typename A3, typename A4>
void AddCallback(const std::string& name,
void (T::*method)(A1 arg1, A2 arg2, A3 arg3, A4 arg4)) {
base::Callback<void(A1, A2, A3, A4)> callback =
template<typename T, typename... Args>
void AddCallback(const std::string& name, void (T::*method)(Args...)) {
base::Callback<void(Args...)> callback =
base::Bind(method, base::Unretained(static_cast<T*>(this)));
web_ui()->RegisterMessageCallback(
name, base::Bind(&::login::CallbackWrapper4<A1, A2, A3, A4>, callback));
}
template <typename T,
typename A1,
typename A2,
typename A3,
typename A4,
typename A5>
void AddCallback(
const std::string& name,
void (T::*method)(A1 arg1, A2 arg2, A3 arg3, A4 arg4, A5 arg5)) {
base::Callback<void(A1, A2, A3, A4, A5)> callback =
base::Bind(method, base::Unretained(static_cast<T*>(this)));
web_ui()->RegisterMessageCallback(
name,
base::Bind(&::login::CallbackWrapper5<A1, A2, A3, A4, A5>, callback));
name, base::Bind(&::login::CallbackWrapper<Args...>, callback));
}
template <typename Method>
......
components/login/base_screen_handler_utils.cc
View file @ 3d5f51b2
......@@ -76,11 +76,4 @@ base::StringValue MakeValue(const base::string16& v) {
return base::StringValue(v);
}
void CallbackWrapper0(base::Callback<void()> callback,
const base::ListValue* args) {
DCHECK(args);
DCHECK(args->empty());
callback.Run();
}
} // namespace login
components/login/base_screen_handler_utils.h
View file @ 3d5f51b2
......@@ -11,6 +11,7 @@
#include "base/callback.h"
#include "base/logging.h"
#include "base/strings/string16.h"
#include "base/tuple.h"
#include "base/values.h"
#include "components/login/login_export.h"
......@@ -59,87 +60,29 @@ inline const T& MakeValue(const T& v) {
return v;
}
void LOGIN_EXPORT CallbackWrapper0(base::Callback<void()> callback,
const base::ListValue* args);
template <typename A1>
void CallbackWrapper1(base::Callback<void(A1)> callback,
const base::ListValue* args) {
DCHECK(args);
DCHECK_EQ(1u, args->GetSize());
typename UnwrapConstRef<A1>::Type arg1;
if (!GetArg(args, 0, &arg1)) {
NOTREACHED();
return;
}
callback.Run(arg1);
template <typename Arg, size_t index>
typename UnwrapConstRef<Arg>::Type ParseArg(const base::ListValue* args) {
typename UnwrapConstRef<Arg>::Type parsed;
CHECK(GetArg(args, index, &parsed));
return parsed;
}
template <typename A1, typename A2>
void CallbackWrapper2(base::Callback<void(A1, A2)> callback,
const base::ListValue* args) {
template <typename... Args, size_t... Ns>
inline void DispatchToCallback(const base::Callback<void(Args...)>& callback,
const base::ListValue* args,
IndexSequence<Ns...> indexes) {
DCHECK(args);
DCHECK_EQ(2u, args->GetSize());
typename UnwrapConstRef<A1>::Type arg1;
typename UnwrapConstRef<A2>::Type arg2;
if (!GetArg(args, 0, &arg1) || !GetArg(args, 1, &arg2)) {
NOTREACHED();
return;
}
callback.Run(arg1, arg2);
}
DCHECK_EQ(sizeof...(Args), args->GetSize());
template <typename A1, typename A2, typename A3>
void CallbackWrapper3(base::Callback<void(A1, A2, A3)> callback,
const base::ListValue* args) {
DCHECK(args);
DCHECK_EQ(3u, args->GetSize());
typename UnwrapConstRef<A1>::Type arg1;
typename UnwrapConstRef<A2>::Type arg2;
typename UnwrapConstRef<A3>::Type arg3;
if (!GetArg(args, 0, &arg1) || !GetArg(args, 1, &arg2) ||
!GetArg(args, 2, &arg3)) {
NOTREACHED();
return;
}
callback.Run(arg1, arg2, arg3);
callback.Run(ParseArg<Args, Ns>(args)...);
}
template <typename A1, typename A2, typename A3, typename A4>
void CallbackWrapper4(base::Callback<void(A1, A2, A3, A4)> callback,
const base::ListValue* args) {
DCHECK(args);
DCHECK_EQ(4u, args->GetSize());
typename UnwrapConstRef<A1>::Type arg1;
typename UnwrapConstRef<A2>::Type arg2;
typename UnwrapConstRef<A3>::Type arg3;
typename UnwrapConstRef<A4>::Type arg4;
if (!GetArg(args, 0, &arg1) || !GetArg(args, 1, &arg2) ||
!GetArg(args, 2, &arg3) || !GetArg(args, 3, &arg4)) {
NOTREACHED();
return;
}
callback.Run(arg1, arg2, arg3, arg4);
template <typename... Args>
void CallbackWrapper(const base::Callback<void(Args...)>& callback,
const base::ListValue* args) {
DispatchToCallback(callback, args, MakeIndexSequence<sizeof...(Args)>());
}
template <typename A1, typename A2, typename A3, typename A4, typename A5>
void CallbackWrapper5(base::Callback<void(A1, A2, A3, A4, A5)> callback,
const base::ListValue* args) {
DCHECK(args);
DCHECK_EQ(5u, args->GetSize());
typename UnwrapConstRef<A1>::Type arg1;
typename UnwrapConstRef<A2>::Type arg2;
typename UnwrapConstRef<A3>::Type arg3;
typename UnwrapConstRef<A4>::Type arg4;
typename UnwrapConstRef<A5>::Type arg5;
if (!GetArg(args, 0, &arg1) || !GetArg(args, 1, &arg2) ||
!GetArg(args, 2, &arg3) || !GetArg(args, 3, &arg4) ||
!GetArg(args, 4, &arg5)) {
NOTREACHED();
return;
}
callback.Run(arg1, arg2, arg3, arg4, arg5);
}
} // namespace login
......
components/webui_generator/web_ui_view.h
View file @ 3d5f51b2
......@@ -58,20 +58,12 @@ class WUG_EXPORT WebUIView : public View {
content::WebUI* web_ui() { return web_ui_; }
template <typename T>
void AddCallback(const std::string& name, void (T::*method)()) {
base::Callback<void()> callback =
template <typename T, typename... Args>
void AddCallback(const std::string& name, void (T::*method)(Args...)) {
base::Callback<void(Args...)> callback =
base::Bind(method, base::Unretained(static_cast<T*>(this)));
web_ui_->RegisterMessageCallback(
name, base::Bind(&::login::CallbackWrapper0, callback));
}
template <typename T, typename A1>
void AddCallback(const std::string& name, void (T::*method)(A1 arg1)) {
base::Callback<void(A1)> callback =
base::Bind(method, base::Unretained(static_cast<T*>(this)));
web_ui_->RegisterMessageCallback(
name, base::Bind(&::login::CallbackWrapper1<A1>, callback));
name, base::Bind(&::login::CallbackWrapper<Args...>, callback));
}
// Overridden from View:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment