Add a void* parameter to the AtExitManager callbacks.
Review URL: http://codereview.chromium.org/1805
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1835 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: 9795ec11c994c7750a19aeab79cbf094df0d90dd
diff --git a/base/at_exit.cc b/base/at_exit.cc
index fb4e8c9..9fdfd77 100644
--- a/base/at_exit.cc
+++ b/base/at_exit.cc
@@ -35,14 +35,16 @@
}
// static
-void AtExitManager::RegisterCallback(AtExitCallbackType func) {
+void AtExitManager::RegisterCallback(AtExitCallbackType func, void* param) {
if (!g_top_manager) {
NOTREACHED() << "Tried to RegisterCallback without an AtExitManager";
return;
}
+ DCHECK(func);
+
AutoLock lock(g_top_manager->lock_);
- g_top_manager->stack_.push(func);
+ g_top_manager->stack_.push(CallbackAndParam(func, param));
}
// static
@@ -55,12 +57,11 @@
AutoLock lock(g_top_manager->lock_);
while (!g_top_manager->stack_.empty()) {
- AtExitCallbackType func = g_top_manager->stack_.top();
+ CallbackAndParam callback_and_param = g_top_manager->stack_.top();
g_top_manager->stack_.pop();
- if (func)
- func();
+
+ callback_and_param.func_(callback_and_param.param_);
}
}
} // namespace base
-