ui/gfx/image/image.cc - Issue 10933083: Remove deprecated gfx::Image::operator NSImage*().

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.cc

Issue 10933083: Remove deprecated gfx::Image::operator NSImage*(). (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Comments and merge Created 8 years, 3 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.cc

diff --git a/ui/gfx/image/image.cc b/ui/gfx/image/image.cc

index 3efeade90b5bf99df1c951ac49e9affe2b96acdf..0d2b9bfaee0182930940c8ccb1e62b6aded8b0d9 100644

--- a/ui/gfx/image/image.cc

+++ b/ui/gfx/image/image.cc

@@ -654,12 +654,6 @@ NSImage* Image::CopyNSImage() const {

}

#endif

-#if defined(OS_MACOSX) && !defined(OS_IOS)

-Image::operator NSImage*() const {

- return ToNSImage();

-#endif

bool Image::HasRepresentation(RepresentationType type) const {

return storage_.get() && storage_->representations().count(type) != 0;

}

« no previous file with comments | « ui/gfx/image/image.h ('k') | ui/gfx/image/image_mac_unittest.mm » ('j') | no next file with comments »