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

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

Issue 7374008: Move download stuff from download helper back to TabContents. This is basically a revert of r8576... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync Created 9 years, 5 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 92629)
+++ chrome/browser/prerender/prerender_contents.cc (working copy)
@@ -150,7 +150,6 @@
NULL, NULL);
prerender_contents_.reset(new TabContentsWrapper(new_contents));
TabContentsObserver::Observe(new_contents);
- prerender_contents_->download_tab_helper()->set_delegate(this);
gfx::Rect tab_bounds;
if (source_render_view_host) {
@@ -517,18 +516,6 @@
render_view_host_observer_->set_prerender_contents(NULL);
}
-bool PrerenderContents::CanDownload(int request_id) {
- Destroy(FINAL_STATUS_DOWNLOAD);
- // Cancel the download.
- return false;
-}
-
-void PrerenderContents::OnStartDownload(DownloadItem* download,
- TabContentsWrapper* tab) {
- // Prerendered pages should never be able to download files.
- NOTREACHED();
-}
-
base::ProcessMetrics* PrerenderContents::MaybeGetProcessMetrics() {
if (process_metrics_.get() == NULL) {
// If a PrenderContents hasn't started prerending, don't be fully formed.
@@ -564,7 +551,6 @@
TabContentsWrapper* PrerenderContents::ReleasePrerenderContents() {
prerender_contents_->tab_contents()->set_delegate(NULL);
render_view_host_observer_.reset();
- prerender_contents_->download_tab_helper()->set_delegate(NULL);
TabContentsObserver::Observe(NULL);
return prerender_contents_.release();
}

Powered by Google App Engine
This is Rietveld 408576698