ui/gfx/image/image_skia.h - Issue 10834382: mac: Remove implicit conversion from ImageSkia to SkBitmap.

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: ui/gfx/image/image_skia.h

Issue 10834382: mac: Remove implicit conversion from ImageSkia to SkBitmap. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: tot-merge 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:

Index: ui/gfx/image/image_skia.h

diff --git a/ui/gfx/image/image_skia.h b/ui/gfx/image/image_skia.h

index 7c729cb95b0205ce960c5a13b2cdf6b3839e8808..259a71e1b246470ecab115f4214ec3778196b60e 100644

--- a/ui/gfx/image/image_skia.h

+++ b/ui/gfx/image/image_skia.h

@@ -60,7 +60,7 @@ class UI_EXPORT ImageSkia {

// done.

ImageSkia& operator=(const SkBitmap& other);

-#if defined(OS_MACOSX) || defined(OS_WIN)

+#if defined(OS_WIN)

// Converts to gfx::ImageSkiaRep and SkBitmap.

// TODO(pkotwicz): This is temporary till conversion to gfx::ImageSkia is

// done.

« no previous file with comments | « skia/ext/skia_utils_mac.mm ('k') | ui/gfx/image/image_skia_unittest.cc » ('j') | no next file with comments »