summaryrefslogtreecommitdiffstats
path: root/chrome/browser/instant
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-31 16:26:33 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-31 16:26:33 +0000
commit9ad93bbbbfdcc62d2386a56e754577169b645a04 (patch)
tree40b98332aa9ed133357fc79c14487a7ff67052e1 /chrome/browser/instant
parent37a401bfb45cf6d197c7bfa23f6f2dc73800d206 (diff)
downloadchromium_src-9ad93bbbbfdcc62d2386a56e754577169b645a04.zip
chromium_src-9ad93bbbbfdcc62d2386a56e754577169b645a04.tar.gz
chromium_src-9ad93bbbbfdcc62d2386a56e754577169b645a04.tar.bz2
Fixes crash in delay show of instant preview.
BUG=77979 TEST=none R=jcivelli@chromium.org Review URL: http://codereview.chromium.org/6670102 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80010 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/instant')
-rw-r--r--chrome/browser/instant/instant_controller.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc
index 09134c7..cac3f96 100644
--- a/chrome/browser/instant/instant_controller.cc
+++ b/chrome/browser/instant/instant_controller.cc
@@ -226,6 +226,7 @@ void InstantController::DestroyPreviewContentsAndLeaveActive() {
// TODO(sky): this shouldn't nuke the loader. It should just nuke non-instant
// loaders and hide instant loaders.
loader_manager_.reset(new InstantLoaderManager(this));
+ show_timer_.Stop();
update_timer_.Stop();
}
@@ -564,10 +565,11 @@ void InstantController::ProcessInstantStatusChanged(InstantLoader* loader) {
}
void InstantController::ShowTimerFired() {
- DCHECK(loader_manager_.get());
+ if (!loader_manager_.get())
+ return;
InstantLoader* loader = loader_manager_->active_loader();
- if (loader->ready())
+ if (loader && loader->ready())
ProcessInstantStatusChanged(loader);
}