Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1952)

Unified Diff: chrome/browser/prerender/prerender_observer.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: Created 9 years, 8 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
Index: chrome/browser/prerender/prerender_observer.h
diff --git a/chrome/browser/prerender/prerender_observer.h b/chrome/browser/prerender/prerender_observer.h
index eb7d112d75c9e047f5662f16c5f22733651e2277..c72df750d1b5517f9f7b6debb4c8eabfe1cbf38e 100644
--- a/chrome/browser/prerender/prerender_observer.h
+++ b/chrome/browser/prerender/prerender_observer.h
@@ -30,13 +30,15 @@ class PrerenderObserver : public TabContentsObserver {
virtual ~PrerenderObserver();
// TabContentsObserver implementation.
- virtual void ProvisionalChangeToMainFrameUrl(const GURL& url) OVERRIDE;
+ virtual void ProvisionalChangeToMainFrameUrl(const GURL& url,
+ bool has_opener_set) OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
virtual void DidStopLoading() OVERRIDE;
// Message handler.
void OnDidStartProvisionalLoadForFrame(int64 frame_id,
bool main_frame,
+ bool has_opener_set,
const GURL& url);
private:
@@ -46,7 +48,7 @@ class PrerenderObserver : public TabContentsObserver {
// Checks with the PrerenderManager if the specified URL has been preloaded,
// and if so, swap the RenderViewHost with the preload into this TabContents
// object.
- bool MaybeUsePreloadedPage(const GURL& url);
+ bool MaybeUsePreloadedPage(const GURL& url, bool has_opener_set);
// System time at which the current load was started for the purpose of
// the perceived page load time (PPLT).

Powered by Google App Engine
This is Rietveld 408576698