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

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

Issue 10910212: Enable hidpi favicons for favicons history does not know about (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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
« no previous file with comments | « chrome/browser/favicon/favicon_tab_helper.cc ('k') | chrome/browser/sync/glue/bookmark_change_processor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/instant/instant_controller.cc
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc
index 69d2e7d91ffba0a64a1558ed312862de113e54d0..1988aef99268d85d5b6bc79ee115080128ed0cb8 100644
--- a/chrome/browser/instant/instant_controller.cc
+++ b/chrome/browser/instant/instant_controller.cc
@@ -345,14 +345,8 @@ TabContents* InstantController::ReleasePreviewContents(InstantCommitType type) {
preview->profile(), Profile::EXPLICIT_ACCESS);
if (favicon_service && entry->GetFavicon().valid &&
entry->GetFavicon().image.IsEmpty()) {
- std::vector<unsigned char> image_data;
- // TODO: Add all variants once the history service supports it.
- gfx::PNGCodec::EncodeBGRASkBitmap(
- entry->GetFavicon().image.AsBitmap(), false, &image_data);
- favicon_service->SetFavicon(entry->GetURL(),
- entry->GetFavicon().url,
- image_data,
- history::FAVICON);
+ favicon_service->SetFavicons(entry->GetURL(), entry->GetFavicon().url,
+ history::FAVICON, entry->GetFavicon().image);
}
}
« no previous file with comments | « chrome/browser/favicon/favicon_tab_helper.cc ('k') | chrome/browser/sync/glue/bookmark_change_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698