Transfer the notification icon through XPC as NSData for OSX 10.09

chrome/browser/ui/cocoa/notifications/notification_builder_mac.mm

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/notifications/notification_builder_mac.h"
 
 #import <AppKit/AppKit.h>
 
+#include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsobject.h"
+
 #include "chrome/browser/ui/cocoa/notifications/notification_constants_mac.h"
 
 namespace {
 
 // Internal builder constants representing the different notification fields
 // They don't need to be exposed outside the builder.
 
 NSString* const kNotificationTitle = @"title";
 NSString* const kNotificationSubTitle = @"subtitle";
 NSString* const kNotificationInformativeText = @"informativeText";
@@ skipping 41 matching lines @@
     [notificationData_ setObject:subTitle forKey:kNotificationSubTitle];
 }
 
 - (void)setContextMessage:(NSString*)contextMessage {
   if (contextMessage.length)
     [notificationData_ setObject:contextMessage
                           forKey:kNotificationInformativeText];
 }
 
 - (void)setIcon:(NSImage*)icon {
-  if (icon)
-    [notificationData_ setObject:icon forKey:kNotificationImage];
+  if (icon) {
+    if (base::mac::IsAtLeastOS10_10()) {

[Robert Sesek, 2017/03/06 16:12:05]

Rather than using base::mac, use [icon
conformsToProtocol:@protocol(NSSecureCoding)]

[Miguel Garcia, 2017/03/06 16:30:42]

So the problem is that down in line 136 I don't have an icon to compare against
so I think I should keep the 10.9 check in there which means (for consistency I
should probably do it here too. Let me know what you think)

[Robert Sesek, 2017/03/06 17:34:59]

You can check the Class too:
https://developer.apple.com/reference/objectivec/nsobject/1418893-conformstop...

+      [notificationData_ setObject:icon forKey:kNotificationImage];
+    } else {  // in 10.09 NSImage does not conform to NSecureCoding

[Robert Sesek, 2017/03/06 16:12:05]

It's just "10.9" -- also use proper punctuation and capitalization.

[Miguel Garcia, 2017/03/06 16:30:42]

Done.

+      [notificationData_ setObject:[icon TIFFRepresentation]
+                            forKey:kNotificationImage];
+    }
+  }
 }
 
 - (void)setButtons:(NSString*)primaryButton
     secondaryButton:(NSString*)secondaryButton {
   DCHECK(primaryButton.length);
   [notificationData_ setObject:primaryButton forKey:kNotificationButtonOne];
   if (secondaryButton.length) {
     [notificationData_ setObject:secondaryButton forKey:kNotificationButtonTwo];
   }
 }
@@ skipping 35 matching lines @@
   base::scoped_nsobject<NSUserNotification> toast(
       [[NSUserNotification alloc] init]);
   [toast setTitle:[notificationData_ objectForKey:kNotificationTitle]];
   [toast setSubtitle:[notificationData_ objectForKey:kNotificationSubTitle]];
   [toast setInformativeText:[notificationData_
                                 objectForKey:kNotificationInformativeText]];
 
   // Icon
   if ([notificationData_ objectForKey:kNotificationImage]) {
     if ([toast respondsToSelector:@selector(_identityImage)]) {
-      NSImage* image = [notificationData_ objectForKey:kNotificationImage];
-      [toast setValue:image forKey:@"_identityImage"];
+      if (base::mac::IsAtLeastOS10_10()) {
+        NSImage* image = [notificationData_ objectForKey:kNotificationImage];
+        [toast setValue:image forKey:@"_identityImage"];
+      } else {  // in 10.09 NSImage does not confirm to NSSecureCoding

[Robert Sesek, 2017/03/06 16:12:05]

Same.

[Miguel Garcia, 2017/03/06 16:30:42]

Done.

+        base::scoped_nsobject<NSImage> image([[NSImage alloc]
+            initWithData:[notificationData_ objectForKey:kNotificationImage]]);
+        [toast setValue:image forKey:@"_identityImage"];
+      }
       [toast setValue:@NO forKey:@"_identityImageHasBorder"];
     }
   }
 
   // Buttons
   if ([toast respondsToSelector:@selector(_showsButtons)]) {
     DCHECK([notificationData_ objectForKey:kNotificationCloseButtonTag]);
     DCHECK([notificationData_ objectForKey:kNotificationSettingsButtonTag]);
     DCHECK([notificationData_ objectForKey:kNotificationOptionsButtonTag]);
 
@@ skipping 77 matching lines @@
   };
 
   return toast.autorelease();
 }
 
 - (NSDictionary*)buildDictionary {
   return [[notificationData_ copy] autorelease];
 }
 
 @end