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

Unified Diff: content/browser/webui/web_ui_factory.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: content/browser/webui/web_ui_factory.cc
diff --git a/content/browser/webui/web_ui_factory.cc b/content/browser/webui/web_ui_factory.cc
index 25b76e6b488e26e0e329057bc0d3e9babd4009e9..f8685faf4889f837cd7688ba27df36ca4e78e072 100644
--- a/content/browser/webui/web_ui_factory.cc
+++ b/content/browser/webui/web_ui_factory.cc
@@ -284,12 +284,14 @@ void WebUIFactory::GetFaviconForURL(Profile* profile,
page_url.host() != extension_misc::kBookmarkManagerId) {
ExtensionWebUI::GetFaviconForURL(profile, request, page_url);
} else {
- scoped_refptr<RefCountedMemory> icon_data(
+ history::FaviconData favicon;
+ favicon.image_data = scoped_refptr<RefCountedMemory>(
WebUIFactory::GetFaviconResourceBytes(profile, page_url));
- bool know_icon = icon_data.get() != NULL && icon_data->size() > 0;
+ favicon.known_icon = favicon.image_data.get() != NULL &&
+ favicon.image_data->size() > 0;
request->ForwardResultAsync(
FaviconService::FaviconDataCallback::TupleType(request->handle(),
- know_icon, icon_data, false, GURL()));
+ favicon));
}
}
« chrome/browser/bookmarks/bookmark_model.cc ('K') | « content/browser/tab_contents/tab_contents.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698