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

Unified Diff: chrome/browser/instant/instant_loader.cc

Issue 10837090: Change return type of FaviconTabHelper::GetFavicon() to gfx::Image. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 4 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/instant/instant_loader.cc
diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc
index e4f188538bdddffa530e361281a3e99a005e2a9a..41c9c856daa4abdaf84ed53a3b6c399b34c49ead 100644
--- a/chrome/browser/instant/instant_loader.cc
+++ b/chrome/browser/instant/instant_loader.cc
@@ -379,8 +379,8 @@ void InstantLoader::WebContentsDelegateImpl::CommitHistory(
!active_entry->GetFavicon().image.IsEmpty()) {
std::vector<unsigned char> image_data;
// TODO: Add all variants once the history service supports it.
- gfx::PNGCodec::EncodeBGRASkBitmap(active_entry->GetFavicon().AsBitmap(),
- false, &image_data);
+ gfx::PNGCodec::EncodeBGRASkBitmap(
+ active_entry->GetFavicon().image.AsBitmap(), false, &image_data);
favicon_service->SetFavicon(active_entry->GetURL(),
active_entry->GetFavicon().url,
image_data,
« no previous file with comments | « chrome/browser/favicon/favicon_tab_helper.cc ('k') | chrome/browser/task_manager/task_manager_resource_providers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698