chrome/browser/prerender/prerender_manager.h - Issue 6915019: Changes to not use the prerendered contents when window.opener needs to be set.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/prerender/prerender_manager.h

Issue 6915019: Changes to not use the prerendered contents when window.opener needs to be set. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Addressing Sreeram's comments. Created 9 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/prerender/prerender_browsertest.cc ('K') | « chrome/browser/prerender/prerender_final_status.h ('k') | chrome/browser/prerender/prerender_manager.cc » ('j') | content/common/view_messages.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prerender/prerender_manager.h

diff --git a/chrome/browser/prerender/prerender_manager.h b/chrome/browser/prerender/prerender_manager.h

index dbad41a32edf8795d8de9f30e243346e420fd2fa..3095670a16f4133d75241649e11f8f27566c4ea1 100644

--- a/chrome/browser/prerender/prerender_manager.h

+++ b/chrome/browser/prerender/prerender_manager.h

@@ -100,8 +100,12 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,

// determines whether a preloaded version of the URL can be used,

// and substitutes the prerendered RVH into the TabContents. Returns

// whether or not a prerendered RVH could be used or not.

- bool MaybeUsePreloadedPage(TabContents* tab_contents, const GURL& url);

- bool MaybeUsePreloadedPageOld(TabContents* tab_contents, const GURL& url);

+ bool MaybeUsePreloadedPage(TabContents* tab_contents,

+ const GURL& url,

+ bool has_opener_set);

+ bool MaybeUsePreloadedPageOld(TabContents* tab_contents,

+ const GURL& url,

+ bool has_opener_set);

// Moves a PrerenderContents to the pending delete list from the list of

// active prerenders when prerendering should be cancelled.