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

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

Issue 11746010: Cleanup history favicon code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | « no previous file | chrome/browser/favicon/favicon_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 019e3db01bffe90669026077732dfd6e1167c931..35b679a520e6bcf7df99c58e3ef49e8b5a2e976c 100644
--- a/chrome/browser/extensions/extension_web_ui.cc
+++ b/chrome/browser/extensions/extension_web_ui.cc
@@ -87,7 +87,6 @@ void RunFaviconCallbackAsync(
const gfx::Image& image) {
std::vector<history::FaviconBitmapResult>* favicon_bitmap_results =
new std::vector<history::FaviconBitmapResult>();
- history::IconURLSizesMap* icon_url_sizes = new history::IconURLSizesMap();
const std::vector<gfx::ImageSkiaRep>& image_reps =
image.AsImageSkia().image_reps();
@@ -111,23 +110,11 @@ void RunFaviconCallbackAsync(
}
}
- // Populate IconURLSizesMap such that all the icon URLs in
- // |favicon_bitmap_results| are present in |icon_url_sizes|.
- // Populate the favicon sizes with the relevant pixel sizes in the
- // extension's icon set.
- for (size_t i = 0; i < favicon_bitmap_results->size(); ++i) {
- const history::FaviconBitmapResult& bitmap_result =
- (*favicon_bitmap_results)[i];
- const GURL& icon_url = bitmap_result.icon_url;
- (*icon_url_sizes)[icon_url].push_back(bitmap_result.pixel_size);
- }
-
base::MessageLoopProxy::current()->PostTask(
FROM_HERE,
base::Bind(&FaviconService::FaviconResultsCallbackRunner,
callback,
- base::Owned(favicon_bitmap_results),
- base::Owned(icon_url_sizes)));
+ base::Owned(favicon_bitmap_results)));
}
} // namespace
« no previous file with comments | « no previous file | chrome/browser/favicon/favicon_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698