chrome/browser/ui/cocoa/task_manager_mac.mm - Issue 10453101: Convert most of the rest of chrome to ImageSkia

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/cocoa/task_manager_mac.mm

Issue 10453101: Convert most of the rest of chrome to ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 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:

Index: chrome/browser/ui/cocoa/task_manager_mac.mm

diff --git a/chrome/browser/ui/cocoa/task_manager_mac.mm b/chrome/browser/ui/cocoa/task_manager_mac.mm

index cc31e27e1b1515154e406e41146275af2d16c614..94d3d3d323bbe695cac385ff7dd340140ff79ae0 100644

--- a/chrome/browser/ui/cocoa/task_manager_mac.mm

+++ b/chrome/browser/ui/cocoa/task_manager_mac.mm

@@ -16,6 +16,7 @@

#include "grit/generated_resources.h"

#include "third_party/skia/include/core/SkBitmap.h"

#include "ui/base/l10n/l10n_util_mac.h"

+#include "ui/gfx/image/image_skia.h"

namespace {

@@ -624,7 +625,7 @@ int TaskManagerMac::RowCount() const {

return model_->ResourceCount();

}

-SkBitmap TaskManagerMac::GetIcon(int r) const {

+gfx::ImageSkia TaskManagerMac::GetIcon(int r) const {

return model_->GetResourceIcon(r);

}