summaryrefslogtreecommitdiffstats
path: root/chrome/common/notification_service.h
diff options
context:
space:
mode:
authordeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-10 10:54:06 +0000
committerdeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-10 10:54:06 +0000
commitf886b7bf801cbdd2d9e4b31a8f74bc7490922cd4 (patch)
tree1ab6d88512e17de10c913cc163a31a7d5b2369bd /chrome/common/notification_service.h
parent83c7264800194b0d9ffdce49c57a3fdd5cf6a1a0 (diff)
downloadchromium_src-f886b7bf801cbdd2d9e4b31a8f74bc7490922cd4.zip
chromium_src-f886b7bf801cbdd2d9e4b31a8f74bc7490922cd4.tar.gz
chromium_src-f886b7bf801cbdd2d9e4b31a8f74bc7490922cd4.tar.bz2
Move a bunch of code from the old to new TLS interface.
Review URL: http://codereview.chromium.org/1660 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/notification_service.h')
-rw-r--r--chrome/common/notification_service.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/common/notification_service.h b/chrome/common/notification_service.h
index 60fd77e..170baa6 100644
--- a/chrome/common/notification_service.h
+++ b/chrome/common/notification_service.h
@@ -12,7 +12,6 @@
#include <map>
#include "base/observer_list.h"
-#include "base/thread_local_storage.h"
#include "base/values.h"
#include "chrome/common/notification_details.h"
#include "chrome/common/notification_source.h"
@@ -24,9 +23,7 @@ class NotificationService {
public:
// Returns the NotificationService object for the current thread, or NULL if
// none.
- static NotificationService* current() {
- return static_cast<NotificationService *>(tls_index_.Get());
- }
+ static NotificationService* current();
// Normally instantiated when the thread is created. Not all threads have
// a NotificationService. Only one instance should be created per thread.
@@ -91,10 +88,6 @@ class NotificationService {
// a simple array is probably the fastest way to dispatch.
NotificationSourceMap observers_[NOTIFICATION_TYPE_COUNT];
- // The thread local storage index, used for getting the current thread's
- // instance.
- static TLSSlot tls_index_;
-
#ifndef NDEBUG
// Used to check to see that AddObserver and RemoveObserver calls are
// balanced.