Enable users of NotificationUIManager to specify binary images.

chrome/browser/notifications/notification.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/notifications/notification.h"
 
 #include "chrome/browser/notifications/desktop_notification_service.h"
 
 Notification::Notification(const GURL& origin_url,
                            const GURL& content_url,
                            const string16& display_source,
                            const string16& replace_id,
                            NotificationDelegate* delegate)
     : type_(message_center::NOTIFICATION_TYPE_SIMPLE),
       origin_url_(origin_url),
       is_html_(true),
       content_url_(content_url),
       display_source_(display_source),
       replace_id_(replace_id),
+      has_rich_notification_(false),
       delegate_(delegate) {}
 
 Notification::Notification(const GURL& origin_url,
                            const GURL& icon_url,
                            const string16& title,
                            const string16& body,
                            WebKit::WebTextDirection dir,
                            const string16& display_source,
                            const string16& replace_id,
                            NotificationDelegate* delegate)
     : type_(message_center::NOTIFICATION_TYPE_SIMPLE),
       origin_url_(origin_url),
       icon_url_(icon_url),
       is_html_(false),
       title_(title),
       body_(body),
       display_source_(display_source),
       replace_id_(replace_id),
+      has_rich_notification_(false),
       delegate_(delegate) {
   // "Upconvert" the string parameters to a data: URL.
   content_url_ = GURL(DesktopNotificationService::CreateDataUrl(
       icon_url, title, body, dir));
 }
 
 Notification::Notification(message_center::NotificationType type,
                            const GURL& origin_url,
                            const GURL& icon_url,
                            const string16& title,
                            const string16& body,
                            WebKit::WebTextDirection dir,
                            const string16& display_source,
                            const string16& replace_id,
                            const DictionaryValue* optional_fields,
                            NotificationDelegate* delegate)
     : type_(type),
       origin_url_(origin_url),
       icon_url_(icon_url),
       is_html_(false),
       title_(title),
       body_(body),
       display_source_(display_source),
       replace_id_(replace_id),
       optional_fields_(NULL),
+      has_rich_notification_(false),
       delegate_(delegate) {
   if (optional_fields)
     optional_fields_.reset(optional_fields->DeepCopy());
   // "Upconvert" the string parameters to a data: URL.  Some balloon views
   // require content URL to render anything, so this serves as a backup.
   content_url_ = GURL(DesktopNotificationService::CreateDataUrl(
       icon_url, title, body, dir));
 }
 
+Notification::Notification(
+    message_center::NotificationType type,
+    const GURL& origin_url,
+    const string16& title,
+    const string16& body,
+    WebKit::WebTextDirection dir,
+    const string16& display_source,
+    const string16& replace_id,
+    const message_center::RichNotificationData& rich_notification_data,
+    NotificationDelegate* delegate)
+    : type_(type),
+      origin_url_(origin_url),
+      is_html_(false),
+      title_(title),
+      body_(body),
+      display_source_(display_source),
+      replace_id_(replace_id),
+      has_rich_notification_(true),
+      rich_notification_data_(rich_notification_data),
+      delegate_(delegate) {}
+
 Notification::Notification(const GURL& origin_url,
                            const gfx::Image& icon,
                            const string16& title,
                            const string16& body,
                            WebKit::WebTextDirection dir,
                            const string16& display_source,
                            const string16& replace_id,
                            NotificationDelegate* delegate)
     : type_(message_center::NOTIFICATION_TYPE_SIMPLE),
       origin_url_(origin_url),
       icon_(icon),
       is_html_(false),
       title_(title),
       body_(body),
       display_source_(display_source),
       replace_id_(replace_id),
+      has_rich_notification_(false),
       delegate_(delegate) {}
 
 Notification::Notification(const Notification& notification)
     : type_(notification.type()),
       origin_url_(notification.origin_url()),
       icon_(notification.icon()),
       icon_url_(notification.icon_url()),
       is_html_(notification.is_html()),
       content_url_(notification.content_url()),
       title_(notification.title()),
       body_(notification.body()),
       display_source_(notification.display_source()),
       replace_id_(notification.replace_id()),
+      has_rich_notification_(notification.has_rich_notification()),
+      rich_notification_data_(notification.rich_notification_data()),
       delegate_(notification.delegate()) {
   if (notification.optional_fields())
     optional_fields_.reset(notification.optional_fields()->DeepCopy());
 }
 
 Notification::~Notification() {}
 
 Notification& Notification::operator=(const Notification& notification) {
   type_ = notification.type();
   origin_url_ = notification.origin_url();
@@ skipping 11 matching lines @@
     optional_fields_.reset();
   delegate_ = notification.delegate();
   return *this;
 }
 
 void Notification::DisableTimeout() {
   if (!optional_fields_.get())
     optional_fields_.reset(new base::DictionaryValue());
   optional_fields_->SetBoolean(message_center::kPrivateNeverTimeoutKey, true);
 }