diff options
| author | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 17:05:30 +0000 |
|---|---|---|
| committer | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 17:05:30 +0000 |
| commit | 849ccee35b29ff4e6d69766087c0e2d8a2a01004 (patch) | |
| tree | 2d0224faf53752bdda682f78c1a314fcdd2bcf93 /chrome/browser/jumplist_win.cc | |
| parent | a9590c25660d4be4caad2add5e16e08003e5ed39 (diff) | |
| download | chromium_src-849ccee35b29ff4e6d69766087c0e2d8a2a01004.zip chromium_src-849ccee35b29ff4e6d69766087c0e2d8a2a01004.tar.gz chromium_src-849ccee35b29ff4e6d69766087c0e2d8a2a01004.tar.bz2 | |
Populated the IconType in FavIconService.
Changed the FavIconService callback to have the IconType parameter.
Changed the callers to use FAV_ICON as default type
BUG=71571
TEST=Tested with existing unit test
Review URL: http://codereview.chromium.org/6651014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78383 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/jumplist_win.cc')
| -rw-r--r-- | chrome/browser/jumplist_win.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc index 1680120..55e9f44 100644 --- a/chrome/browser/jumplist_win.cc +++ b/chrome/browser/jumplist_win.cc @@ -688,7 +688,7 @@ bool JumpList::StartLoadingFavIcon() { FaviconService* favicon_service = profile_->GetFaviconService(Profile::EXPLICIT_ACCESS); FaviconService::Handle handle = favicon_service->GetFaviconForURL( - url, &favicon_consumer_, + url, history::FAVICON, &favicon_consumer_, NewCallback(this, &JumpList::OnFaviconDataAvailable)); return true; } @@ -753,15 +753,12 @@ void JumpList::OnSegmentUsageAvailable( void JumpList::OnFaviconDataAvailable( FaviconService::Handle handle, - bool know_favicon, - scoped_refptr<RefCountedMemory> data, - bool expired, - GURL icon_url) { + history::FaviconData favicon) { // Attach the received data to the ShellLinkItem object. // This data will be decoded by JumpListUpdateTask. - if (know_favicon && data.get() && data->size()) { + if (favicon.is_valid()) { if (!icon_urls_.empty() && icon_urls_.front().second) - icon_urls_.front().second->SetIconData(data); + icon_urls_.front().second->SetIconData(favicon.image_data); } // if we need to load more favicons, we send another query and exit. |