diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-06 03:19:38 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-06 03:19:38 +0000 |
| commit | f7ece85cb9909c76eb344f2462bb7b6c55973d3f (patch) | |
| tree | 631da9c1fa714742ef9c0cb7ccb63518fae6398c /chrome/browser/prerender/prerender_manager.cc | |
| parent | 8fee1f2a000013d5752433c61b56441f1282cb84 (diff) | |
| download | chromium_src-f7ece85cb9909c76eb344f2462bb7b6c55973d3f.zip chromium_src-f7ece85cb9909c76eb344f2462bb7b6c55973d3f.tar.gz chromium_src-f7ece85cb9909c76eb344f2462bb7b6c55973d3f.tar.bz2 | |
Fix prerenders in the delete list not being returned by
PrerenderManager::GetAsValue().
NetInternalsTest.NetInternalsPrerenderView expects to always
see the prerender as active or in the history, once started.
BUG=91799
TEST=NetInternalsTest.NetInternalsPrerenderView (Currently flaky)
Review URL: http://codereview.chromium.org/7550031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95721 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prerender/prerender_manager.cc')
| -rw-r--r-- | chrome/browser/prerender/prerender_manager.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc index dd19f27..cb83264 100644 --- a/chrome/browser/prerender/prerender_manager.cc +++ b/chrome/browser/prerender/prerender_manager.cc @@ -603,6 +603,7 @@ void PrerenderManager::MoveEntryToPendingDelete(PrerenderContents* entry) { break; } } + AddToHistory(entry); pending_delete_list_.push_back(entry); // Destroy the old TabContents relatively promptly to reduce resource usage, @@ -651,7 +652,6 @@ void PrerenderManager::DeletePendingDeleteEntries() { while (!pending_delete_list_.empty()) { PrerenderContents* contents = pending_delete_list_.front(); pending_delete_list_.pop_front(); - AddToHistory(contents); delete contents; } } |