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"
@@ skipping 12 matching lines @@
 #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 "webkit/glue/image_resource_fetcher.h"
 
 namespace {
 
 typedef base::Callback<void(const std::string&, const gfx::ImageSkia&)> Setter;
 
-const int kPrimaryIconImageSize = 64;
+const int kPrimaryIconImageSize = 80;

[Jun Mukai, 2012/12/19 00:33:53]

It seems that this value is shared with values in message_view_multiple.cc
Then better to export the value in message_center side and use it here.

Also, you may want to create new files message_center_constants.(h|cc) and move
such shared constant variables there.  It's common among chromium (see
ash/system/tray/tray_constants.* for example)

[dharcourt, 2012/12/19 01:47:44]

Done.

 const int kSecondaryIconImageSize = 15;

[Jun Mukai, 2012/12/19 00:33:53]

We don't use the secondary icon anymore right? then remove this.

[dharcourt, 2012/12/19 01:47:44]

Done.

 
 // 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();
@@ skipping 148 matching lines @@
   if (!notification.icon().isNull()) {
     center->SetNotificationPrimaryIcon(notification_id_, notification.icon());
   } else if (!notification.icon_url().is_empty()) {
     GetImageDownload(notification.icon_url()).AddCallback(
         kPrimaryIconImageSize,
         base::Bind(
             &message_center::MessageCenter::SetNotificationPrimaryIcon,
             base::Unretained(center)));
   }
 
   // Set up a download for the notification's secondary icon if appropriate.

[Jun Mukai, 2012/12/19 00:33:53]

is it necessary?

[dharcourt, 2012/12/19 01:47:44]

Not any more. Removed.

   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];
 }