diff options
| author | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-27 00:24:21 +0000 |
|---|---|---|
| committer | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-27 00:24:21 +0000 |
| commit | 42c28300731055c5f6bc5f0f1f1131722a047195 (patch) | |
| tree | f1bfa29b11fe0c002df426d8b795b086c93ac98b /content/common/np_channel_base.h | |
| parent | b8b456ce8db6d7d081e80c675c9282e3d956e27b (diff) | |
| download | chromium_src-42c28300731055c5f6bc5f0f1f1131722a047195.zip chromium_src-42c28300731055c5f6bc5f0f1f1131722a047195.tar.gz chromium_src-42c28300731055c5f6bc5f0f1f1131722a047195.tar.bz2 | |
Provide implementations of NPChannelBase to allow script to use NPAPI objects in the browser process
This functionality is required to implement the Java Bridge on Android.
JavaBridgeChannel is used with NPObjectProxy in the renderer and
JavaBridgeChannelHost is used with NPObjectStub in the browser.
Note that this requires a minor change to NPChannelBase to allow JavaBridgeChannelHost to finish setting up the channel handle.
BUG=96703
Review URL: http://codereview.chromium.org/7906005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/np_channel_base.h')
| -rw-r--r-- | content/common/np_channel_base.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/common/np_channel_base.h b/content/common/np_channel_base.h index 810cfbe..dacfb00 100644 --- a/content/common/np_channel_base.h +++ b/content/common/np_channel_base.h @@ -12,8 +12,8 @@ #include "base/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "content/common/npobject_base.h" #include "content/common/message_router.h" +#include "content/common/npobject_base.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_sync_channel.h" #include "ui/gfx/native_widget_types.h" @@ -148,10 +148,10 @@ class NPChannelBase : public IPC::Channel::Listener, base::WaitableEvent* shutdown_event); scoped_ptr<IPC::SyncChannel> channel_; + IPC::ChannelHandle channel_handle_; private: IPC::Channel::Mode mode_; - IPC::ChannelHandle channel_handle_; // This tracks the number of routes registered without an NPObject. It's used // to manage the lifetime of this object. See comment for AddRoute() and // RemoveRoute(). |