summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete/autocomplete_popup_model.cc
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-31 20:54:30 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-31 20:54:30 +0000
commitc6207792e2c067d1b97741cf9c262956635d4cab (patch)
treed5637adf22ca685579f7258f0d426248211d239b /chrome/browser/autocomplete/autocomplete_popup_model.cc
parent14f3408a98e69385382ab026a98a7421d6cf0a2f (diff)
downloadchromium_src-c6207792e2c067d1b97741cf9c262956635d4cab.zip
chromium_src-c6207792e2c067d1b97741cf9c262956635d4cab.tar.gz
chromium_src-c6207792e2c067d1b97741cf9c262956635d4cab.tar.bz2
I was too aggressive when placing this check. With rapid typing and deletion it's perfectly reasonable for the controller to be running a query when the popup is not open.
TBR=sky BUG=none TEST=none Review URL: http://codereview.chromium.org/177041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24931 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_popup_model.cc')
-rw-r--r--chrome/browser/autocomplete/autocomplete_popup_model.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_popup_model.cc b/chrome/browser/autocomplete/autocomplete_popup_model.cc
index 0e75699..d54c385 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_model.cc
+++ b/chrome/browser/autocomplete/autocomplete_popup_model.cc
@@ -150,7 +150,6 @@ GURL AutocompletePopupModel::URLsForCurrentSelection(
PageTransition::Type* transition,
bool* is_history_what_you_typed_match,
GURL* alternate_nav_url) const {
- CHECK(IsOpen());
const AutocompleteResult* result;
AutocompleteResult::const_iterator match;
if (!controller_->done()) {
@@ -164,6 +163,7 @@ GURL AutocompletePopupModel::URLsForCurrentSelection(
// stopped. So the default match must be the desired selection.
match = result->default_match();
} else {
+ CHECK(IsOpen());
// The query isn't running, so the standard result set can't possibly be out
// of date.
//