Add appIconMask to notification API

chrome/browser/extensions/api/notifications/notifications_api.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/extensions/api/notifications/notifications_api.h"
 
 #include "base/callback.h"
 #include "base/guid.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 270 matching lines @@
   if (!NotificationBitmapToGfxImage(image_scale,
                                     bitmap_sizes.icon_size,
                                     options->icon_bitmap.get(),
                                     &icon)) {
     SetError(kUnableToDecodeIconError);
     return false;
   }
 
   // Then, handle any optional data that's been provided.
   message_center::RichNotificationData optional_fields;
+  if (options->small_icon_url.get()) {
+    NotificationBitmapToGfxImage(image_scale,

[dewittj, 2014/06/09 21:30:58]

We should handle the case where this returns false by providing an error message
just like the one above:

if (!NotificationBitmapToGfxImage(...))
  SetError(...)

[liyanhou, 2014/06/16 16:56:59]

Done.

+                                 bitmap_sizes.small_icon_size,
+                                 options->small_icon_bitmap.get(),
+                                 &optional_fields.small_image);
+  }
+
   if (options->priority.get())
     optional_fields.priority = *options->priority;
 
   if (options->event_time.get())
     optional_fields.timestamp = base::Time::FromJsTime(*options->event_time);
 
   if (options->buttons.get()) {
     // Currently we allow up to 2 buttons.
     size_t number_of_buttons = options->buttons->size();
     number_of_buttons = number_of_buttons > 2 ? 2 : number_of_buttons;
@@ skipping 97 matching lines @@
     notification->set_message(base::UTF8ToUTF16(*options->message));
 
   // TODO(dewittj): Return error if this fails.
   if (options->icon_bitmap) {
     gfx::Image icon;
     NotificationBitmapToGfxImage(
         image_scale, bitmap_sizes.icon_size, options->icon_bitmap.get(), &icon);
     notification->set_icon(icon);
   }
 
+  gfx::Image small_icon;
+  if (NotificationBitmapToGfxImage(image_scale,
+                                   bitmap_sizes.small_icon_size,
+                                   options->small_icon_bitmap.get(),
+                                   &small_icon)) {
+    notification->set_small_image(small_icon);
+  }
+
   if (options->priority)
     notification->set_priority(*options->priority);
 
   if (options->event_time)
     notification->set_timestamp(base::Time::FromJsTime(*options->event_time));
 
   if (options->buttons) {
     // Currently we allow up to 2 buttons.
     size_t number_of_buttons = options->buttons->size();
     number_of_buttons = number_of_buttons > 2 ? 2 : number_of_buttons;
@@ skipping 251 matching lines @@
           ? api::notifications::PERMISSION_LEVEL_GRANTED
           : api::notifications::PERMISSION_LEVEL_DENIED;
 
   SetResult(new base::StringValue(api::notifications::ToString(result)));
   SendResponse(true);
 
   return true;
 }
 
 }  // namespace extensions