From f886b7bf801cbdd2d9e4b31a8f74bc7490922cd4 Mon Sep 17 00:00:00 2001 From: "deanm@chromium.org" Date: Wed, 10 Sep 2008 10:54:06 +0000 Subject: 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 --- chrome/common/notification_service.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'chrome/common/notification_service.h') 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 #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(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. -- cgit v1.1