Commit b507ff57 authored by jam@chromium.org's avatar jam@chromium.org

Make RenderViewHostObserver interface not use a struct from view_messages.h

BUG=98716
Review URL: http://codereview.chromium.org/8636023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111236 0039d316-1c4b-4281-b951-d872f2087c98
parent 9426d30c
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/site_instance.h" #include "content/browser/site_instance.h"
#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_service.h"
#include "content/common/view_messages.h"
ChromeRenderViewHostObserver::ChromeRenderViewHostObserver( ChromeRenderViewHostObserver::ChromeRenderViewHostObserver(
RenderViewHost* render_view_host, chrome_browser_net::Predictor* predictor) RenderViewHost* render_view_host, chrome_browser_net::Predictor* predictor)
...@@ -47,9 +46,7 @@ void ChromeRenderViewHostObserver::RenderViewHostDestroyed( ...@@ -47,9 +46,7 @@ void ChromeRenderViewHostObserver::RenderViewHostDestroyed(
delete this; delete this;
} }
void ChromeRenderViewHostObserver::Navigate( void ChromeRenderViewHostObserver::Navigate(const GURL& url) {
const ViewMsg_Navigate_Params& params) {
const GURL& url = params.url;
if (!predictor_) if (!predictor_)
return; return;
if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kChromeFrame) && if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kChromeFrame) &&
......
...@@ -26,7 +26,7 @@ class ChromeRenderViewHostObserver : public RenderViewHostObserver { ...@@ -26,7 +26,7 @@ class ChromeRenderViewHostObserver : public RenderViewHostObserver {
// RenderViewHostObserver overrides. // RenderViewHostObserver overrides.
virtual void RenderViewHostInitialized() OVERRIDE; virtual void RenderViewHostInitialized() OVERRIDE;
virtual void RenderViewHostDestroyed(RenderViewHost* rvh) OVERRIDE; virtual void RenderViewHostDestroyed(RenderViewHost* rvh) OVERRIDE;
virtual void Navigate(const ViewMsg_Navigate_Params& params) OVERRIDE; virtual void Navigate(const GURL& url) OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
private: private:
......
...@@ -247,8 +247,7 @@ void RenderViewHost::Navigate(const ViewMsg_Navigate_Params& params) { ...@@ -247,8 +247,7 @@ void RenderViewHost::Navigate(const ViewMsg_Navigate_Params& params) {
if (!params.url.SchemeIs(chrome::kJavaScriptScheme)) if (!params.url.SchemeIs(chrome::kJavaScriptScheme))
delegate_->DidStartLoading(); delegate_->DidStartLoading();
FOR_EACH_OBSERVER( FOR_EACH_OBSERVER(RenderViewHostObserver, observers_, Navigate(params.url));
RenderViewHostObserver, observers_, Navigate(params));
} }
void RenderViewHost::NavigateToURL(const GURL& url) { void RenderViewHost::NavigateToURL(const GURL& url) {
......
...@@ -24,7 +24,7 @@ void RenderViewHostObserver::RenderViewHostDestroyed(RenderViewHost* rvh) { ...@@ -24,7 +24,7 @@ void RenderViewHostObserver::RenderViewHostDestroyed(RenderViewHost* rvh) {
delete this; delete this;
} }
void RenderViewHostObserver::Navigate(const ViewMsg_Navigate_Params& params) { void RenderViewHostObserver::Navigate(const GURL& url) {
} }
bool RenderViewHostObserver::OnMessageReceived(const IPC::Message& message) { bool RenderViewHostObserver::OnMessageReceived(const IPC::Message& message) {
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#include "ipc/ipc_channel.h" #include "ipc/ipc_channel.h"
#include "content/common/content_export.h" #include "content/common/content_export.h"
class GURL;
class RenderViewHost; class RenderViewHost;
struct ViewMsg_Navigate_Params;
// An observer API implemented by classes which want to filter IPC messages from // An observer API implemented by classes which want to filter IPC messages from
// RenderViewHost. // RenderViewHost.
...@@ -33,7 +33,7 @@ class CONTENT_EXPORT RenderViewHostObserver : public IPC::Channel::Listener, ...@@ -33,7 +33,7 @@ class CONTENT_EXPORT RenderViewHostObserver : public IPC::Channel::Listener,
virtual void RenderViewHostDestroyed(RenderViewHost* render_view_host); virtual void RenderViewHostDestroyed(RenderViewHost* render_view_host);
// Notifies that a navigation is starting. // Notifies that a navigation is starting.
virtual void Navigate(const ViewMsg_Navigate_Params& params); virtual void Navigate(const GURL& url);
// IPC::Channel::Listener implementation. // IPC::Channel::Listener implementation.
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment