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

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

Issue 6874038: Remove the last Chrome dependencies from renderer, and enforce no more includes through DEPS. I ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
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_contents.cc
===================================================================
--- chrome/browser/prerender/prerender_contents.cc (revision 81920)
+++ chrome/browser/prerender/prerender_contents.cc (working copy)
@@ -108,7 +108,6 @@
// Hide the RVH, so that we will run at a lower CPU priority.
// Once the RVH is being swapped into a tab, we will Restore it again.
render_view_host_->WasHidden();
- render_view_host_->AllowScriptToClose(true);
// Register this with the ResourceDispatcherHost as a prerender
// RenderViewHost. This must be done before the Navigate message to catch all
@@ -439,8 +438,8 @@
IPC_MESSAGE_HANDLER(ViewHostMsg_DidStartProvisionalLoadForFrame,
OnDidStartProvisionalLoadForFrame)
IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateFaviconURL, OnUpdateFaviconURL)
- IPC_MESSAGE_HANDLER(ViewHostMsg_MaybeCancelPrerender,
- OnMaybeCancelPrerender)
+ IPC_MESSAGE_HANDLER(ViewHostMsg_MaybeCancelPrerenderForHTML5Media,
+ OnMaybeCancelPrerenderForHTML5Media)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP_EX()
@@ -479,16 +478,8 @@
}
}
-void PrerenderContents::OnMaybeCancelPrerender(
- PrerenderCancellationReason reason) {
- switch (reason) {
- case PRERENDER_CANCELLATION_REASON_HTML5_MEDIA:
- Destroy(FINAL_STATUS_HTML5_MEDIA);
- return;
- default:
- LOG(DFATAL) << "Invalid reason " << reason
- << " in OnMaybeCancelPrerender.";
- }
+void PrerenderContents::OnMaybeCancelPrerenderForHTML5Media() {
+ Destroy(FINAL_STATUS_HTML5_MEDIA);
}
bool PrerenderContents::AddAliasURL(const GURL& url) {

Powered by Google App Engine
This is Rietveld 408576698