Bug 210043 - Expose 'Copy Image' UI on mac. r=mconnor a=asa

browser/base/Makefile.in

@@ -63,3 +63,7 @@ libs locale::
 install::
 	$(INSTALL) $(srcdir)/content/browserconfig.properties $(DESTDIR)$(mozappdir)
 endif
+
+ifneq (,$(filter windows mac cocoa, $(MOZ_WIDGET_TOOLKIT)))
+DEFINES += -DCONTEXT_COPY_IMAGE_CONTENTS=1
+endif

browser/base/content/browser-context.inc

@@ -74,13 +74,11 @@
                 accesskey="&viewImageCmd.accesskey;"
                 oncommand="gContextMenu.viewImage(event);"
                 onclick="checkForMiddleClick(this, event);"/>
-#ifndef XP_UNIX
-#ifndef XP_OS2
+#ifdef CONTEXT_COPY_IMAGE_CONTENTS
       <menuitem id="context-copyimage-contents"
                 label="&copyImageContentsCmd.label;"
                 accesskey="&copyImageContentsCmd.accesskey;"
                 command="cmd_copyImageContents"/>
-#endif
 #endif
       <menuitem id="context-copyimage"
                 label="&copyImageCmd.label;"

browser/base/content/browser.js

@@ -3934,11 +3934,9 @@ nsContextMenu.prototype = {
         this.showItem( "context-copylink", this.onLink );
         this.showItem( "context-sep-copylink", this.onLink && this.onImage);
 
-#ifndef XP_UNIX
-#ifndef XP_OS2
+#ifdef CONTEXT_COPY_IMAGE_CONTENTS
         // Copy image contents depends on whether we're on an image.
         this.showItem( "context-copyimage-contents", this.onImage );
-#endif
 #endif
         // Copy image location depends on whether we're on an image.
         this.showItem( "context-copyimage", this.onImage );