Chromium Code Reviews| Index: chrome/browser/ui/webui/favicon_source.cc |
| diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc |
| index 8461a417c78bfbd228e1f8cd4017bf8985277698..16758c2c7cff1e836562f3318f997a295dffe3b8 100644 |
| --- a/chrome/browser/ui/webui/favicon_source.cc |
| +++ b/chrome/browser/ui/webui/favicon_source.cc |
| @@ -33,11 +33,13 @@ void FavIconSource::StartDataRequest(const std::string& path, |
| if (path.size() > 8 && path.substr(0, 8) == "iconurl/") { |
| handle = favicon_service->GetFavicon( |
| GURL(path.substr(8)), |
| + history::FAV_ICON, |
| &cancelable_consumer_, |
| NewCallback(this, &FavIconSource::OnFavIconDataAvailable)); |
| } else { |
| handle = favicon_service->GetFaviconForURL( |
| GURL(path), |
| + history::FAV_ICON, |
| &cancelable_consumer_, |
| NewCallback(this, &FavIconSource::OnFavIconDataAvailable)); |
| } |
| @@ -65,7 +67,8 @@ void FavIconSource::OnFavIconDataAvailable( |
| bool know_favicon, |
| scoped_refptr<RefCountedMemory> data, |
| bool expired, |
| - GURL icon_url) { |
| + GURL icon_url, |
| + history::IconType) { |
|
sky
2011/03/09 21:41:08
name
michaelbai
2011/03/09 23:11:45
Done.
|
| FaviconService* favicon_service = |
| profile_->GetFaviconService(Profile::EXPLICIT_ACCESS); |
| int request_id = cancelable_consumer_.GetClientData(favicon_service, |