Making icon url for buttons in notification optional.

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 276 matching lines @@
   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;
 
     for (size_t i = 0; i < number_of_buttons; i++) {
       message_center::ButtonInfo info(
           base::UTF8ToUTF16((*options->buttons)[i]->title));
       extensions::api::notifications::NotificationBitmap* icon_bitmap_ptr =
           (*options->buttons)[i]->icon_bitmap.get();
+      // As icon url for button is optional so icon_bitmap_ptr can be null.

[Peter Beverloo, 2015/06/22 13:00:12]

nit: grammer. I personally wouldn't bother with the comment at all.

       if (icon_bitmap_ptr) {
         NotificationConversionHelper::NotificationBitmapToGfxImage(
             image_scale, bitmap_sizes.button_icon_size, *icon_bitmap_ptr,
             &info.icon);
-        optional_fields.buttons.push_back(info);
       }
+      optional_fields.buttons.push_back(info);
     }
   }
 
   if (options->context_message) {
     optional_fields.context_message =
         base::UTF8ToUTF16(*options->context_message);
   }
 
   bool has_image = options->image_bitmap.get() &&
                    NotificationConversionHelper::NotificationBitmapToGfxImage(
@@ skipping 110 matching lines @@
     // 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;
 
     std::vector<message_center::ButtonInfo> buttons;
     for (size_t i = 0; i < number_of_buttons; i++) {
       message_center::ButtonInfo button(
           base::UTF8ToUTF16((*options->buttons)[i]->title));
       extensions::api::notifications::NotificationBitmap* icon_bitmap_ptr =
           (*options->buttons)[i]->icon_bitmap.get();
+      // As icon url for button is optional so icon_bitmap_ptr can be null.
       if (icon_bitmap_ptr) {
         NotificationConversionHelper::NotificationBitmapToGfxImage(
             image_scale, bitmap_sizes.button_icon_size, *icon_bitmap_ptr,
             &button.icon);
-        buttons.push_back(button);
       }
+      buttons.push_back(button);
     }
     notification->set_buttons(buttons);
   }
 
   if (options->context_message) {
     notification->set_context_message(
         base::UTF8ToUTF16(*options->context_message));
   }
 
   gfx::Image image;
@@ skipping 234 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