Synced Notifications Layout Changes

chrome/browser/notifications/sync_notifier/synced_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/sync_notifier/synced_notification.h"
 
 #include "base/basictypes.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
@@ skipping 96 matching lines @@
   }
 
   // If this URL matches one or more button bitmaps, save them off.
   for (unsigned int i = 0; i < GetButtonCount(); ++i) {
     if (GetButtonIconUrl(i) == url && bitmap != NULL)
       button_bitmaps_[i] = gfx::Image::CreateFrom1xBitmap(*bitmap);
   }
 
   // Count off the bitmaps as they arrive.
   --active_fetcher_count_;
-  DCHECK_GE(active_fetcher_count_, 0);
   // See if all bitmaps are accounted for, if so call Show.
   if (active_fetcher_count_ == 0) {
     Show(notification_manager_, notifier_service_, profile_);
   }
 }
 
 void SyncedNotification::QueueBitmapFetchJobs(
     NotificationUIManager* notification_manager,
     ChromeNotifierService* notifier_service,
     Profile* profile) {
@@ skipping 84 matching lines @@
   // The delegate will eventually catch calls that the notification
   // was read or deleted, and send the changes back to the server.
   scoped_refptr<NotificationDelegate> delegate =
       new ChromeNotifierDelegate(GetKey(), notifier_service);
 
   // Some inputs and fields are only used if there is a notification center.
   if (UseRichNotifications()) {
     base::Time creation_time =
         base::Time::FromDoubleT(static_cast<double>(GetCreationTime()));
     int priority = GetPriority();
-    int notification_count = GetNotificationCount();
     unsigned int button_count = GetButtonCount();
 
     // Deduce which notification template to use from the data.
     message_center::NotificationType notification_type =
         message_center::NOTIFICATION_TYPE_BASE_FORMAT;
     if (!image_url.is_empty()) {
       notification_type = message_center::NOTIFICATION_TYPE_IMAGE;
-    } else if (notification_count > 1) {
-      notification_type = message_center::NOTIFICATION_TYPE_MULTIPLE;
     } else if (button_count > 0) {
       notification_type = message_center::NOTIFICATION_TYPE_BASE_FORMAT;
     }
 
     // Fill the optional fields with the information we need to make a
     // notification.
     message_center::RichNotificationData rich_notification_data;
     rich_notification_data.timestamp = creation_time;
     if (priority != SyncedNotification::kUndefinedPriority)
       rich_notification_data.priority = priority;
@@ skipping 14 matching lines @@
       message_center::ButtonInfo button_info(UTF8ToUTF16(title));
       if (!button_bitmaps_[i].IsEmpty())
         button_info.icon = button_bitmaps_[i];
       rich_notification_data.buttons.push_back(button_info);
     }
 
     // Fill in the bitmap images.
     if (!image_bitmap_.IsEmpty())
       rich_notification_data.image = image_bitmap_;
 
-    // Fill the individual notification fields for a multiple notification.
-    if (notification_count > 1) {
-      for (int ii = 0; ii < notification_count; ++ii) {
-        message_center::NotificationItem item(
-            UTF8ToUTF16(GetContainedNotificationTitle(ii)),
-            UTF8ToUTF16(GetContainedNotificationMessage(ii)));
-        rich_notification_data.items.push_back(item);
-      }
-    }
+    // Set the ContextMessage inside the rich notification data for the
+    // annotation.
+    rich_notification_data.context_message = annotation;
 
-    // The text encompasses both the description and the annotation.
-    if (!notification_text.empty())
-      notification_text = notification_text + newline;
-    notification_text = notification_text + annotation;
-
-    // If there is a single person sending, use their picture instead of the app
-    // icon.
+    // If there is at least one person sending, use the first picture.
     // TODO(petewil): Someday combine multiple profile photos here.
     gfx::Image icon_bitmap = app_icon_bitmap_;
-    if (GetProfilePictureCount() == 1)  {
+    if (GetProfilePictureCount() >= 1)  {
       icon_bitmap = sender_bitmap_;
     }
 
     Notification ui_notification(notification_type,
                                  GetOriginUrl(),
                                  notification_heading,
                                  notification_text,
                                  icon_bitmap,
                                  WebKit::WebTextDirectionDefault,
                                  message_center::NotifierId(GetOriginUrl()),
@@ skipping 387 matching lines @@
 
 std::string SyncedNotification::GetSendingServiceId() const {
   // TODO(petewil): We are building a new protocol (a new sync datatype) to send
   // the service name and icon from the server.  For now this method is
   // hardcoded to the name of our first service using synced notifications.
   // Once the new protocol is built, remove this hardcoding.
   return kFirstSyncedNotificationServiceId;
 }
 
 }  // namespace notifier