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

Unified Diff: chrome/browser/extensions/extension_web_ui.cc

Issue 6651014: Applied the IconType. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Addressed the comments 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/extensions/extension_web_ui.cc
diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc
index e2db5135e8a853e82aa27dd7a500ebc2589993e5..5acc6e619144af698fa9b28fc45282d751ac15d9 100644
--- a/chrome/browser/extensions/extension_web_ui.cc
+++ b/chrome/browser/extensions/extension_web_ui.cc
@@ -103,10 +103,13 @@ class ExtensionWebUIImageLoadingTracker : public ImageLoadingTracker::Observer {
// |icon_data| may be backed by NULL. Once the result has been forwarded the
// instance is deleted.
void ForwardResult(scoped_refptr<RefCountedMemory> icon_data) {
- bool know_icon = icon_data.get() != NULL && icon_data->size() > 0;
+ history::FaviconData favicon;
+ favicon.known_icon = icon_data.get() != NULL && icon_data->size() > 0;
+ favicon.image_data = icon_data;
+ favicon.icon_type = history::FAV_ICON;
request_->ForwardResultAsync(
FaviconService::FaviconDataCallback::TupleType(request_->handle(),
- know_icon, icon_data, false, GURL()));
+ favicon));
delete this;
}

Powered by Google App Engine
This is Rietveld 408576698