diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-06 08:32:17 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-06 08:32:17 +0000 |
| commit | 8de85a60ef3c615360d0c644f7f16f9a13103865 (patch) | |
| tree | 0ac8ff6a33b4b70c868015fb50b16c08f92d5018 /chrome/browser/extensions/extension_message_service.h | |
| parent | 716984c61da9f5a8ac8158d122e50646081f5b6e (diff) | |
| download | chromium_src-8de85a60ef3c615360d0c644f7f16f9a13103865.zip chromium_src-8de85a60ef3c615360d0c644f7f16f9a13103865.tar.gz chromium_src-8de85a60ef3c615360d0c644f7f16f9a13103865.tar.bz2 | |
Revert "Revert r31175 r31176 r31187"
The bustage seems to be a WebKit change upstream. It is not reverted in
WebKit and merger. So bring the innocent change back in.
TBR=jam
TEST=green tree
Review URL: http://codereview.chromium.org/375009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31214 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_message_service.h')
| -rw-r--r-- | chrome/browser/extensions/extension_message_service.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_message_service.h b/chrome/browser/extensions/extension_message_service.h index cf52b65..9451381 100644 --- a/chrome/browser/extensions/extension_message_service.h +++ b/chrome/browser/extensions/extension_message_service.h @@ -62,7 +62,6 @@ class ExtensionMessageService // --- UI thread only: explicit ExtensionMessageService(Profile* profile); - ~ExtensionMessageService(); // Notification that our owning profile is going away. void ProfileDestroyed(); @@ -128,9 +127,13 @@ class ExtensionMessageService ResourceMessageFilter* source); private: + friend class base::RefCountedThreadSafe<ExtensionMessageService>; + // A map of channel ID to its channel object. typedef std::map<int, MessageChannel*> MessageChannelMap; + ~ExtensionMessageService(); + // Allocates a pair of port ids. // NOTE: this can be called from any thread. void AllocatePortIdPair(int* port1, int* port2); |