diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-29 03:07:29 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-29 03:07:29 +0000 |
| commit | 452be197b1bfd23ab71db38cea5655bda0e8cc24 (patch) | |
| tree | 09f9e18096384409b460f0dfe3018000b524ee68 /chrome/browser/possible_url_model.cc | |
| parent | eec396cc0a529c3c1d65221fbe76c73ef84e4759 (diff) | |
| download | chromium_src-452be197b1bfd23ab71db38cea5655bda0e8cc24.zip chromium_src-452be197b1bfd23ab71db38cea5655bda0e8cc24.tar.gz chromium_src-452be197b1bfd23ab71db38cea5655bda0e8cc24.tar.bz2 | |
Fix a crash where we were looking for the fav icon in the wrong service.
This caused the possible url dialog in the options menu to never load favicons, and instead DCHECK (crashing debug builds).
Review URL: http://codereview.chromium.org/179034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24852 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/possible_url_model.cc')
| -rw-r--r-- | chrome/browser/possible_url_model.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/possible_url_model.cc b/chrome/browser/possible_url_model.cc index 520678a..cdf9da1 100644 --- a/chrome/browser/possible_url_model.cc +++ b/chrome/browser/possible_url_model.cc @@ -163,15 +163,15 @@ int PossibleURLModel::CompareValues(int row1, int row2, int column_id) { } void PossibleURLModel::OnFavIconAvailable( - HistoryService::Handle h, + FaviconService::Handle h, bool fav_icon_available, scoped_refptr<RefCountedBytes> data, bool expired, GURL icon_url) { if (profile_) { - HistoryService* hs = - profile_->GetHistoryService(Profile::EXPLICIT_ACCESS); - size_t index = consumer_.GetClientData(hs, h); + FaviconService* favicon_service = + profile_->GetFaviconService(Profile::EXPLICIT_ACCESS); + size_t index = consumer_.GetClientData(favicon_service, h); if (fav_icon_available) { // The decoder will leave our bitmap empty on error. PNGDecoder::Decode(&data->data, &(fav_icon_map_[index])); |