diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-02 19:48:39 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-02 19:48:39 +0000 |
| commit | 6e8a896186815b76e76a88f49999c8049e5d84b7 (patch) | |
| tree | f6c0edd767feaa929aa028384d8ffb82071c318c | |
| parent | 4a7300701717f7cc9305597d3971fd628db0bdc9 (diff) | |
| download | chromium_src-6e8a896186815b76e76a88f49999c8049e5d84b7.zip chromium_src-6e8a896186815b76e76a88f49999c8049e5d84b7.tar.gz chromium_src-6e8a896186815b76e76a88f49999c8049e5d84b7.tar.bz2 | |
Fixes crash with instant enabled. The crash would occur if you turned
on preload and your default search provider doesn't support instant.
BUG=84671
TEST=turn on instant, enable 'Preload Instant Search' in about:flags,
change your default search provider to something other than GOogle,
focus the omnibox and make sure you don't crash.
R=jcivelli@chromium.org
Review URL: http://codereview.chromium.org/7058022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87660 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/instant/instant_controller.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc index 06bb410..a6fe03a 100644 --- a/chrome/browser/instant/instant_controller.cc +++ b/chrome/browser/instant/instant_controller.cc @@ -370,7 +370,7 @@ void InstantController::OnAutocompleteGotFocus( return; const TemplateURL* template_url = model->GetDefaultSearchProvider(); - if (!template_url) + if (!template_url || !template_url->instant_url()) return; if (tab_contents != tab_contents_) |