diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-04 00:52:29 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-04 00:52:29 +0000 |
| commit | 220f50e960b1ee25517e01a24475a9d2964b9d08 (patch) | |
| tree | eb696acb31f8cb257449eb964763780e974ec170 /chrome/browser/autocomplete/autocomplete_popup_model.cc | |
| parent | 1230979980bb4954fd5a360e095c4956ef77ac19 (diff) | |
| download | chromium_src-220f50e960b1ee25517e01a24475a9d2964b9d08.zip chromium_src-220f50e960b1ee25517e01a24475a9d2964b9d08.tar.gz chromium_src-220f50e960b1ee25517e01a24475a9d2964b9d08.tar.bz2 | |
Fix a browser crash when typing a disabled extension keyword in an
incognito window's URL bar.
BUG=65184
TEST=See bug for repro
Review URL: http://codereview.chromium.org/5511007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68256 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_popup_model.cc')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_popup_model.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_popup_model.cc b/chrome/browser/autocomplete/autocomplete_popup_model.cc index 9e96984..af83a0d 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_model.cc +++ b/chrome/browser/autocomplete/autocomplete_popup_model.cc @@ -222,12 +222,13 @@ bool AutocompletePopupModel::GetKeywordForMatch(const AutocompleteMatch& match, if (!TemplateURL::SupportsReplacement(template_url)) return false; - // Don't provide a hint if this is an extension keyword not enabled for - // incognito mode (and if this is an incognito profile). - if (template_url->IsExtensionKeyword() && profile_->IsOffTheRecord()) { + // Don't provide a hint for inactive/disabled extension keywords. + if (template_url->IsExtensionKeyword()) { const Extension* extension = profile_->GetExtensionsService()-> GetExtensionById(template_url->GetExtensionId(), false); - if (!profile_->GetExtensionsService()->IsIncognitoEnabled(extension)) + if (!extension || + (profile_->IsOffTheRecord() && + !profile_->GetExtensionsService()->IsIncognitoEnabled(extension))) return false; } |