summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete/autocomplete_classifier.h
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-06 03:57:48 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-06 03:57:48 +0000
commitcc44736c35e9253d2ed6061142939e6fae09d674 (patch)
treee1d68a4a14d4f6cd9a436cdbce0cc07b77409194 /chrome/browser/autocomplete/autocomplete_classifier.h
parentd7bd1f86f904275aed0aa483662e1ad72016d9a8 (diff)
downloadchromium_src-cc44736c35e9253d2ed6061142939e6fae09d674.zip
chromium_src-cc44736c35e9253d2ed6061142939e6fae09d674.tar.gz
chromium_src-cc44736c35e9253d2ed6061142939e6fae09d674.tar.bz2
Fixes crash in SearchProvider. The crash occurred because the
SearchProvider could end up recursively invoking the AutocompleteClassifier, leading to weird bugs. BUG=78342 TEST=see bug R=pkasting@chromium.org Review URL: http://codereview.chromium.org/6792064 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80575 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_classifier.h')
-rw-r--r--chrome/browser/autocomplete/autocomplete_classifier.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_classifier.h b/chrome/browser/autocomplete/autocomplete_classifier.h
index 6bd86ca..d09f304 100644
--- a/chrome/browser/autocomplete/autocomplete_classifier.h
+++ b/chrome/browser/autocomplete/autocomplete_classifier.h
@@ -43,6 +43,10 @@ class AutocompleteClassifier {
private:
scoped_ptr<AutocompleteController> controller_;
+ // Are we currently in Classify? Used to verify Classify isn't invoked
+ // recursively, since this can corrupt state and cause crashes.
+ bool inside_classify_;
+
DISALLOW_IMPLICIT_CONSTRUCTORS(AutocompleteClassifier);
};