summaryrefslogtreecommitdiffstats
path: root/chrome/browser/instant/instant_loader_manager.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-08 01:08:11 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-08 01:08:11 +0000
commitf38adeeb281880518fdd9302ad66849c51897fab (patch)
treec690aac82e6a29f8e3068c6ea46fdf687d971e5a /chrome/browser/instant/instant_loader_manager.cc
parentf192fa9948bfbdb99cf6838cb847e4d08f31602e (diff)
downloadchromium_src-f38adeeb281880518fdd9302ad66849c51897fab.zip
chromium_src-f38adeeb281880518fdd9302ad66849c51897fab.tar.gz
chromium_src-f38adeeb281880518fdd9302ad66849c51897fab.tar.bz2
Makes instant not access sites that return a 403 status code.
BUG=59429 TEST=none Review URL: http://codereview.chromium.org/5631004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68543 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/instant/instant_loader_manager.cc')
-rw-r--r--chrome/browser/instant/instant_loader_manager.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/instant/instant_loader_manager.cc b/chrome/browser/instant/instant_loader_manager.cc
index 8c3c17c..88c35f6 100644
--- a/chrome/browser/instant/instant_loader_manager.cc
+++ b/chrome/browser/instant/instant_loader_manager.cc
@@ -113,6 +113,10 @@ InstantLoader* InstantLoaderManager::ReleaseCurrentLoader() {
}
void InstantLoaderManager::DestroyLoader(InstantLoader* loader) {
+ delete ReleaseLoader(loader);
+}
+
+InstantLoader* InstantLoaderManager::ReleaseLoader(InstantLoader* loader) {
DCHECK(loader == current_loader_ || loader == pending_loader_ ||
(loader->template_url_id() &&
instant_loaders_.find(loader->template_url_id()) !=
@@ -126,7 +130,7 @@ void InstantLoaderManager::DestroyLoader(InstantLoader* loader) {
RemoveLoaderFromInstant(loader);
- delete loader;
+ return loader;
}
void InstantLoaderManager::RemoveLoaderFromInstant(InstantLoader* loader) {