Turn on and use the AppInfo data.

chrome/browser/notifications/sync_notifier/synced_notification_app_info.cc

Index: chrome/browser/notifications/sync_notifier/synced_notification_app_info.cc
diff --git a/chrome/browser/notifications/sync_notifier/synced_notification_app_info.cc b/chrome/browser/notifications/sync_notifier/synced_notification_app_info.cc
index 1accb2642ffbc0c95fbf054d296f040d89e6d960..a1848169282a85a769b1d507a21d8cda2bacbabf 100644
--- a/chrome/browser/notifications/sync_notifier/synced_notification_app_info.cc
+++ b/chrome/browser/notifications/sync_notifier/synced_notification_app_info.cc
@@ -4,17 +4,57 @@
 
 #include "chrome/browser/notifications/sync_notifier/synced_notification_app_info.h"
 
+#include "chrome/browser/notifications/sync_notifier/image_holder.h"
+#include "chrome/browser/notifications/sync_notifier/synced_notification_app_info_service.h"
+#include "chrome/browser/profiles/profile.h"
 #include "sync/api/sync_data.h"
 #include "sync/protocol/synced_notification_app_info_specifics.pb.h"
 
 namespace notifier {
 
 SyncedNotificationAppInfo::SyncedNotificationAppInfo(
-    const std::string& settings_display_name)
-    : settings_display_name_(settings_display_name) {}
+    Profile* const profile,
+    const std::string& settings_display_name,
+    SyncedNotificationAppInfoService* synced_notification_app_info_service)
+    : profile_(profile),
+      settings_display_name_(settings_display_name),
+      synced_notification_app_info_service_(
+          synced_notification_app_info_service) {}
 
 SyncedNotificationAppInfo::~SyncedNotificationAppInfo() {}
 
+
+void SyncedNotificationAppInfo::SetSettingsURLs(

[dewittj, 2014/03/25 22:31:14]

nit: declaration order and definition order should be the same.  Please
double-check all other h/cc pairs for this property as well.

[Pete Williamson, 2014/03/26 18:12:55]

I'll do that in the next changelist so you can more easily see the fixes.

+    const GURL& settings_low_dpi, const GURL& settings_high_dpi) {
+  settings_holder_.reset(new ImageHolder(settings_low_dpi,
+                                         settings_high_dpi,
+                                         profile_,
+                                         this));
+}
+
+void SyncedNotificationAppInfo::SetMonochromeURLs(
+    const GURL& monochrome_low_dpi, const GURL& monochrome_high_dpi) {
+  monochrome_holder_.reset(new ImageHolder(monochrome_low_dpi,
+                                           monochrome_high_dpi,
+                                           profile_,
+                                           this));
+}
+
+void SyncedNotificationAppInfo::SetWelcomeURLs(
+    const GURL& welcome_low_dpi, const GURL& welcome_high_dpi) {
+  welcome_holder_.reset(new ImageHolder(welcome_low_dpi,
+                                        welcome_high_dpi,
+                                        profile_,
+                                        this));
+}
+
+GURL SyncedNotificationAppInfo::settings_icon_url() {
+  if (settings_holder_ != NULL)
+    return settings_holder_->low_dpi_url();
+  else
+    return GURL();
+}
+
 bool SyncedNotificationAppInfo::HasAppId(const std::string& app_id) {
   std::vector<std::string>::iterator it;
 
@@ -44,15 +84,65 @@ void SyncedNotificationAppInfo::RemoveAppId(const std::string& app_id) {
   }
 }
 
-void SyncedNotificationAppInfo::GetAppIdList(
-    std::vector<std::string>* app_id_list) {
-  if (app_id_list == NULL)
-    return;
-
+std::vector<std::string> SyncedNotificationAppInfo::GetAppIdList() {
+  std::vector<std::string> app_id_list;
   std::vector<std::string>::iterator it;
   for (it = app_ids_.begin(); it != app_ids_.end(); ++it) {
-    app_id_list->push_back(*it);
+    app_id_list.push_back(*it);
   }
+
+  return app_id_list;
+}
+
+// TODO: rename, queing now happens elsewhere.
+// Fill up the queue of bitmaps to fetch.
+void SyncedNotificationAppInfo::QueueBitmapFetchJobs() {
+  // If there are no bitmaps to fetch, call OnBitmapFetchesDone.
+  if (AreAllBitmapsFetched()) {
+      synced_notification_app_info_service_->OnBitmapFetchesDone(
+          added_app_ids_, removed_app_ids_);
+    DVLOG(2) << "AppInfo object with no bitmaps, we should add some. "
+             << this->settings_display_name_;
+    return;
+  }
+}
+
+// Start the bitmap fetching.  When it is complete, the callback
+// will notify the ChromeNotifierService of the new app info availablity.
+void SyncedNotificationAppInfo::StartBitmapFetch() {
+  if (settings_holder_.get() != NULL)
+    settings_holder_->StartFetch();
+  if (monochrome_holder_.get() != NULL)
+    monochrome_holder_->StartFetch();
+  if (welcome_holder_.get() != NULL)
+    welcome_holder_->StartFetch();
+}
+
+// Method inherited from ImageHolderDelegate
+void SyncedNotificationAppInfo::OnFetchComplete() {
+  if (AreAllBitmapsFetched()) {
+    if (synced_notification_app_info_service_ != NULL) {
+      synced_notification_app_info_service_->OnBitmapFetchesDone(
+          added_app_ids_, removed_app_ids_);
+    }
+  }
+}
+
+// Check to see if we have responses for all the bitmaps we got a URL for.
+bool SyncedNotificationAppInfo::AreAllBitmapsFetched() {
+  bool done =
+      (settings_holder_.get() == NULL || settings_holder_->IsFetchingDone()) &&
+      (monochrome_holder_.get() == NULL ||
+       monochrome_holder_->IsFetchingDone()) &&
+      (welcome_holder_.get() == NULL || welcome_holder_->IsFetchingDone());
+
+  return done;
+}
+
+message_center::NotifierId SyncedNotificationAppInfo::GetNotifierId() {
+  return message_center::NotifierId(
+      message_center::NotifierId::SYNCED_NOTIFICATION_SERVICE,
+      settings_display_name_);
 }
 
 }  // namespace notifier