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

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

Issue 133073021: Pass DomContentLoaded event from prerenders to launching elements. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed unit tests. Created 6 years, 10 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_contents.h
diff --git a/chrome/browser/prerender/prerender_contents.h b/chrome/browser/prerender/prerender_contents.h
index aa5c7aa8274df2990d8ee1f27f99452b8e35b9ea..d657dcd02129b7df6aa7a0430e04d5e8438e0d69 100644
--- a/chrome/browser/prerender/prerender_contents.h
+++ b/chrome/browser/prerender/prerender_contents.h
@@ -77,6 +77,9 @@ class PrerenderContents : public content::NotificationObserver,
// Signals that the prerender has had its load event.
virtual void OnPrerenderStopLoading(PrerenderContents* contents);
+ // Signals that the prerender has had its 'DOMContentLoaded' event.
+ virtual void OnPrerenderDomContentLoaded(PrerenderContents* contents);
+
// Signals that the prerender has stopped running. A PrerenderContents with
// an unset final status will always call OnPrerenderStop before being
// destroyed.
@@ -200,6 +203,8 @@ class PrerenderContents : public content::NotificationObserver,
content::RenderFrameHost* render_frame_host) OVERRIDE;
virtual void DidStopLoading(
content::RenderViewHost* render_view_host) OVERRIDE;
+ virtual void DocumentLoadedInFrame(
+ int64 frame_id, content::RenderViewHost* render_view_host) OVERRIDE;
virtual void DidStartProvisionalLoadForFrame(
int64 frame_id,
int64 parent_frame_id,
@@ -208,6 +213,13 @@ class PrerenderContents : public content::NotificationObserver,
bool is_error_page,
bool is_iframe_srcdoc,
content::RenderViewHost* render_view_host) OVERRIDE;
+ virtual void DidCommitProvisionalLoadForFrame(
+ int64 frame_id,
+ const base::string16& frame_unique_name,
+ bool is_main_frame,
+ const GURL& url,
+ content::PageTransition transition_type,
+ content::RenderViewHost* render_view_host) OVERRIDE;
virtual void DidFinishLoad(
int64 frame_id,
const GURL& validated_url,
@@ -308,6 +320,7 @@ class PrerenderContents : public content::NotificationObserver,
// that NotifyPrerenderStop() also clears the observer list.
void NotifyPrerenderStart();
void NotifyPrerenderStopLoading();
+ void NotifyPrerenderDomContentLoaded();
void NotifyPrerenderStop();
void NotifyPrerenderCreatedMatchCompleteReplacement(
PrerenderContents* replacement);
@@ -425,6 +438,9 @@ class PrerenderContents : public content::NotificationObserver,
// The process that created the child id.
int creator_child_id_;
+ // Main frame ID of last committed page.
+ int64 main_frame_id_;
+
// The size of the WebView from the launching page.
gfx::Size size_;

Powered by Google App Engine
This is Rietveld 408576698