summaryrefslogtreecommitdiffstats
path: root/chrome/browser/service
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-11 22:35:26 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-11 22:35:26 +0000
commit57319cecbf1277567dbd0328fab1ccb741f022ac (patch)
tree24f52f0c4dd774a09c8a3d7ae5ae781e83e1ec27 /chrome/browser/service
parent354d49aec9a0bbae84a558bc2cddf4ccb200f955 (diff)
downloadchromium_src-57319cecbf1277567dbd0328fab1ccb741f022ac.zip
chromium_src-57319cecbf1277567dbd0328fab1ccb741f022ac.tar.gz
chromium_src-57319cecbf1277567dbd0328fab1ccb741f022ac.tar.bz2
Separate out IPC::Message::Sender and Channel::Listener into a separate class.
I fixed the places that did IPC::Channel::Sender (I don't even know how this compiled, but I presume this means the "Sender" base class of the "Channel" which ends up being right). We can fix the other users of this later. BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10541065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141534 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/service')
-rw-r--r--chrome/browser/service/service_process_control.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/service/service_process_control.h b/chrome/browser/service/service_process_control.h
index 9be46eb..5f79882 100644
--- a/chrome/browser/service/service_process_control.h
+++ b/chrome/browser/service/service_process_control.h
@@ -19,6 +19,8 @@
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "ipc/ipc_channel_proxy.h"
+#include "ipc/ipc_listener.h"
+#include "ipc/ipc_sender.h"
class CommandLine;
@@ -36,8 +38,8 @@ struct CloudPrintProxyInfo;
//
// This class is accessed on the UI thread through some UI actions. It then
// talks to the IPC channel on the IO thread.
-class ServiceProcessControl : public IPC::Channel::Sender,
- public IPC::Channel::Listener,
+class ServiceProcessControl : public IPC::Sender,
+ public IPC::Listener,
public content::NotificationObserver {
public:
typedef IDMap<ServiceProcessControl>::iterator iterator;
@@ -70,12 +72,12 @@ class ServiceProcessControl : public IPC::Channel::Sender,
// Virtual for testing.
virtual void Disconnect();
- // IPC::Channel::Listener implementation.
+ // IPC::Listener implementation.
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
virtual void OnChannelError() OVERRIDE;
- // IPC::Channel::Sender implementation
+ // IPC::Sender implementation
virtual bool Send(IPC::Message* message) OVERRIDE;
// content::NotificationObserver implementation.