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/extensions/extension_service.h"
 #include "chrome/browser/favicon/favicon_util.h"
 #include "chrome/browser/notifications/balloon_collection.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/profiles/profile.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 std::string&, const gfx::ImageSkia&)> Setter;
 
-const int kPrimaryIconImageSize = 64;
-const int kSecondaryIconImageSize = 15;
-
 // Static.
 message_center::MessageCenter* GetMessageCenter() {
   return ash::Shell::GetInstance()->GetWebNotificationTray()->message_center();
 }
 
 // Static.
 std::string GetExtensionId(Balloon* balloon) {
   const ExtensionURLInfo url(balloon->notification().origin_url());
   const ExtensionService* service = balloon->profile()->GetExtensionService();
   const extensions::Extension* extension =
@@ skipping 141 matching lines @@
   message_center::MessageCenter* center = GetMessageCenter();
 
   // Cancel any previous downloads.
   downloads_.clear();
 
   // Set the notification's primary icon, or set up a download for it.
   if (!notification.icon().isNull()) {
     center->SetNotificationPrimaryIcon(notification_id_, notification.icon());
   } else if (!notification.icon_url().is_empty()) {
     GetImageDownload(notification.icon_url()).AddCallback(
-        kPrimaryIconImageSize,
+        message_center::kNotificationIconWidth,
         base::Bind(
             &message_center::MessageCenter::SetNotificationPrimaryIcon,
             base::Unretained(center)));
   }
 
-  // Set up 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()) {
-      GetImageDownload(GURL(url)).AddCallback(
-          kSecondaryIconImageSize,
-          base::Bind(
-              &message_center::MessageCenter::SetNotificationSecondaryIcon,
-              base::Unretained(center)));
-    }
-  }
-
   // Start the downloads.
   for (ImageDownloads::const_iterator i = downloads_.begin();
        i != downloads_.end();
        ++i) {
     i->second->Start(notification);
   }
 }
 
 BalloonViewAsh::ImageDownload& BalloonViewAsh::GetImageDownload(
     const GURL& url) {
   if (!downloads_.count(url))
     downloads_[url].reset(new ImageDownload(url));
   return *downloads_[url];
 }