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

chrome/browser/extensions/convert_web_app.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/extensions/convert_web_app.h"
 
 #include <cmath>
 #include <limits>
 #include <string>
 #include <vector>
@@ skipping 94 matching lines @@
   root->SetString(keys::kPublicKey, GenerateKey(web_app.app_url));
   root->SetString(keys::kName, base::UTF16ToUTF8(web_app.title));
   root->SetString(keys::kVersion, ConvertTimeToExtensionVersion(create_time));
   root->SetString(keys::kDescription, base::UTF16ToUTF8(web_app.description));
   root->SetString(keys::kLaunchWebURL, web_app.app_url.spec());
   if (web_app.generated_icon_color != SK_ColorTRANSPARENT) {
     root->SetString(keys::kAppIconColor, image_util::GenerateCSSColorString(
                                              web_app.generated_icon_color));
   }
 
-  // Add the icons.
+  // Add the icons and linked icon information.
   base::DictionaryValue* icons = new base::DictionaryValue();
   root->Set(keys::kIcons, icons);
-  for (size_t i = 0; i < web_app.icons.size(); ++i) {
-    std::string size = base::StringPrintf("%i", web_app.icons[i].width);
+  base::ListValue* linked_icons = new base::ListValue();
+  root->Set(keys::kLinkedAppIcons, linked_icons);
+  for (const auto& icon : web_app.icons) {
+    std::string size = base::StringPrintf("%i", icon.width);
     std::string icon_path = base::StringPrintf("%s/%s.png", kIconsDirName,
                                                size.c_str());
     icons->SetString(size, icon_path);
+
+    if (icon.url.is_valid()) {
+      base::DictionaryValue* linked_icon = new base::DictionaryValue();
+      linked_icon->SetString(keys::kLinkedAppIconURL, icon.url.spec());
+      linked_icon->SetInteger(keys::kLinkedAppIconSize, icon.width);
+      linked_icons->Append(linked_icon);
+    }
   }
 
   // Write the manifest.
   base::FilePath manifest_path = temp_dir.path().Append(kManifestFilename);
   JSONFileValueSerializer serializer(manifest_path);
   if (!serializer.Serialize(*root)) {
     LOG(ERROR) << "Could not serialize manifest.";
     return NULL;
   }
 
@@ skipping 37 matching lines @@
   if (!extension.get()) {
     LOG(ERROR) << error;
     return NULL;
   }
 
   temp_dir.Take();  // The caller takes ownership of the directory.
   return extension;
 }
 
 }  // namespace extensions