diff options
| author | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 16:58:14 +0000 |
|---|---|---|
| committer | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 16:58:14 +0000 |
| commit | 373a95aa69caa254f250c40f4483d6ac2b8c780c (patch) | |
| tree | 85ff9884a544a7197e037d045bdb8982b9a8b9f9 /content/ppapi_plugin/ppapi_thread.h | |
| parent | 1960edd57c9a2389229a774ef8f66597c28ca1fb (diff) | |
| download | chromium_src-373a95aa69caa254f250c40f4483d6ac2b8c780c.zip chromium_src-373a95aa69caa254f250c40f4483d6ac2b8c780c.tar.gz chromium_src-373a95aa69caa254f250c40f4483d6ac2b8c780c.tar.bz2 | |
Re-land the reverted CL:
http://src.chromium.org/viewvc/chrome?view=rev&revision=91150
Comparing with the previous CL, this CL makes changes to
ppapi/proxy/ppapi_proxy_test.{h,cc}
TEST=None
BUG=None
Review URL: http://codereview.chromium.org/7210030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91310 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/ppapi_plugin/ppapi_thread.h')
| -rw-r--r-- | content/ppapi_plugin/ppapi_thread.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/content/ppapi_plugin/ppapi_thread.h b/content/ppapi_plugin/ppapi_thread.h index 3d20387..5b77f24 100644 --- a/content/ppapi_plugin/ppapi_thread.h +++ b/content/ppapi_plugin/ppapi_thread.h @@ -6,6 +6,8 @@ #define CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ #pragma once +#include <map> + #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" @@ -42,11 +44,15 @@ class PpapiThread : public ChildThread, virtual void PostToWebKitThread(const tracked_objects::Location& from_here, const base::Closure& task) OVERRIDE; virtual bool SendToBrowser(IPC::Message* msg) OVERRIDE; + virtual uint32 Register( + pp::proxy::PluginDispatcher* plugin_dispatcher) OVERRIDE; + virtual void Unregister(uint32 plugin_dispatcher_id) OVERRIDE; // Message handlers. void OnMsgLoadPlugin(const FilePath& path); void OnMsgCreateChannel(base::ProcessHandle host_process_handle, int renderer_id); + void OnPluginDispatcherMessageReceived(const IPC::Message& msg); // Sets up the channel to the given renderer. On success, returns true and // fills the given ChannelHandle with the information from the new channel. @@ -81,6 +87,10 @@ class PpapiThread : public ChildThread, scoped_ptr<PpapiWebKitThread> webkit_thread_; + // The PluginDispatcher instances contained in the map are not owned by it. + std::map<uint32, pp::proxy::PluginDispatcher*> plugin_dispatchers_; + uint32 next_plugin_dispatcher_id_; + DISALLOW_IMPLICIT_CONSTRUCTORS(PpapiThread); }; |