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

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

Issue 165223005: Remove AdoptPrerenderDataFrom. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « chrome/browser/prerender/prerender_handle.h ('k') | chrome/browser/prerender/prerender_link_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_handle.cc
diff --git a/chrome/browser/prerender/prerender_handle.cc b/chrome/browser/prerender/prerender_handle.cc
index 4e02f448fa9f9446fc36f9c24e141b1419fd31e9..17b2583ab160c221da11e3984a21ef0cc3e6b896 100644
--- a/chrome/browser/prerender/prerender_handle.cc
+++ b/chrome/browser/prerender/prerender_handle.cc
@@ -77,27 +77,6 @@ PrerenderHandle::PrerenderHandle(
}
}
-void PrerenderHandle::AdoptPrerenderDataFrom(PrerenderHandle* other_handle) {
- DCHECK_EQ(static_cast<PrerenderManager::PrerenderData*>(NULL),
- prerender_data_.get());
- if (other_handle->prerender_data_.get() &&
- other_handle->prerender_data_->contents()) {
- other_handle->prerender_data_->contents()->RemoveObserver(other_handle);
- }
-
- prerender_data_ = other_handle->prerender_data_;
- other_handle->prerender_data_.reset();
-
- if (prerender_data_.get()) {
- DCHECK_NE(static_cast<PrerenderContents*>(NULL),
- prerender_data_->contents());
- prerender_data_->contents()->AddObserver(this);
- // We are joining a prerender that has already started so we fire off an
- // extra start event at ourselves.
- OnPrerenderStart(prerender_data_->contents());
- }
-}
-
void PrerenderHandle::OnPrerenderStart(PrerenderContents* prerender_contents) {
DCHECK(CalledOnValidThread());
DCHECK(prerender_data_.get());
« no previous file with comments | « chrome/browser/prerender/prerender_handle.h ('k') | chrome/browser/prerender/prerender_link_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698