diff options
| author | nasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-10 22:41:58 +0000 |
|---|---|---|
| committer | nasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-10 22:41:58 +0000 |
| commit | 66256d7670f879a59c99fa1fc68171db58107d16 (patch) | |
| tree | cee880e244c076f2fc346e86728658d55d7e0a20 /chrome/browser/prerender | |
| parent | 3da2720363bc25ed5c44086f56ab22e40e5d676a (diff) | |
| download | chromium_src-66256d7670f879a59c99fa1fc68171db58107d16.zip chromium_src-66256d7670f879a59c99fa1fc68171db58107d16.tar.gz chromium_src-66256d7670f879a59c99fa1fc68171db58107d16.tar.bz2 | |
Move DidReceiveServerRedirectForProvisionalLoad from RenderView to RenderFrame
BUG=304341
R=jam@chromium.org
Review URL: https://codereview.chromium.org/129813006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244265 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prerender')
| -rw-r--r-- | chrome/browser/prerender/prerender_manager.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/prerender/prerender_manager.h | 2 | ||||
| -rw-r--r-- | chrome/browser/prerender/prerender_tab_helper.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/prerender/prerender_tab_helper.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc index 3c2abcf..057bac0 100644 --- a/chrome/browser/prerender/prerender_manager.cc +++ b/chrome/browser/prerender/prerender_manager.cc @@ -1170,7 +1170,7 @@ void PrerenderManager::PendingSwap::BeginSwap() { void PrerenderManager::PendingSwap::ProvisionalChangeToMainFrameUrl( const GURL& url, - content::RenderViewHost* render_view_host) { + content::RenderFrameHost* render_frame_host) { // We must only cancel the pending swap if the |url| navigated to is not // the URL being attempted to be swapped in. That's because in the normal // flow, a ProvisionalChangeToMainFrameUrl will happen for the URL attempted diff --git a/chrome/browser/prerender/prerender_manager.h b/chrome/browser/prerender/prerender_manager.h index 2398843..8949212 100644 --- a/chrome/browser/prerender/prerender_manager.h +++ b/chrome/browser/prerender/prerender_manager.h @@ -434,7 +434,7 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>, // content::WebContentsObserver implementation. virtual void ProvisionalChangeToMainFrameUrl( const GURL& url, - content::RenderViewHost* render_view_host) OVERRIDE; + content::RenderFrameHost* render_frame_host) OVERRIDE; virtual void DidCommitProvisionalLoadForFrame( int64 frame_id, const base::string16& frame_unique_name, diff --git a/chrome/browser/prerender/prerender_tab_helper.cc b/chrome/browser/prerender/prerender_tab_helper.cc index d5a8ffb..504478d 100644 --- a/chrome/browser/prerender/prerender_tab_helper.cc +++ b/chrome/browser/prerender/prerender_tab_helper.cc @@ -177,7 +177,7 @@ PrerenderTabHelper::~PrerenderTabHelper() { void PrerenderTabHelper::ProvisionalChangeToMainFrameUrl( const GURL& url, - content::RenderViewHost* render_view_host) { + content::RenderFrameHost* render_frame_host) { url_ = url; RecordEvent(EVENT_MAINFRAME_CHANGE); RecordEventIfLoggedInURL(EVENT_MAINFRAME_CHANGE_DOMAIN_LOGGED_IN, url); diff --git a/chrome/browser/prerender/prerender_tab_helper.h b/chrome/browser/prerender/prerender_tab_helper.h index 436da4f..f64edfc 100644 --- a/chrome/browser/prerender/prerender_tab_helper.h +++ b/chrome/browser/prerender/prerender_tab_helper.h @@ -53,7 +53,7 @@ class PrerenderTabHelper // content::WebContentsObserver implementation. virtual void ProvisionalChangeToMainFrameUrl( const GURL& url, - content::RenderViewHost* render_view_host) OVERRIDE; + content::RenderFrameHost* render_frame_host) OVERRIDE; virtual void DidStopLoading( content::RenderViewHost* render_view_host) OVERRIDE; virtual void DidStartProvisionalLoadForFrame( |