chrome/browser/task_manager/task_manager.cc - Issue 333493002: Load the default favicon as a native image, rather than as a Skia image.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/task_manager/task_manager.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.cc ('k') | chrome/browser/ui/search_engines/template_url_table_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/task_manager/task_manager.cc

diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc

index 25f80ea048163d2dbd89185381278c1db34ea9a8..71e3bf842c6a52b7f09ae8f47f01ac137acd257e 100644

--- a/chrome/browser/task_manager/task_manager.cc

+++ b/chrome/browser/task_manager/task_manager.cc

@@ -742,8 +742,9 @@ gfx::ImageSkia TaskManagerModel::GetResourceIcon(int index) const {

if (!icon.isNull())

return icon;

- static gfx::ImageSkia* default_icon = ResourceBundle::GetSharedInstance().

- GetImageSkiaNamed(IDR_DEFAULT_FAVICON);

+ static const gfx::ImageSkia* default_icon =

+ ResourceBundle::GetSharedInstance().

+ GetNativeImageNamed(IDR_DEFAULT_FAVICON).ToImageSkia();

return *default_icon;

}

« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/ui/search_engines/template_url_table_model.cc » ('j') | no next file with comments »