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

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

Issue 7015026: Cancel prerenders for pages that call window.print() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
« no previous file with comments | « chrome/browser/prerender/prerender_render_view_host_observer.h ('k') | chrome/common/render_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_render_view_host_observer.cc
diff --git a/chrome/browser/prerender/prerender_render_view_host_observer.cc b/chrome/browser/prerender/prerender_render_view_host_observer.cc
index fe297a8f0ece5b02b61e71f81958a12f6401355e..aac0d6a155cd20e05d3e6e9e1596ce53ff6cb9d9 100644
--- a/chrome/browser/prerender/prerender_render_view_host_observer.cc
+++ b/chrome/browser/prerender/prerender_render_view_host_observer.cc
@@ -41,6 +41,8 @@ bool PrerenderRenderViewHostObserver::OnMessageReceived(
IPC_MESSAGE_HANDLER(ViewHostMsg_RunJavaScriptMessage,
OnRunJavaScriptMessage)
IPC_MESSAGE_HANDLER(ViewHostMsg_RenderViewGone, OnRenderViewGone)
+ IPC_MESSAGE_HANDLER(ViewHostMsg_CancelPrerenderForPrinting,
+ OnCancelPrerenderForPrinting)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
@@ -97,7 +99,11 @@ void PrerenderRenderViewHostObserver::OnUpdateFaviconURL(
}
void PrerenderRenderViewHostObserver::OnMaybeCancelPrerenderForHTML5Media() {
- prerender_contents_->OnMaybeCancelPrerenderForHTML5Media();
+ prerender_contents_->Destroy(FINAL_STATUS_HTML5_MEDIA);
+}
+
+void PrerenderRenderViewHostObserver::OnCancelPrerenderForPrinting() {
+ prerender_contents_->Destroy(FINAL_STATUS_WINDOW_PRINT);
}
}
« no previous file with comments | « chrome/browser/prerender/prerender_render_view_host_observer.h ('k') | chrome/common/render_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698