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

Unified Diff: chrome/browser/favicon/favicon_handler_unittest.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_handler.cc ('k') | chrome/browser/favicon/favicon_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/favicon/favicon_handler_unittest.cc
diff --git a/chrome/browser/favicon/favicon_handler_unittest.cc b/chrome/browser/favicon/favicon_handler_unittest.cc
index 33e5c6c918d2141b870df7fb3161efeef3565fb5..f31c6cc9728659012005cab6ae4fea2f36f23c05 100644
--- a/chrome/browser/favicon/favicon_handler_unittest.cc
+++ b/chrome/browser/favicon/favicon_handler_unittest.cc
@@ -300,12 +300,15 @@ class TestFaviconHandler : public FaviconHandler {
return download_id_;
}
- virtual void SetHistoryFavicon(const GURL& page_url,
- const GURL& icon_url,
- const std::vector<unsigned char>& bitmap_data,
- history::IconType icon_type) OVERRIDE {
+ virtual void SetHistoryFavicons(const GURL& page_url,
+ const GURL& icon_url,
+ history::IconType icon_type,
+ const gfx::Image& image) OVERRIDE {
+ std::vector<unsigned char> bitmap_data;
+ if (!image.IsEmpty())
+ bitmap_data = *image.ToImagePNG();
history_handler_.reset(new HistoryRequestHandler(
- page_url, icon_url,icon_type, bitmap_data,
+ page_url, icon_url, icon_type, bitmap_data,
FaviconService::FaviconResultsCallback()));
}
« no previous file with comments | « chrome/browser/favicon/favicon_handler.cc ('k') | chrome/browser/favicon/favicon_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698