Enable users of NotificationUIManager to specify binary images.

chrome/browser/notifications/message_center_notification_manager.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/message_center_notification_manager.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/notifications/message_center_settings_controller.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/message_center_tray.h"
 #include "ui/message_center/notifier_settings.h"
 
 MessageCenterNotificationManager::MessageCenterNotificationManager(
     message_center::MessageCenter* message_center)
-  : message_center_(message_center),
-    settings_controller_(new MessageCenterSettingsController) {
+    : message_center_(message_center),
+      settings_controller_(new MessageCenterSettingsController) {
   message_center_->SetDelegate(this);
   message_center_->AddObserver(this);
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
   // On Windows and Mac, the notification manager owns the tray icon and views.
   // Other platforms have global ownership and Create will return NULL.
   tray_.reset(message_center::CreateMessageCenterTray());
 #endif
 }
 
@@ skipping 117 matching lines @@
       DCHECK(message_center_->HasNotification(old_id));
 
       // Add/remove notification in the local list but just update the same
       // one in MessageCenter.
       old_notification->notification().Close(false); // Not by user.
       delete old_notification;
       profile_notifications_.erase(old_id);
       ProfileNotification* new_notification =
           new ProfileNotification(profile, notification, message_center_);
       profile_notifications_[notification.notification_id()] = new_notification;
+
+      // Now pass a copy to message center.
+      scoped_ptr<message_center::Notification> message_center_notification(
+          make_scoped_ptr(new message_center::Notification(notification)));
+      message_center_notification->set_extension_id(
+          new_notification->GetExtensionId());
       message_center_->UpdateNotification(old_id,
-                                          notification.notification_id(),
-                                          notification.title(),
-                                          notification.body(),
-                                          notification.optional_fields(),
-                                          notification.delegate());
+                                          message_center_notification.Pass());
+
       new_notification->StartDownloads();
       return true;
     }
   }
   return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // MessageCenter::Delegate
 
@@ skipping 99 matching lines @@
   StartDownloadWithImage(
       notification,
       &notification.icon(),
       notification.icon_url(),
       message_center::kNotificationIconSize,
       base::Bind(&message_center::MessageCenter::SetNotificationIcon,
                  base::Unretained(message_center_),
                  notification.notification_id()));
 
   // Notification image.
-  StartDownloadByKey(
+  StartDownloadWithImage(
       notification,
-      message_center::kImageUrlKey,
+      NULL,
+      notification.image_url(),
       message_center::kNotificationPreferredImageSize,
       base::Bind(&message_center::MessageCenter::SetNotificationImage,
                  base::Unretained(message_center_),
                  notification.notification_id()));
 
   // Notification button icons.
-  StartDownloadByKey(
+  StartDownloadWithImage(
       notification,
-      message_center::kButtonOneIconUrlKey,
+      NULL,
+      notification.button_one_icon_url(),
       message_center::kNotificationButtonIconSize,
       base::Bind(&message_center::MessageCenter::SetNotificationButtonIcon,
                  base::Unretained(message_center_),
-                 notification.notification_id(), 0));
-  StartDownloadByKey(
-      notification, message_center::kButtonTwoIconUrlKey,
+                 notification.notification_id(),
+                 0));
+  StartDownloadWithImage(
+      notification,
+      NULL,
+      notification.button_two_icon_url(),
       message_center::kNotificationButtonIconSize,
       base::Bind(&message_center::MessageCenter::SetNotificationButtonIcon,
                  base::Unretained(message_center_),
-                 notification.notification_id(), 1));
+                 notification.notification_id(),
+                 1));
 
   // This should tell the observer we're done if everything was synchronous.
   PendingDownloadCompleted();
 }
 
 void MessageCenterNotificationManager::ImageDownloads::StartDownloadWithImage(
     const Notification& notification,
     const gfx::Image* image,
     const GURL& url,
     int size,
@@ skipping 26 matching lines @@
   contents->DownloadImage(
       url,
       false,
       size,
       base::Bind(
           &MessageCenterNotificationManager::ImageDownloads::DownloadComplete,
           AsWeakPtr(),
           callback));
 }
 
-void MessageCenterNotificationManager::ImageDownloads::StartDownloadByKey(
-    const Notification& notification,
-    const char* key,
-    int size,
-    const SetImageCallback& callback) {
-  const base::DictionaryValue* optional_fields = notification.optional_fields();
-  if (optional_fields && optional_fields->HasKey(key)) {
-    string16 url;
-    optional_fields->GetString(key, &url);
-    StartDownloadWithImage(notification, NULL, GURL(url), size, callback);
-  }
-}
-
 void MessageCenterNotificationManager::ImageDownloads::DownloadComplete(
     const SetImageCallback& callback,
     int download_id,
     int http_status_code,
     const GURL& image_url,
     int requested_size,
     const std::vector<SkBitmap>& bitmaps) {
   PendingDownloadCompleted();
 
   if (bitmaps.empty())
@@ skipping 63 matching lines @@
 // private
 
 void MessageCenterNotificationManager::AddProfileNotification(
     ProfileNotification* profile_notification) {
   const Notification& notification = profile_notification->notification();
   std::string id = notification.notification_id();
   // Notification ids should be unique.
   DCHECK(profile_notifications_.find(id) == profile_notifications_.end());
   profile_notifications_[id] = profile_notification;
 
-  message_center_->AddNotification(notification.type(),
-                                   notification.notification_id(),
-                                   notification.title(),
-                                   notification.body(),
-                                   notification.display_source(),
-                                   profile_notification->GetExtensionId(),
-                                   notification.optional_fields(),
-                                   notification.delegate());
+  // Create the copy for message center, and ensure the extension ID is correct.
+  scoped_ptr<message_center::Notification> message_center_notification(
+      new message_center::Notification(notification));
+  message_center_notification->set_extension_id(
+      profile_notification->GetExtensionId());
+  message_center_->AddNotification(message_center_notification.Pass());
+
   profile_notification->StartDownloads();
 }
 
 void MessageCenterNotificationManager::RemoveProfileNotification(
     ProfileNotification* profile_notification,
     bool by_user) {
   profile_notification->notification().Close(by_user);
   std::string id = profile_notification->notification().notification_id();
   profile_notifications_.erase(id);
   delete profile_notification;
 }
 
 MessageCenterNotificationManager::ProfileNotification*
     MessageCenterNotificationManager::FindProfileNotification(
         const std::string& id) const {
   NotificationMap::const_iterator iter = profile_notifications_.find(id);
   if (iter == profile_notifications_.end())
     return NULL;
 
   return (*iter).second;
 }