diff options
| author | suzhe@google.com <suzhe@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 17:41:48 +0000 |
|---|---|---|
| committer | suzhe@google.com <suzhe@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 17:41:48 +0000 |
| commit | 4fc461e6d44eeb5aebe18128849fedacedc13525 (patch) | |
| tree | e32aa16acc1f14ecac9ff8418163fdf56bc20a06 /chrome/browser/search_engines | |
| parent | 29d20e19b864492a2d7546793c262ef20dfa096c (diff) | |
| download | chromium_src-4fc461e6d44eeb5aebe18128849fedacedc13525.zip chromium_src-4fc461e6d44eeb5aebe18128849fedacedc13525.tar.gz chromium_src-4fc461e6d44eeb5aebe18128849fedacedc13525.tar.bz2 | |
Fix a DCHECK failure in AutocompleteEditModel::OnPopupDataChanged()
BUG=70343
TEST=See bug reports.
Review URL: http://codereview.chromium.org/6340012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72648 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/search_engines')
| -rw-r--r-- | chrome/browser/search_engines/template_url_model.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/search_engines/template_url_model.h b/chrome/browser/search_engines/template_url_model.h index 504e79f..b25da9b 100644 --- a/chrome/browser/search_engines/template_url_model.h +++ b/chrome/browser/search_engines/template_url_model.h @@ -59,6 +59,7 @@ class TemplateURLModel : public WebDataServiceConsumer, public NotificationObserver { public: typedef std::map<std::string, std::string> QueryTerms; + typedef std::vector<const TemplateURL*> TemplateURLVector; // Struct used for initializing the data store with fake data. // Each initializer is mapped to a TemplateURL. @@ -157,7 +158,7 @@ class TemplateURLModel : public WebDataServiceConsumer, // Returns the set of URLs describing the keywords. The elements are owned // by TemplateURLModel and should not be deleted. - std::vector<const TemplateURL*> GetTemplateURLs() const; + TemplateURLVector GetTemplateURLs() const; // Increment the usage count of a keyword. // Called when a URL is loaded that was generated from a keyword. @@ -258,7 +259,6 @@ class TemplateURLModel : public WebDataServiceConsumer, friend class TemplateURLModelTestUtil; typedef std::map<string16, const TemplateURL*> KeywordToTemplateMap; - typedef std::vector<const TemplateURL*> TemplateURLVector; // Helper functor for FindMatchingKeywords(), for finding the range of // keywords which begin with a prefix. |