diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-20 22:35:31 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-20 22:35:31 +0000 |
commit | c47317e98d6623ea0e40a2fcf60e13b9bcb03d4e (patch) | |
tree | 0b5b672655adda0cea63afa6c1b19e65157db433 /ppapi | |
parent | 124f78b393c367c5f86b5d90cfee37f4dd1bfa8e (diff) | |
download | chromium_src-c47317e98d6623ea0e40a2fcf60e13b9bcb03d4e.zip chromium_src-c47317e98d6623ea0e40a2fcf60e13b9bcb03d4e.tar.gz chromium_src-c47317e98d6623ea0e40a2fcf60e13b9bcb03d4e.tar.bz2 |
Rename IPC Sender and Listener in ppapi, content/public, and content/renderer
This is the new name in preparation for deleting the backwards-compatible typedef.
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10532162
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143282 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r-- | ppapi/proxy/broker_dispatcher.h | 6 | ||||
-rw-r--r-- | ppapi/proxy/dispatcher.h | 5 | ||||
-rw-r--r-- | ppapi/proxy/host_dispatcher.h | 7 | ||||
-rw-r--r-- | ppapi/proxy/interface_proxy.h | 11 | ||||
-rw-r--r-- | ppapi/proxy/plugin_dispatcher.h | 2 | ||||
-rw-r--r-- | ppapi/proxy/plugin_message_filter.h | 15 | ||||
-rw-r--r-- | ppapi/proxy/plugin_proxy_delegate.h | 4 | ||||
-rw-r--r-- | ppapi/proxy/ppb_flash_device_id_proxy.h | 2 | ||||
-rw-r--r-- | ppapi/proxy/ppb_pdf_proxy.h | 2 | ||||
-rw-r--r-- | ppapi/proxy/ppb_x509_certificate_private_proxy.h | 1 | ||||
-rw-r--r-- | ppapi/proxy/ppp_messaging_proxy.h | 1 | ||||
-rw-r--r-- | ppapi/proxy/ppp_mouse_lock_proxy.h | 1 | ||||
-rw-r--r-- | ppapi/proxy/ppp_printing_proxy.h | 1 | ||||
-rw-r--r-- | ppapi/proxy/ppp_text_input_proxy.h | 1 | ||||
-rw-r--r-- | ppapi/proxy/proxy_channel.h | 15 |
15 files changed, 43 insertions, 31 deletions
diff --git a/ppapi/proxy/broker_dispatcher.h b/ppapi/proxy/broker_dispatcher.h index 5354632..d483d76 100644 --- a/ppapi/proxy/broker_dispatcher.h +++ b/ppapi/proxy/broker_dispatcher.h @@ -24,7 +24,7 @@ class PPAPI_PROXY_EXPORT BrokerDispatcher : public ProxyChannel { const IPC::ChannelHandle& channel_handle, bool is_client); - // IPC::Channel::Listener implementation. + // IPC::Listener implementation. virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; protected: @@ -46,7 +46,7 @@ class PPAPI_PROXY_EXPORT BrokerHostDispatcher : public BrokerDispatcher { public: BrokerHostDispatcher(); - // IPC::Channel::Listener implementation. + // IPC::Listener implementation. virtual void OnChannelError() OVERRIDE; }; @@ -55,7 +55,7 @@ class PPAPI_PROXY_EXPORT BrokerSideDispatcher : public BrokerDispatcher { public: explicit BrokerSideDispatcher(PP_ConnectInstance_Func connect_instance); - // IPC::Channel::Listener implementation. + // IPC::Listener implementation. virtual void OnChannelError() OVERRIDE; }; diff --git a/ppapi/proxy/dispatcher.h b/ppapi/proxy/dispatcher.h index 797fa08..9fd2461 100644 --- a/ppapi/proxy/dispatcher.h +++ b/ppapi/proxy/dispatcher.h @@ -10,6 +10,7 @@ #include <vector> #include "base/callback_forward.h" +#include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/tracked_objects.h" #include "ipc/ipc_channel_proxy.h" @@ -73,8 +74,8 @@ class PPAPI_PROXY_EXPORT Dispatcher : public ProxyChannel { // so we don't have to query for each one. We'll pre-create proxies for // each of the given interfaces. - // IPC::Channel::Listener implementation. - virtual bool OnMessageReceived(const IPC::Message& msg); + // IPC::Listener implementation. + virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; PP_GetInterface_Func local_get_interface() const { return local_get_interface_; diff --git a/ppapi/proxy/host_dispatcher.h b/ppapi/proxy/host_dispatcher.h index 70dd08a..6c4dd2d 100644 --- a/ppapi/proxy/host_dispatcher.h +++ b/ppapi/proxy/host_dispatcher.h @@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/process.h" #include "ipc/ipc_channel_proxy.h" @@ -78,9 +79,9 @@ class PPAPI_PROXY_EXPORT HostDispatcher : public Dispatcher { virtual bool IsPlugin() const; virtual bool Send(IPC::Message* msg); - // IPC::Channel::Listener. - virtual bool OnMessageReceived(const IPC::Message& msg); - virtual void OnChannelError(); + // IPC::Listener. + virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; + virtual void OnChannelError() OVERRIDE; // Proxied version of calling GetInterface on the plugin. This will check // if the plugin supports the given interface (with caching) and returns the diff --git a/ppapi/proxy/interface_proxy.h b/ppapi/proxy/interface_proxy.h index b87a184..dcab547 100644 --- a/ppapi/proxy/interface_proxy.h +++ b/ppapi/proxy/interface_proxy.h @@ -6,8 +6,8 @@ #define PPAPI_PROXY_INTERFACE_PROXY_H_ #include "base/basictypes.h" -#include "ipc/ipc_channel.h" -#include "ipc/ipc_message.h" +#include "ipc/ipc_listener.h" +#include "ipc/ipc_sender.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_var.h" @@ -18,8 +18,7 @@ namespace proxy { class Dispatcher; -class InterfaceProxy : public IPC::Channel::Listener, - public IPC::Message::Sender { +class InterfaceProxy : public IPC::Listener, public IPC::Sender { public: // Factory function type for interfaces. Ownership of the returned pointer // is transferred to the caller. @@ -47,10 +46,10 @@ class InterfaceProxy : public IPC::Channel::Listener, Dispatcher* dispatcher() const { return dispatcher_; } - // IPC::Message::Sender implementation. + // IPC::Sender implementation. virtual bool Send(IPC::Message* msg); - // Sub-classes must implement IPC::Channel::Listener which contains this: + // Sub-classes must implement IPC::Listener which contains this: //virtual bool OnMessageReceived(const IPC::Message& msg); protected: diff --git a/ppapi/proxy/plugin_dispatcher.h b/ppapi/proxy/plugin_dispatcher.h index 5022f69..0639d29 100644 --- a/ppapi/proxy/plugin_dispatcher.h +++ b/ppapi/proxy/plugin_dispatcher.h @@ -108,7 +108,7 @@ class PPAPI_PROXY_EXPORT PluginDispatcher virtual bool IsPlugin() const; virtual bool Send(IPC::Message* msg); - // IPC::Channel::Listener implementation. + // IPC::Listener implementation. virtual bool OnMessageReceived(const IPC::Message& msg); virtual void OnChannelError(); diff --git a/ppapi/proxy/plugin_message_filter.h b/ppapi/proxy/plugin_message_filter.h index 10f45c8..5701a96 100644 --- a/ppapi/proxy/plugin_message_filter.h +++ b/ppapi/proxy/plugin_message_filter.h @@ -7,8 +7,9 @@ #include <set> +#include "base/compiler_specific.h" #include "ipc/ipc_channel_proxy.h" -#include "ipc/ipc_message.h" +#include "ipc/ipc_sender.h" #include "ppapi/c/pp_instance.h" namespace ppapi { @@ -20,7 +21,7 @@ namespace proxy { // There is one instance of this class for each renderer channel (same as for // the PluginDispatchers). class PluginMessageFilter : public IPC::ChannelProxy::MessageFilter, - public IPC::Message::Sender { + public IPC::Sender { public: // The input is a pointer to a set that will be used to uniquify PP_Instances // across all renderer channels. The same pointer should be passed to each @@ -30,12 +31,12 @@ class PluginMessageFilter : public IPC::ChannelProxy::MessageFilter, virtual ~PluginMessageFilter(); // MessageFilter implementation. - virtual void OnFilterAdded(IPC::Channel* channel); - virtual void OnFilterRemoved(); - virtual bool OnMessageReceived(const IPC::Message& message); + virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE; + virtual void OnFilterRemoved() OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - // Message::Sender implementation. - virtual bool Send(IPC::Message* msg); + // IPC::Sender implementation. + virtual bool Send(IPC::Message* msg) OVERRIDE; private: void OnMsgReserveInstanceId(PP_Instance instance, bool* usable); diff --git a/ppapi/proxy/plugin_proxy_delegate.h b/ppapi/proxy/plugin_proxy_delegate.h index 0d1807a..82b540e 100644 --- a/ppapi/proxy/plugin_proxy_delegate.h +++ b/ppapi/proxy/plugin_proxy_delegate.h @@ -14,8 +14,8 @@ class PPAPI_PROXY_EXPORT PluginProxyDelegate { public: virtual ~PluginProxyDelegate() {} - // Sends the given message to the browser. Identical semantics to - // IPC::Message::Sender interface. + // Sends the given message to the browser. Identical semantics to IPC::Sender + // interface. virtual bool SendToBrowser(IPC::Message* msg) = 0; // Returns the language code of the current UI language. diff --git a/ppapi/proxy/ppb_flash_device_id_proxy.h b/ppapi/proxy/ppb_flash_device_id_proxy.h index 58b15df..f379873 100644 --- a/ppapi/proxy/ppb_flash_device_id_proxy.h +++ b/ppapi/proxy/ppb_flash_device_id_proxy.h @@ -5,6 +5,8 @@ #ifndef PPAPI_PROXY_PPB_FLASH_DEVICE_ID_PROXY_H_ #define PPAPI_PROXY_PPB_FLASH_DEVICE_ID_PROXY_H_ +#include <string> + #include "ppapi/c/pp_instance.h" #include "ppapi/proxy/interface_proxy.h" diff --git a/ppapi/proxy/ppb_pdf_proxy.h b/ppapi/proxy/ppb_pdf_proxy.h index 7ad012d..b676148 100644 --- a/ppapi/proxy/ppb_pdf_proxy.h +++ b/ppapi/proxy/ppb_pdf_proxy.h @@ -5,6 +5,8 @@ #ifndef PPAPI_PPB_PDF_PROXY_H_ #define PPAPI_PPB_PDF_PROXY_H_ +#include <string> + #include "ppapi/c/pp_module.h" #include "ppapi/proxy/interface_proxy.h" #include "ppapi/shared_impl/host_resource.h" diff --git a/ppapi/proxy/ppb_x509_certificate_private_proxy.h b/ppapi/proxy/ppb_x509_certificate_private_proxy.h index f3a4b2f..4c51bab 100644 --- a/ppapi/proxy/ppb_x509_certificate_private_proxy.h +++ b/ppapi/proxy/ppb_x509_certificate_private_proxy.h @@ -6,6 +6,7 @@ #define PPAPI_PROXY_PPB_X509_CERTIFICATE_PRIVATE_PROXY_H_ #include "base/basictypes.h" +#include "base/compiler_specific.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_resource.h" #include "ppapi/proxy/interface_proxy.h" diff --git a/ppapi/proxy/ppp_messaging_proxy.h b/ppapi/proxy/ppp_messaging_proxy.h index f9390a4..4b66f92 100644 --- a/ppapi/proxy/ppp_messaging_proxy.h +++ b/ppapi/proxy/ppp_messaging_proxy.h @@ -5,6 +5,7 @@ #ifndef PPAPI_PROXY_PPP_MESSAGING_PROXY_H_ #define PPAPI_PROXY_PPP_MESSAGING_PROXY_H_ +#include "base/compiler_specific.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/ppp_messaging.h" #include "ppapi/proxy/interface_proxy.h" diff --git a/ppapi/proxy/ppp_mouse_lock_proxy.h b/ppapi/proxy/ppp_mouse_lock_proxy.h index f9b0be2..64f1b7a 100644 --- a/ppapi/proxy/ppp_mouse_lock_proxy.h +++ b/ppapi/proxy/ppp_mouse_lock_proxy.h @@ -5,6 +5,7 @@ #ifndef PPAPI_PROXY_PPP_MOUSE_LOCK_PROXY_H_ #define PPAPI_PROXY_PPP_MOUSE_LOCK_PROXY_H_ +#include "base/compiler_specific.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/ppp_mouse_lock.h" #include "ppapi/proxy/interface_proxy.h" diff --git a/ppapi/proxy/ppp_printing_proxy.h b/ppapi/proxy/ppp_printing_proxy.h index fd6375c..03bebf7 100644 --- a/ppapi/proxy/ppp_printing_proxy.h +++ b/ppapi/proxy/ppp_printing_proxy.h @@ -5,6 +5,7 @@ #ifndef PPAPI_PROXY_PPP_PRINTING_PROXY_H_ #define PPAPI_PROXY_PPP_PRINTING_PROXY_H_ +#include <string> #include <vector> #include "ppapi/c/dev/ppp_printing_dev.h" diff --git a/ppapi/proxy/ppp_text_input_proxy.h b/ppapi/proxy/ppp_text_input_proxy.h index c4f09db..7ac0cac 100644 --- a/ppapi/proxy/ppp_text_input_proxy.h +++ b/ppapi/proxy/ppp_text_input_proxy.h @@ -5,6 +5,7 @@ #ifndef PPAPI_PROXY_PPP_TEXT_INPUT_PROXY_H_ #define PPAPI_PROXY_PPP_TEXT_INPUT_PROXY_H_ +#include "base/compiler_specific.h" #include "ppapi/c/dev/ppp_text_input_dev.h" #include "ppapi/c/pp_instance.h" #include "ppapi/proxy/interface_proxy.h" diff --git a/ppapi/proxy/proxy_channel.h b/ppapi/proxy/proxy_channel.h index ffd3f2f..bb08f79 100644 --- a/ppapi/proxy/proxy_channel.h +++ b/ppapi/proxy/proxy_channel.h @@ -7,8 +7,9 @@ #include "base/memory/scoped_ptr.h" #include "base/process.h" -#include "ipc/ipc_message.h" +#include "ipc/ipc_listener.h" #include "ipc/ipc_platform_file.h" +#include "ipc/ipc_sender.h" #include "ipc/ipc_sync_channel.h" #include "ppapi/proxy/ppapi_proxy_export.h" @@ -25,8 +26,8 @@ namespace ppapi { namespace proxy { class PPAPI_PROXY_EXPORT ProxyChannel - : public IPC::Channel::Listener, - public IPC::Message::Sender { + : public IPC::Listener, + public IPC::Sender { public: class PPAPI_PROXY_EXPORT Delegate { public: @@ -67,11 +68,11 @@ class PPAPI_PROXY_EXPORT ProxyChannel base::PlatformFile handle, bool should_close_source); - // IPC::Message::Sender implementation. - virtual bool Send(IPC::Message* msg); + // IPC::Sender implementation. + virtual bool Send(IPC::Message* msg) OVERRIDE; - // IPC::Channel::Listener implementation. - virtual void OnChannelError(); + // IPC::Listener implementation. + virtual void OnChannelError() OVERRIDE; // Will be NULL in some unit tests and if the remote side has crashed. IPC::SyncChannel* channel() const { |