Updated multiple item notification view to match latest mockups

chrome/browser/ui/views/ash/balloon_view_ash.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/ui/views/ash/balloon_view_ash.h"
 
 #include "ash/shell.h"
 #include "ash/system/web_notification/web_notification_tray.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/favicon/favicon_util.h"
 #include "chrome/browser/notifications/balloon_collection.h"
 #include "chrome/browser/notifications/notification.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/message_center/message_center.h"
+#include "ui/message_center/message_center_constants.h"
 #include "webkit/glue/image_resource_fetcher.h"
 
 namespace {
 
 typedef base::Callback<void(const gfx::ImageSkia&)> SetImageCallback;
 
 const int kPrimaryIconImageSize = 64;
 const int kSecondaryIconImageSize = 15;
 
 // static
@@ skipping 118 matching lines @@
 }
 
 gfx::Size BalloonViewAsh::GetSize() const {
   return gfx::Size();
 }
 
 BalloonHost* BalloonViewAsh::GetHost() const {
   return NULL;
 }
 
-void BalloonViewAsh::SetNotificationPrimaryIcon(const std::string& id,
-                                                const gfx::ImageSkia& image) {
+void BalloonViewAsh::SetNotificationIcon(const std::string& id,
+                                         const gfx::ImageSkia& image) {
   GetMessageCenter()->SetNotificationPrimaryIcon(id, image);
 }
 
-void BalloonViewAsh::SetNotificationSecondaryIcon(const std::string& id,
-                                                  const gfx::ImageSkia& image) {
-  GetMessageCenter()->SetNotificationSecondaryIcon(id, image);
-}
-
 void BalloonViewAsh::DownloadImages(const Notification& notification) {
   // Cancel any previous downloads.
   downloads_.clear();
 
   // Set the notification's primary icon, or start a download for it.
   if (!notification.icon().isNull()) {
-    SetNotificationPrimaryIcon(notification_id_, notification.icon());
+    SetNotificationIcon(notification_id_, notification.icon());
   } else if (!notification.icon_url().is_empty()) {
       downloads_.push_back(linked_ptr<ImageDownload>(new ImageDownload(
-          notification, notification.icon_url(), kPrimaryIconImageSize,
-          base::Bind(&BalloonViewAsh::SetNotificationPrimaryIcon,
+          notification, notification.icon_url(),
+          message_center::kNotificationIconWidth,
+          base::Bind(&BalloonViewAsh::SetNotificationIcon,
                      base::Unretained(this), notification.notification_id()))));
   }
-
-  // Start a download for the notification's secondary icon if appropriate.
-  const base::DictionaryValue* optional_fields = notification.optional_fields();
-  if (optional_fields &&
-      optional_fields->HasKey(ui::notifications::kSecondIconUrlKey)) {
-    string16 url;
-    optional_fields->GetString(ui::notifications::kSecondIconUrlKey, &url);
-    if (!url.empty()) {
-      downloads_.push_back(linked_ptr<ImageDownload>(new ImageDownload(
-          notification, GURL(url), kSecondaryIconImageSize,
-          base::Bind(&BalloonViewAsh::SetNotificationSecondaryIcon,
-                     base::Unretained(this), notification.notification_id()))));
-    }
-  }
 }