| Index: chrome/browser/prerender/prerender_tab_helper.cc
|
| diff --git a/chrome/browser/prerender/prerender_tab_helper.cc b/chrome/browser/prerender/prerender_tab_helper.cc
|
| index 07f704b1d4ae04ccf403cde78300be22a4023551..2c04a7ae7f9c73415e1c7a1e17caf67840f68922 100644
|
| --- a/chrome/browser/prerender/prerender_tab_helper.cc
|
| +++ b/chrome/browser/prerender/prerender_tab_helper.cc
|
| @@ -184,15 +184,12 @@ void PrerenderTabHelper::ProvisionalChangeToMainFrameUrl(
|
| RecordPageviewEvent(PAGEVIEW_EVENT_NEW_URL);
|
| if (IsTopSite(url))
|
| RecordPageviewEvent(PAGEVIEW_EVENT_TOP_SITE_NEW_URL);
|
| - if (!tab_->core_tab_helper()->delegate())
|
| - return; // PrerenderManager needs a delegate to handle the swap.
|
| PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
|
| if (!prerender_manager)
|
| return;
|
| if (prerender_manager->IsWebContentsPrerendering(web_contents()))
|
| return;
|
| prerender_manager->MarkWebContentsAsNotPrerendered(web_contents());
|
| - MaybeUsePrerenderedPage(url, opener_url);
|
| }
|
|
|
| void PrerenderTabHelper::UpdateTargetURL(int32 page_id, const GURL& url) {
|
| @@ -247,17 +244,6 @@ PrerenderManager* PrerenderTabHelper::MaybeGetPrerenderManager() const {
|
| Profile::FromBrowserContext(web_contents()->GetBrowserContext()));
|
| }
|
|
|
| -bool PrerenderTabHelper::MaybeUsePrerenderedPage(const GURL& url,
|
| - const GURL& opener_url) {
|
| - PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
|
| - if (!prerender_manager)
|
| - return false;
|
| - DCHECK(!prerender_manager->IsWebContentsPrerendering(web_contents()));
|
| - return prerender_manager->MaybeUsePrerenderedPage(web_contents(),
|
| - url,
|
| - opener_url);
|
| -}
|
| -
|
| bool PrerenderTabHelper::IsPrerendering() {
|
| PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
|
| if (!prerender_manager)
|
|
|