summaryrefslogtreecommitdiffstats
path: root/base/at_exit.cc
diff options
context:
space:
mode:
authormmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-13 13:34:43 +0000
committermmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-13 13:34:43 +0000
commit9e950bddb6d7f49634757d373e3f13a7d0425ae5 (patch)
treed9e4fbf7a48e382737dbe414e142c04244d2f400 /base/at_exit.cc
parent42718304e7705bb9e6f28f8464a3c731be184eb1 (diff)
downloadchromium_src-9e950bddb6d7f49634757d373e3f13a7d0425ae5.zip
chromium_src-9e950bddb6d7f49634757d373e3f13a7d0425ae5.tar.gz
chromium_src-9e950bddb6d7f49634757d373e3f13a7d0425ae5.tar.bz2
AtExitManager cleanup.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@794 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/at_exit.cc')
-rw-r--r--base/at_exit.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/base/at_exit.cc b/base/at_exit.cc
index 734de74..62efcc8 100644
--- a/base/at_exit.cc
+++ b/base/at_exit.cc
@@ -30,13 +30,13 @@
#include "base/at_exit.h"
#include "base/logging.h"
+namespace base {
+
// Keep a stack of registered AtExitManagers. We always operate on the most
// recent, and we should never have more than one outside of testing, when we
// use the shadow version of the constructor. We don't protect this for
// thread-safe access, since it will only be modified in testing.
-static std::stack<base::AtExitManager*> g_managers;
-
-namespace base {
+static std::stack<AtExitManager*> g_managers;
AtExitManager::AtExitManager() {
DCHECK(g_managers.empty());
@@ -50,7 +50,7 @@ AtExitManager::AtExitManager(bool shadow) {
AtExitManager::~AtExitManager() {
if (g_managers.empty()) {
- NOTREACHED() << "Tried to ~AtExitManager without a AtExitManager";
+ NOTREACHED() << "Tried to ~AtExitManager without an AtExitManager";
return;
}
DCHECK(g_managers.top() == this);
@@ -62,7 +62,7 @@ AtExitManager::~AtExitManager() {
// static
void AtExitManager::RegisterCallback(AtExitCallbackType func) {
if (g_managers.empty()) {
- NOTREACHED() << "Tried to RegisterCallback without a AtExitManager";
+ NOTREACHED() << "Tried to RegisterCallback without an AtExitManager";
return;
}
@@ -74,7 +74,7 @@ void AtExitManager::RegisterCallback(AtExitCallbackType func) {
// static
void AtExitManager::ProcessCallbacksNow() {
if (g_managers.empty()) {
- NOTREACHED() << "Tried to RegisterCallback without a AtExitManager";
+ NOTREACHED() << "Tried to ProcessCallbacksNow without an AtExitManager";
return;
}
@@ -82,7 +82,7 @@ void AtExitManager::ProcessCallbacksNow() {
AutoLock lock(manager->lock_);
while (!manager->stack_.empty()) {
- base::AtExitCallbackType func = manager->stack_.top();
+ AtExitCallbackType func = manager->stack_.top();
manager->stack_.pop();
if (func)
func();