summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_message_service.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-30 01:49:06 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-30 01:49:06 +0000
commit95d291980d768c38e1f70bc041957870913e07f6 (patch)
tree383ea24e44f58696c3cf2871f44846f5a973f473 /chrome/browser/extensions/extension_message_service.cc
parentbb3bb6d013ca8b7b9fde9b985950f181cc32577a (diff)
downloadchromium_src-95d291980d768c38e1f70bc041957870913e07f6.zip
chromium_src-95d291980d768c38e1f70bc041957870913e07f6.tar.gz
chromium_src-95d291980d768c38e1f70bc041957870913e07f6.tar.bz2
Get rid of MessageLoop* caching in extensions code.
BUG=25354 Review URL: http://codereview.chromium.org/345023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30550 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_message_service.cc')
-rw-r--r--chrome/browser/extensions/extension_message_service.cc21
1 files changed, 9 insertions, 12 deletions
diff --git a/chrome/browser/extensions/extension_message_service.cc b/chrome/browser/extensions/extension_message_service.cc
index cd011f1..92c77a8 100644
--- a/chrome/browser/extensions/extension_message_service.cc
+++ b/chrome/browser/extensions/extension_message_service.cc
@@ -112,12 +112,9 @@ const char ExtensionMessageService::kDispatchEvent[] =
"Event.dispatchJSON";
ExtensionMessageService::ExtensionMessageService(Profile* profile)
- : ui_loop_(MessageLoop::current()),
- profile_(profile),
+ : profile_(profile),
extension_devtools_manager_(NULL),
next_port_id_(0) {
- DCHECK_EQ(ui_loop_->type(), MessageLoop::TYPE_UI);
-
registrar_.Add(this, NotificationType::RENDERER_PROCESS_TERMINATED,
NotificationService::AllSources());
registrar_.Add(this, NotificationType::RENDERER_PROCESS_CLOSED,
@@ -132,8 +129,6 @@ ExtensionMessageService::~ExtensionMessageService() {
}
void ExtensionMessageService::ProfileDestroyed() {
- DCHECK_EQ(ui_loop_->type(), MessageLoop::TYPE_UI);
-
profile_ = NULL;
// We remove notifications here because our destructor might be called on
@@ -207,9 +202,10 @@ int ExtensionMessageService::OpenChannelToExtension(
// Each side of the port is given his own port ID. When they send messages,
// we convert to the opposite port ID. See PostMessageFromRenderer.
- ui_loop_->PostTask(FROM_HERE,
- NewRunnableMethod(this,
- &ExtensionMessageService::OpenChannelToExtensionOnUIThread,
+ ChromeThread::PostTask(
+ ChromeThread::UI, FROM_HERE,
+ NewRunnableMethod(
+ this, &ExtensionMessageService::OpenChannelToExtensionOnUIThread,
source->id(), routing_id, port2_id, source_extension_id,
target_extension_id, channel_name));
@@ -230,9 +226,10 @@ int ExtensionMessageService::OpenChannelToTab(int routing_id,
// Each side of the port is given his own port ID. When they send messages,
// we convert to the opposite port ID. See PostMessageFromRenderer.
- ui_loop_->PostTask(FROM_HERE,
- NewRunnableMethod(this,
- &ExtensionMessageService::OpenChannelToTabOnUIThread,
+ ChromeThread::PostTask(
+ ChromeThread::UI, FROM_HERE,
+ NewRunnableMethod(
+ this, &ExtensionMessageService::OpenChannelToTabOnUIThread,
source->id(), routing_id, port2_id, tab_id, extension_id,
channel_name));