| Index: content/public/browser/web_contents_observer.h
|
| diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
|
| index 988968a9a4540511d2b8f8a9d18685d95969f044..c64d159c9558714808c37f01a0e2820ab0b71f7d 100644
|
| --- a/content/public/browser/web_contents_observer.h
|
| +++ b/content/public/browser/web_contents_observer.h
|
| @@ -9,7 +9,8 @@
|
| #include "content/common/content_export.h"
|
| #include "content/public/browser/navigation_controller.h"
|
| #include "content/public/common/page_transition_types.h"
|
| -#include "ipc/ipc_channel.h"
|
| +#include "ipc/ipc_listener.h"
|
| +#include "ipc/ipc_sender.h"
|
| #include "webkit/glue/window_open_disposition.h"
|
|
|
| class WebContentsImpl;
|
| @@ -24,8 +25,8 @@ struct Referrer;
|
|
|
| // An observer API implemented by classes which are interested in various page
|
| // load events from WebContents. They also get a chance to filter IPC messages.
|
| -class CONTENT_EXPORT WebContentsObserver : public IPC::Channel::Listener,
|
| - public IPC::Message::Sender {
|
| +class CONTENT_EXPORT WebContentsObserver : public IPC::Listener,
|
| + public IPC::Sender {
|
| public:
|
| // Only one of the two methods below will be called when a RVH is created for
|
| // a WebContents, depending on whether it's for an interstitial or not.
|
| @@ -119,10 +120,10 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Channel::Listener,
|
| // It is safe to delete 'this' from here.
|
| virtual void WebContentsDestroyed(WebContents* web_contents) {}
|
|
|
| - // IPC::Channel::Listener implementation.
|
| + // IPC::Listener implementation.
|
| virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
|
|
|
| - // IPC::Message::Sender implementation.
|
| + // IPC::Sender implementation.
|
| virtual bool Send(IPC::Message* message) OVERRIDE;
|
| int routing_id() const;
|
|
|
|
|