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

Unified Diff: chrome/browser/browsing_data/cookies_tree_model.cc

Issue 333493002: Load the default favicon as a native image, rather than as a Skia image. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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/browsing_data/cookies_tree_model.cc
diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc
index 037c48113b3552eb46478c7c717fba1b473a5230..5663eb08e4c68073190507e3061ad637c03b1964 100644
--- a/chrome/browser/browsing_data/cookies_tree_model.cc
+++ b/chrome/browser/browsing_data/cookies_tree_model.cc
@@ -883,12 +883,12 @@ CookiesTreeModel::~CookiesTreeModel() {
// Returns the set of icons for the nodes in the tree. You only need override
// this if you don't want to use the default folder icons.
void CookiesTreeModel::GetIcons(std::vector<gfx::ImageSkia>* icons) {
- icons->push_back(*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
- IDR_DEFAULT_FAVICON));
- icons->push_back(*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
- IDR_COOKIE_ICON));
- icons->push_back(*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
- IDR_COOKIE_STORAGE_ICON));
+ icons->push_back(*ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+ IDR_DEFAULT_FAVICON).ToImageSkia());
+ icons->push_back(*ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+ IDR_COOKIE_ICON).ToImageSkia());
+ icons->push_back(*ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+ IDR_COOKIE_STORAGE_ICON).ToImageSkia());
}
// Returns the index of the icon to use for |node|. Return -1 to use the
« no previous file with comments | « android_webview/browser/aw_content_browser_client.cc ('k') | chrome/browser/chrome_content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698