Use NotificationResources instead of a bare SkBitmap.

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"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
@@ skipping 13 matching lines @@
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/url_formatter/url_formatter.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/desktop_notification_delegate.h"
 #include "content/public/browser/notification_event_dispatcher.h"
 #include "content/public/browser/platform_notification_context.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/user_metrics.h"
+#include "content/public/common/notification_resources.h"
 #include "content/public/common/platform_notification_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/message_center/notification_types.h"
 #include "ui/message_center/notifier_settings.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "url/url_constants.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/notifications/notifier_state_tracker.h"
@@ skipping 280 matching lines @@
     return blink::WebNotificationPermissionAllowed;
   if (setting == CONTENT_SETTING_BLOCK)
     return blink::WebNotificationPermissionDenied;
 
   return blink::WebNotificationPermissionDefault;
 }
 
 void PlatformNotificationServiceImpl::DisplayNotification(
     BrowserContext* browser_context,
     const GURL& origin,
-    const SkBitmap& icon,
     const content::PlatformNotificationData& notification_data,
+    const content::NotificationResources& notification_resources,
     scoped_ptr<content::DesktopNotificationDelegate> delegate,
     base::Closure* cancel_callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   Profile* profile = Profile::FromBrowserContext(browser_context);
   DCHECK(profile);
   DCHECK_EQ(0u, notification_data.actions.size());
 
   NotificationObjectProxy* proxy =
       new NotificationObjectProxy(browser_context, std::move(delegate));
   Notification notification = CreateNotificationFromData(
-      profile, origin, icon, notification_data, proxy);
+      profile, origin, notification_data, notification_resources, proxy);
 
   GetNotificationUIManager()->Add(notification, profile);
   if (cancel_callback)
     *cancel_callback =
         base::Bind(&CancelNotification,
                    notification.delegate_id(),
                    NotificationUIManager::GetProfileID(profile));
 
   HostContentSettingsMapFactory::GetForProfile(profile)->UpdateLastUsage(
       origin, origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
 }
 
 void PlatformNotificationServiceImpl::DisplayPersistentNotification(
     BrowserContext* browser_context,
     int64_t persistent_notification_id,
     const GURL& origin,
-    const SkBitmap& icon,
-    const content::PlatformNotificationData& notification_data) {
+    const content::PlatformNotificationData& notification_data,
+    const content::NotificationResources& notification_resources) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   Profile* profile = Profile::FromBrowserContext(browser_context);
   DCHECK(profile);
 
   // The notification settings button will be appended after the developer-
   // supplied buttons, available in |notification_data.actions|.
   int settings_button_index = notification_data.actions.size();
   PersistentNotificationDelegate* delegate = new PersistentNotificationDelegate(
       browser_context, persistent_notification_id, origin,
       settings_button_index);
 
   Notification notification = CreateNotificationFromData(
-      profile, origin, icon, notification_data, delegate);
+      profile, origin, notification_data, notification_resources, delegate);
 
   // TODO(peter): Remove this mapping when we have reliable id generation for
   // the message_center::Notification objects.
   persistent_notifications_[persistent_notification_id] = notification.id();
 
   GetNotificationUIManager()->Add(notification, profile);
   content::RecordAction(
       base::UserMetricsAction("Notifications.Persistent.Shown"));
 
   HostContentSettingsMapFactory::GetForProfile(profile)->UpdateLastUsage(
@@ skipping 57 matching lines @@
 #else
   // Android cannot reliably return the notifications that are currently being
   // displayed on the platform, see the comment in NotificationUIManagerAndroid.
   return false;
 #endif  // !defined(OS_ANDROID)
 }
 
 Notification PlatformNotificationServiceImpl::CreateNotificationFromData(
     Profile* profile,
     const GURL& origin,
-    const SkBitmap& icon,
     const content::PlatformNotificationData& notification_data,
+    const content::NotificationResources& notification_resources,
     NotificationDelegate* delegate) const {
   // TODO(peter): Icons for Web Notifications are currently always requested for
   // 1x scale, whereas the displays on which they can be displayed can have a
   // different pixel density. Be smarter about this when the API gets updated
   // with a way for developers to specify images of different resolutions.
   Notification notification(
       message_center::NOTIFICATION_TYPE_SIMPLE, notification_data.title,
-      notification_data.body, gfx::Image::CreateFrom1xBitmap(icon),
+      notification_data.body,
+      gfx::Image::CreateFrom1xBitmap(notification_resources.notification_icon),
       message_center::NotifierId(origin), base::UTF8ToUTF16(origin.host()),
       origin, notification_data.tag, message_center::RichNotificationData(),
       delegate);
 
   notification.set_context_message(
       DisplayNameForContextMessage(profile, origin));
   notification.set_vibration_pattern(notification_data.vibration_pattern);
   notification.set_silent(notification_data.silent);
 
   std::vector<message_center::ButtonInfo> buttons;
@@ skipping 62 matching lines @@
         extensions::ExtensionRegistry::Get(profile)->GetExtensionById(
             origin.host(), extensions::ExtensionRegistry::EVERYTHING);
     DCHECK(extension);
 
     return base::UTF8ToUTF16(extension->name());
   }
 #endif
 
   return base::string16();
 }