Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6443)

Unified Diff: chrome/browser/jumplist_win.cc

Issue 6651014: Applied the IconType. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: sync Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/jumplist_win.cc
diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc
index 16801205ca88fcb3df643251be094591fce8b4f9..55e9f4454f74459f67fed63a8df63ea598bf4ef4 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.

Powered by Google App Engine
This is Rietveld 408576698