Adapting the UI to bring it closer to the spec, and fixing image fetching.

chrome/browser/notifications/sync_notifier/synced_notification.h

 // 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.
 
 // This class represents the data for a single Synced Notification.
 // It should map 1-1 to all the data in synced_notification_sepcifics.proto,
 // and the data and render protobufs that the specifics protobuf contains.
 
 #ifndef CHROME_BROWSER_NOTIFICATIONS_SYNC_NOTIFIER_SYNCED_NOTIFICATION_H_
 #define CHROME_BROWSER_NOTIFICATIONS_SYNC_NOTIFIER_SYNCED_NOTIFICATION_H_
@@ skipping 34 matching lines @@
 
   static const int kUndefinedPriority = 65535;
 
   void Update(const syncer::SyncData& sync_data);
 
   // Here are some helper functions to get individual data parts out of a
   // SyncedNotification.
   std::string GetTitle() const;
   std::string GetHeading() const;
   std::string GetDescription() const;
+  std::string GetAnnotation() const;
   std::string GetAppId() const;
   std::string GetKey() const;
   GURL GetOriginUrl() const;
   GURL GetAppIconUrl() const;
   GURL GetImageUrl() const;
   std::string GetText() const;
   ReadState GetReadState() const;
   uint64 GetCreationTime() const;
   int GetPriority() const;
   std::string GetDefaultDestinationTitle() const;
   GURL GetDefaultDestinationIconUrl() const;
   GURL GetDefaultDestinationUrl() const;
   std::string GetButtonTitle(unsigned int which_button) const;
   GURL GetButtonIconUrl(unsigned int which_button) const;
   GURL GetButtonUrl(unsigned int which_button) const;
+  GURL GetProfilePictureUrl(unsigned int which_url) const;
+  size_t GetProfilePictureCount() const;
   size_t GetNotificationCount() const;
   size_t GetButtonCount() const;
   std::string GetContainedNotificationTitle(int index) const;
   std::string GetContainedNotificationMessage(int index) const;
 
 
   bool EqualsIgnoringReadState(const SyncedNotification& other) const;
 
   void NotificationHasBeenDismissed();
 
@@ skipping 25 matching lines @@
   // If this bitmap has a valid GURL, create a fetcher for it.
   void AddBitmapToFetchQueue(const GURL& gurl);
 
   sync_pb::SyncedNotificationSpecifics specifics_;
   NotificationUIManager* notification_manager_;
   ChromeNotifierService* notifier_service_;
   Profile* profile_;
   ScopedVector<NotificationBitmapFetcher> fetchers_;
   int active_fetcher_count_;
   gfx::Image app_icon_bitmap_;
+  gfx::Image sender_bitmap_;
   gfx::Image image_bitmap_;
   std::vector<gfx::Image> button_bitmaps_;
 
   FRIEND_TEST_ALL_PREFIXES(SyncedNotificationTest, AddBitmapToFetchQueueTest);
   FRIEND_TEST_ALL_PREFIXES(SyncedNotificationTest, OnFetchCompleteTest);
   FRIEND_TEST_ALL_PREFIXES(SyncedNotificationTest, QueueBitmapFetchJobsTest);
 
   DISALLOW_COPY_AND_ASSIGN(SyncedNotification);
 };
 
 }  // namespace notifier
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_SYNC_NOTIFIER_SYNCED_NOTIFICATION_H_