diff options
| author | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-20 22:11:47 +0000 |
|---|---|---|
| committer | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-20 22:11:47 +0000 |
| commit | fa87a2527ca8c0bcef92d8e44791332782936911 (patch) | |
| tree | 04dc5d1e6881f8356f91203a386648057b20d924 /chrome/common/notification_service.h | |
| parent | 4f64d0af5908e36d356c834005d08cca98d579fe (diff) | |
| download | chromium_src-fa87a2527ca8c0bcef92d8e44791332782936911.zip chromium_src-fa87a2527ca8c0bcef92d8e44791332782936911.tar.gz chromium_src-fa87a2527ca8c0bcef92d8e44791332782936911.tar.bz2 | |
Revert. Failing unit tests.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1118 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/notification_service.h')
| -rw-r--r-- | chrome/common/notification_service.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/common/notification_service.h b/chrome/common/notification_service.h index 6ad58d0..1243748 100644 --- a/chrome/common/notification_service.h +++ b/chrome/common/notification_service.h @@ -36,8 +36,8 @@ #include <map> -#include "base/observer_list.h" #include "base/thread_local_storage.h" +#include "base/observer_list.h" #include "base/values.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_source.h" @@ -50,7 +50,8 @@ class NotificationService { // Returns the NotificationService object for the current thread, or NULL if // none. static NotificationService* current() { - return static_cast<NotificationService *>(tls_index_.Get()); + return static_cast<NotificationService *>( + ThreadLocalStorage::Get(tls_index_)); } // Normally instantiated when the thread is created. Not all threads have @@ -118,7 +119,7 @@ class NotificationService { // The thread local storage index, used for getting the current thread's // instance. - static TLSSlot tls_index_; + static int tls_index_; #ifndef NDEBUG // Used to check to see that AddObserver and RemoveObserver calls are |