Sync bookmark app icon urls and sizes, and download icons for new apps.

chrome/browser/extensions/bookmark_app_helper.h

Index: chrome/browser/extensions/bookmark_app_helper.h
diff --git a/chrome/browser/extensions/bookmark_app_helper.h b/chrome/browser/extensions/bookmark_app_helper.h
index 3a47947d57f8cb3bad0577848dfc237520312300..52b72ca97bb483c26b14d69c6085c32e01b9e8d1 100644
--- a/chrome/browser/extensions/bookmark_app_helper.h
+++ b/chrome/browser/extensions/bookmark_app_helper.h
@@ -34,6 +34,14 @@ class Extension;
 // A helper class for creating bookmark apps from a WebContents.
 class BookmarkAppHelper : public content::NotificationObserver {
  public:
+  struct BitmapAndSource {
+    BitmapAndSource();
+    ~BitmapAndSource();
+
+    GURL source_url;
+    SkBitmap bitmap;
+  };
+
   typedef base::Callback<void(const Extension*, const WebApplicationInfo&)>
       CreateBookmarkAppCallback;
 
@@ -56,14 +64,14 @@ class BookmarkAppHelper : public content::NotificationObserver {
   // |sizes| and resizes it to that size. This returns a map of sizes to bitmaps
   // which contains only bitmaps of a size in |sizes| and at most one bitmap of
   // each size.
-  static std::map<int, SkBitmap> ConstrainBitmapsToSizes(
-      const std::vector<SkBitmap>& bitmaps,
+  static std::map<int, BitmapAndSource> ConstrainBitmapsToSizes(
+      const std::vector<BitmapAndSource>& bitmaps,
       const std::set<int>& sizes);
 
   // Adds a square container icon of |output_size| pixels to |bitmaps| by
   // drawing the given |letter| into a rounded background of |color|.
   // Does nothing if an icon of |output_size| already exists in |bitmaps|.
-  static void GenerateIcon(std::map<int, SkBitmap>* bitmaps,
+  static void GenerateIcon(std::map<int, BitmapAndSource>* bitmaps,
                            int output_size,
                            SkColor color,
                            char letter);