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

Unified Diff: chrome/browser/ui/search_engines/template_url_table_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
« no previous file with comments | « chrome/browser/task_manager/task_manager.cc ('k') | content/public/browser/content_browser_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/search_engines/template_url_table_model.cc
diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc
index e7058f7169f2cce1a04a67b7c0193c79750baa79..40b2dd9af7a924d13e99742dd1d8fec0c173e49c 100644
--- a/chrome/browser/ui/search_engines/template_url_table_model.cc
+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
@@ -36,7 +36,7 @@ static const int kExtensionGroupID = 2;
// ModelEntry also tracks state information about the URL.
// Icon used while loading, or if a specific favicon can't be found.
-static gfx::ImageSkia* default_icon = NULL;
+static const gfx::ImageSkia* default_icon = NULL;
class ModelEntry {
public:
@@ -46,7 +46,7 @@ class ModelEntry {
model_(model) {
if (!default_icon) {
default_icon = ResourceBundle::GetSharedInstance().
- GetImageSkiaNamed(IDR_DEFAULT_FAVICON);
+ GetNativeImageNamed(IDR_DEFAULT_FAVICON).ToImageSkia();
}
}
« no previous file with comments | « chrome/browser/task_manager/task_manager.cc ('k') | content/public/browser/content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698