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

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

Issue 11571037: Pass load events from prerenders to launching elements. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase to fix build Created 7 years, 12 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
« no previous file with comments | « chrome/browser/prerender/prerender_contents.h ('k') | chrome/browser/prerender/prerender_handle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_contents.cc
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index 22165b101b75dbabb2e29e7074a82727001f3af9..4815dc53379fdb26f4ee07567b68a329abf37a92 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -140,6 +140,10 @@ class PrerenderContents::WebContentsDelegateImpl
PrerenderContents* prerender_contents_;
};
+void PrerenderContents::Observer::OnPrerenderStopLoading(
+ PrerenderContents* contents) {
+}
+
void PrerenderContents::Observer::OnPrerenderAddAlias(
PrerenderContents* contents,
const GURL& alias_url) {
@@ -467,6 +471,11 @@ void PrerenderContents::NotifyPrerenderStart() {
FOR_EACH_OBSERVER(Observer, observer_list_, OnPrerenderStart(this));
}
+void PrerenderContents::NotifyPrerenderStopLoading() {
+ DCHECK_EQ(FINAL_STATUS_MAX, final_status_);
gavinp 2013/01/03 17:20:10 This simply isn't always true.
mmenke 2013/01/03 17:23:47 My understanding of the world will never be the sa
+ FOR_EACH_OBSERVER(Observer, observer_list_, OnPrerenderStopLoading(this));
+}
+
void PrerenderContents::NotifyPrerenderStop() {
DCHECK_NE(FINAL_STATUS_MAX, final_status_);
FOR_EACH_OBSERVER(Observer, observer_list_, OnPrerenderStop(this));
@@ -541,6 +550,7 @@ void PrerenderContents::RenderViewGone(base::TerminationStatus status) {
void PrerenderContents::DidStopLoading(
content::RenderViewHost* render_view_host) {
has_stopped_loading_ = true;
+ NotifyPrerenderStopLoading();
}
void PrerenderContents::DidStartProvisionalLoadForFrame(
« no previous file with comments | « chrome/browser/prerender/prerender_contents.h ('k') | chrome/browser/prerender/prerender_handle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698