Add Notification images (Blink + desktop implementation)

chrome/browser/notifications/platform_notification_service_impl.cc

 // Copyright 2014 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/notifications/platform_notification_service_impl.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 441 matching lines @@
       delegate);
 
   notification.set_service_worker_scope(service_worker_scope);
   notification.set_context_message(
       DisplayNameForContextMessage(profile, origin));
   notification.set_vibration_pattern(notification_data.vibration_pattern);
   notification.set_timestamp(notification_data.timestamp);
   notification.set_renotify(notification_data.renotify);
   notification.set_silent(notification_data.silent);
 
+  // TODO(johnme): ensure image is not loaded when it will not be used.

[Peter Beverloo, 2016/08/22 20:11:07]

I get why you have this TODO here, but this really isn't the best place for it—
it's effectively invisible. Let's not have it here? Consider adding it to
NotificationResourcesLoader.cpp instead.

[johnme, 2016/08/23 14:59:49]

Done. Moved the badge one too.

+  if (!notification_resources.image.drawsNothing()) {
+    notification.set_type(message_center::NOTIFICATION_TYPE_IMAGE);
+    notification.set_image(
+        gfx::Image::CreateFrom1xBitmap(notification_resources.image));
+  }
+
   // Badges are only supported on Android, primarily because it's the only
   // platform that makes good use of them in the status bar.
   // TODO(mvanouwerkerk): ensure no badge is loaded when it will not be used.
 #if defined(OS_ANDROID)
   // TODO(peter): Handle different screen densities instead of always using the
   // 1x bitmap - crbug.com/585815.
   notification.set_small_image(
       gfx::Image::CreateFrom1xBitmap(notification_resources.badge));
 #endif  // defined(OS_ANDROID)
 
@@ skipping 41 matching lines @@
   }
 #endif
 
   return base::string16();
 }
 
 void PlatformNotificationServiceImpl::SetNotificationDisplayServiceForTesting(
     NotificationDisplayService* display_service) {
   test_display_service_ = display_service;
 }