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

Unified Diff: chrome/browser/chrome_content_browser_client.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/chrome_content_browser_client.h ('k') | chrome/browser/task_manager/task_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index c33f1b132889e8117409443c36f34a464b792099..796c40bc317938c1497f7b7cc2e78bd0b31bf330 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1743,9 +1743,9 @@ std::string ChromeContentBrowserClient::GetAcceptLangs(
return profile->GetPrefs()->GetString(prefs::kAcceptLanguages);
}
-gfx::ImageSkia* ChromeContentBrowserClient::GetDefaultFavicon() {
+const gfx::ImageSkia* ChromeContentBrowserClient::GetDefaultFavicon() {
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- return rb.GetImageSkiaNamed(IDR_DEFAULT_FAVICON);
+ return rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON).ToImageSkia();
}
bool ChromeContentBrowserClient::AllowAppCache(
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/task_manager/task_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698