chrome/browser/ui/gtk/task_manager_gtk.cc - Issue 10860004: image-skia: Remove implicit conversion to SkBitmap on linux and chromeos.

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/ui/gtk/task_manager_gtk.cc

Issue 10860004: image-skia: Remove implicit conversion to SkBitmap on linux and chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 4 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/ui/gtk/speech_recognition_bubble_gtk.cc ('k') | content/browser/web_contents/web_contents_drag_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/gtk/task_manager_gtk.cc

diff --git a/chrome/browser/ui/gtk/task_manager_gtk.cc b/chrome/browser/ui/gtk/task_manager_gtk.cc

index 7a9334140004749cf0c1e8a137f692646a029f4b..6538b97f9ad40c76c960a92e6d33121042109eed 100644

--- a/chrome/browser/ui/gtk/task_manager_gtk.cc

+++ b/chrome/browser/ui/gtk/task_manager_gtk.cc

@@ -732,7 +732,7 @@ std::string TaskManagerGtk::GetModelText(int row, int col_id) {

}

GdkPixbuf* TaskManagerGtk::GetModelIcon(int row) {

- SkBitmap icon = model_->GetResourceIcon(row);

+ SkBitmap icon = *model_->GetResourceIcon(row).bitmap();

if (icon.pixelRef() ==

ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(

IDR_DEFAULT_FAVICON)->pixelRef()) {

« no previous file with comments | « chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc ('k') | content/browser/web_contents/web_contents_drag_win.cc » ('j') | no next file with comments »