diff options
| author | jcampan@google.com <jcampan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-12 01:25:41 +0000 |
|---|---|---|
| committer | jcampan@google.com <jcampan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-12 01:25:41 +0000 |
| commit | d65cab7ac310ea12c5d946ff40242a243ce911da (patch) | |
| tree | fe3eaa4a4e6f14a7416c4b4da351e18cd34d34b2 /chrome/plugin | |
| parent | 1a48f315b0ca5c26c4446070edfb5842ed06c8c7 (diff) | |
| download | chromium_src-d65cab7ac310ea12c5d946ff40242a243ce911da.zip chromium_src-d65cab7ac310ea12c5d946ff40242a243ce911da.tar.gz chromium_src-d65cab7ac310ea12c5d946ff40242a243ce911da.tar.bz2 | |
Enabling sync_channel in the browser to allow accessibility code making blocking calls. This replaces my previous CL that was somehow duplicating some of these functionalities.
BUG=None
TEST=Run the unit tests.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@691 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
| -rw-r--r-- | chrome/plugin/plugin_channel_base.cc | 6 | ||||
| -rw-r--r-- | chrome/plugin/plugin_thread.cc | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/chrome/plugin/plugin_channel_base.cc b/chrome/plugin/plugin_channel_base.cc index 1cb3111..fec5bd4 100644 --- a/chrome/plugin/plugin_channel_base.cc +++ b/chrome/plugin/plugin_channel_base.cc @@ -33,6 +33,7 @@ #include "chrome/plugin/plugin_channel_base.h" #include "chrome/common/ipc_sync_message.h" +#include "chrome/plugin/plugin_process.h" typedef stdext::hash_map<std::wstring, scoped_refptr<PluginChannelBase> > PluginChannelMap; @@ -100,8 +101,9 @@ void PluginChannelBase::CleanupChannels() { bool PluginChannelBase::Init(MessageLoop* ipc_message_loop, bool create_pipe_now) { - channel_.reset(new IPC::SyncChannel(channel_name_, mode_, this, - ipc_message_loop, create_pipe_now)); + channel_.reset(new IPC::SyncChannel(channel_name_, mode_, this, NULL, + ipc_message_loop, create_pipe_now, + PluginProcess::GetShutDownEvent())); channel_valid_ = true; return true; } diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc index 3c117df..199ab2c 100644 --- a/chrome/plugin/plugin_thread.cc +++ b/chrome/plugin/plugin_thread.cc @@ -92,7 +92,8 @@ void PluginThread::Init() { PatchNPNFunctions(); CoInitialize(NULL); channel_.reset(new IPC::SyncChannel(channel_name_, - IPC::Channel::MODE_CLIENT, this, owner_loop_, true)); + IPC::Channel::MODE_CLIENT, this, NULL, owner_loop_, true, + PluginProcess::GetShutDownEvent())); notification_service_.reset(new NotificationService); resource_dispatcher_ = new ResourceDispatcher(this); |