diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-05 05:35:07 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-05 05:35:07 +0000 |
commit | fa6caa4ffb83896cb42198f35ca7837ae3b7c83c (patch) | |
tree | 7f42b778a87a10b5db39bbe26f3d380dda05f8eb /chrome/plugin/plugin_channel_base.cc | |
parent | a57ea3fc6c3cfe3b44dcd0771d0d56c76bd238df (diff) | |
download | chromium_src-fa6caa4ffb83896cb42198f35ca7837ae3b7c83c.zip chromium_src-fa6caa4ffb83896cb42198f35ca7837ae3b7c83c.tar.gz chromium_src-fa6caa4ffb83896cb42198f35ca7837ae3b7c83c.tar.bz2 |
Fix regression from r11509 which caused each plugin instance to have its own IPC channel (doh!).
BUG=119052
TEST=covered by ui test that Amit added
Review URL: http://codereview.chromium.org/119158
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17712 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin/plugin_channel_base.cc')
-rw-r--r-- | chrome/plugin/plugin_channel_base.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/plugin/plugin_channel_base.cc b/chrome/plugin/plugin_channel_base.cc index d939a179..c05321b 100644 --- a/chrome/plugin/plugin_channel_base.cc +++ b/chrome/plugin/plugin_channel_base.cc @@ -47,14 +47,13 @@ PluginChannelBase::PluginChannelBase() peer_pid_(0), in_remove_route_(false), channel_valid_(false), + in_dispatch_(0), send_unblocking_only_during_dispatch_(false) { } PluginChannelBase::~PluginChannelBase() { } -int PluginChannelBase::in_dispatch_ = 0; - void PluginChannelBase::CleanupChannels() { // Make a copy of the references as we can't iterate the map since items will // be removed from it as we clean them up. |