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

chrome/browser/extensions/bookmark_app_helper.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_BOOKMARK_APP_HELPER_H_
 #define CHROME_BROWSER_EXTENSIONS_BOOKMARK_APP_HELPER_H_
 
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 16 matching lines @@
 class WebContents;
 }
 
 namespace extensions {
 class CrxInstaller;
 class Extension;
 
 // A helper class for creating bookmark apps from a WebContents.
 class BookmarkAppHelper : public content::NotificationObserver {
  public:
+  struct BitmapAndSource {
+    BitmapAndSource();
+    BitmapAndSource(const GURL& source_url_p, const SkBitmap& bitmap_p);
+    ~BitmapAndSource();
+
+    GURL source_url;
+    SkBitmap bitmap;
+  };
+
   typedef base::Callback<void(const Extension*, const WebApplicationInfo&)>
       CreateBookmarkAppCallback;
 
   // This helper class will create a bookmark app out of |web_app_info| and
   // install it to |service|. Icons will be downloaded from the URLs in
   // |web_app_info.icons| using |contents| if |contents| is not NULL.
   // All existing icons from WebApplicationInfo will also be used. The user
   // will then be prompted to edit the creation information via a bubble and
   // will have a chance to cancel the operation.
   BookmarkAppHelper(Profile* profile,
                     WebApplicationInfo web_app_info,
                     content::WebContents* contents);
   ~BookmarkAppHelper() override;
 
   // Update the given WebApplicationInfo with information from the manifest.
   static void UpdateWebAppInfoFromManifest(const content::Manifest& manifest,
                                            WebApplicationInfo* web_app_info);
 
   // This finds the closest not-smaller bitmap in |bitmaps| for each size in
   // |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);
 
+  // Resize icons to the accepted sizes, and generate any that are missing. Does
+  // not update |web_app_info| except to update |generated_icon_color|.
+  static std::map<int, BitmapAndSource> ResizeIconsAndGenerateMissing(
+      std::vector<BitmapAndSource> icons,
+      WebApplicationInfo* web_app_info);
+
+  // It is important that the linked app information in any extension that
+  // gets created from sync matches the linked app information that came from
+  // sync. If there are any changes, they will be synced back to other devices
+  // and could potentially create a never ending sync cycle.
+  // This function updates |web_app_info| by copying over the image data of any
+  // icon from

[calamity, 2015/04/28 06:56:35]

Nit: sentence fragment.

[benwells, 2015/04/28 08:10:56]

Done.

+  static void UpdateWebAppIconsWithoutChangingLinks(
+      std::map<int, BookmarkAppHelper::BitmapAndSource> bitmap_map,
+      WebApplicationInfo* web_app_info);
+
   // Begins the asynchronous bookmark app creation.
   void Create(const CreateBookmarkAppCallback& callback);
 
  private:
   friend class TestBookmarkAppHelper;
 
   // Called by the WebContents when the manifest has been downloaded. If there
   // is no manifest, or the WebContents is destroyed before the manifest could
   // be downloaded, this is called with an empty manifest.
   void OnDidGetManifest(const content::Manifest& manifest);
@@ skipping 51 matching lines @@
     content::BrowserContext* browser_context,
     const extensions::Extension* extension,
     const base::Callback<void(const WebApplicationInfo&)> callback);
 
 // Returns whether the given |url| is a valid bookmark app url.
 bool IsValidBookmarkAppUrl(const GURL& url);
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_BOOKMARK_APP_HELPER_H_