summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prerender/prerender_manager.cc
diff options
context:
space:
mode:
authordominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 22:14:20 +0000
committerdominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 22:14:20 +0000
commit5869e29bd54daa66f98eafebb5469aff24354cfe (patch)
treea3e0698337b2e8d5e2b42aea603296b744c159f0 /chrome/browser/prerender/prerender_manager.cc
parentb714f55c2a99e52c19eee74503373169a5bb1570 (diff)
downloadchromium_src-5869e29bd54daa66f98eafebb5469aff24354cfe.zip
chromium_src-5869e29bd54daa66f98eafebb5469aff24354cfe.tar.gz
chromium_src-5869e29bd54daa66f98eafebb5469aff24354cfe.tar.bz2
Don't prematurely cancel the Omnibox prerender due to URL mismatch.
It's possible there's a redirect chain that needs to be resolved. We could check the chain for a match and cancel, but it's much simpler (and not unreasonable) to not cancel in the first place. BUG=134268 R=gavinp@chromium.org TEST= Review URL: https://chromiumcodereview.appspot.com/10673003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144293 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prerender/prerender_manager.cc')
-rw-r--r--chrome/browser/prerender/prerender_manager.cc10
1 files changed, 0 insertions, 10 deletions
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
index fe9675a..5d04091 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -307,16 +307,6 @@ void PrerenderManager::CancelAllPrerenders() {
}
}
-void PrerenderManager::CancelOmniboxPrerenders() {
- DCHECK(CalledOnValidThread());
- for (PrerenderContentsDataList::iterator it = prerender_list_.begin();
- it != prerender_list_.end(); ) {
- PrerenderContentsDataList::iterator cur = it++;
- if (cur->contents_->origin() == ORIGIN_OMNIBOX)
- cur->contents_->Destroy(FINAL_STATUS_CANCELLED);
- }
-}
-
bool PrerenderManager::MaybeUsePrerenderedPage(WebContents* web_contents,
const GURL& url) {
DCHECK(CalledOnValidThread());