diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-20 21:30:35 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-20 21:30:35 +0000 |
commit | f6cfd83e3bc1d4cf4be7603ef36bce2be3d9e7c4 (patch) | |
tree | 5033e1dd70396bfd1ace1c536458f9643cd56dee /ppapi/proxy/broker_dispatcher.h | |
parent | 6c8f65e51ccdf4abd5815e4316364b87bb544fd1 (diff) | |
download | chromium_src-f6cfd83e3bc1d4cf4be7603ef36bce2be3d9e7c4.zip chromium_src-f6cfd83e3bc1d4cf4be7603ef36bce2be3d9e7c4.tar.gz chromium_src-f6cfd83e3bc1d4cf4be7603ef36bce2be3d9e7c4.tar.bz2 |
Actually hook up the Pepper clear site data.
This fixes the message routing. The message is sent over the "broker" channel in this case which normally connects to the renderer. Switching this over to be the main plugin <-> browser channel is extra work since we'd need a way to plumb through the response. Since we already do this weird routing for the NPAPI plugin, doing the same thing is the simplest here.
I moved the code to the broker dispatcher which is the endpoint for the channel that's used.
This removes the timeout for sending the clear message. This made it challenging to debug since if you load the plugin in the debugger, the message never gets sent. This could legitimately happen if the computer is swapping and is super slow to load the plugin. It seems if you want to clear your data, we shouldn't "forget" to clear it in certain cases. So I just left this code out.
Review URL: https://chromiumcodereview.appspot.com/10155001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133277 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/broker_dispatcher.h')
-rw-r--r-- | ppapi/proxy/broker_dispatcher.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ppapi/proxy/broker_dispatcher.h b/ppapi/proxy/broker_dispatcher.h index 126b82c..f325858 100644 --- a/ppapi/proxy/broker_dispatcher.h +++ b/ppapi/proxy/broker_dispatcher.h @@ -4,7 +4,9 @@ #ifndef PPAPI_PROXY_BROKER_DISPATCHER_H_ #define PPAPI_PROXY_BROKER_DISPATCHER_H_ +#pragma once +#include "base/compiler_specific.h" #include "ppapi/c/trusted/ppp_broker.h" #include "ppapi/proxy/proxy_channel.h" @@ -23,7 +25,7 @@ class PPAPI_PROXY_EXPORT BrokerDispatcher : public ProxyChannel { bool is_client); // IPC::Channel::Listener implementation. - virtual bool OnMessageReceived(const IPC::Message& msg); + virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; protected: // You must call InitBrokerWithChannel after the constructor. @@ -46,7 +48,7 @@ class PPAPI_PROXY_EXPORT BrokerHostDispatcher : public BrokerDispatcher { BrokerHostDispatcher(base::ProcessHandle remote_process_handle); // IPC::Channel::Listener implementation. - virtual void OnChannelError(); + virtual void OnChannelError() OVERRIDE; }; // The dispatcher for the broker side of the broker channel. @@ -56,7 +58,7 @@ class PPAPI_PROXY_EXPORT BrokerSideDispatcher : public BrokerDispatcher { PP_ConnectInstance_Func connect_instance); // IPC::Channel::Listener implementation. - virtual void OnChannelError(); + virtual void OnChannelError() OVERRIDE; }; } // namespace proxy |