Add generateAppForLink function in chrome.management

chrome/browser/extensions/bookmark_app_helper.cc

 // 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.
 
 #include "chrome/browser/extensions/bookmark_app_helper.h"
 
 #include <cctype>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 164 matching lines @@
   registrar_.Add(this,
                  chrome::NOTIFICATION_CRX_INSTALLER_DONE,
                  content::Source<CrxInstaller>(crx_installer_.get()));
 
   registrar_.Add(this,
                  chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR,
                  content::Source<CrxInstaller>(crx_installer_.get()));
 
   crx_installer_->set_error_on_unsupported_requirements(true);
 
+  if (!contents)
+    return;
+
   // Add urls from the WebApplicationInfo.
   std::vector<GURL> web_app_info_icon_urls;
   for (std::vector<WebApplicationInfo::IconInfo>::const_iterator it =
            web_app_info_.icons.begin();
        it != web_app_info_.icons.end();
        ++it) {
     if (it->url.is_valid())
       web_app_info_icon_urls.push_back(it->url);
   }
 
   favicon_downloader_.reset(
       new FaviconDownloader(contents,
                             web_app_info_icon_urls,
                             base::Bind(&BookmarkAppHelper::OnIconsDownloaded,
                                        base::Unretained(this))));
 }
 
 BookmarkAppHelper::~BookmarkAppHelper() {}
 
 void BookmarkAppHelper::Create(const CreateBookmarkAppCallback& callback) {
   callback_ = callback;
-  favicon_downloader_->Start();
+
+  if (favicon_downloader_.get())
+    favicon_downloader_->Start();
+  else
+    OnIconsDownloaded(true, std::map<GURL, std::vector<SkBitmap> >());
 }
 
 void BookmarkAppHelper::OnIconsDownloaded(
     bool success,
     const std::map<GURL, std::vector<SkBitmap> >& bitmaps) {
   // The tab has navigated away during the icon download. Cancel the bookmark
   // app creation.
   if (!success) {
     favicon_downloader_.reset();
     callback_.Run(NULL, web_app_info_);
@@ skipping 20 matching lines @@
       downloaded_icons.push_back(*bitmap_it);
     }
   }
 
   // If there are icons that don't match the accepted icon sizes, find the
   // closest bigger icon to the accepted sizes and resize the icon to it. An
   // icon will be resized and used for at most one size.
   std::map<int, SkBitmap> resized_bitmaps(
       ConstrainBitmapsToSizes(downloaded_icons, allowed_sizes));
 
+  // Add the existing icon from WebApplicationInfo if there is no resized icon.
+  if (resized_bitmaps.empty() &&
+      web_app_info_.icons.size() &&
+      !web_app_info_.icons[0].data.drawsNothing()) {
+    SkBitmap* icon = &web_app_info_.icons[0].data;

[calamity, 2014/05/27 05:32:12]

Just use a const SkBitmap& here.

[wjywbs, 2014/05/27 06:22:32]

Done.

+    DCHECK_EQ(icon->width(), icon->height());
+    resized_bitmaps[icon->width()] = *icon;
+  }
+

[calamity, 2014/05/27 05:32:12]

It seems a little messy to just take the first icon. I think it's legitimate to
use web_app_info_.icons to fill in any icons sizes that are missing.

You can just add all the valid bitmaps from web_app_info_ to downloaded_icons
above. You should then call web_app_info_.icons.clear() to avoid duplicating a
bitmap.

You should add the bitmaps to the end of downloaded_icons so that downloaded
icons are preferred.

[wjywbs, 2014/05/27 06:22:32]

Done, but can we clear the web_app_info_.icons? It may contains the url of the
icons and empty bitmap. Is the |url| in IconInfo used for sync? Or how about add
all other sizes of the icons that do not exist in |resized_bitmaps|?

[calamity, 2014/05/27 07:18:48]

Clearing the icons should be fine.

The icon URL isn't used for anything at the moment, it's mostly a container to
pass through information into this class.

Icons aren't synced right now. Using the icon URL was considered but there is a
blob sync API in development that looks suitable for syncing icons directly.

Adding to |resized_bitmaps| isn't great because the subsequent code assumes that
only valid icon sizes will be in there. If web_app_info_ for some reason has an
18x18 icon, it should be discarded or resized to 16x16 before use which will
currently happen in ConstrainBitmapsToSizes.

[wjywbs, 2014/05/27 22:20:21]

I added "web_app_info_.icons.clear();".

   // Generate container icons from smaller icons.
   const int kIconSizesToGenerate[] = {extension_misc::EXTENSION_ICON_SMALL,
                                       extension_misc::EXTENSION_ICON_MEDIUM, };
   const std::set<int> generate_sizes(
       kIconSizesToGenerate,
       kIconSizesToGenerate + arraysize(kIconSizesToGenerate));
 
   // Only generate icons if larger icons don't exist. This means the app
   // launcher and the taskbar will do their best downsizing large icons and
   // these icons are only generated as a last resort against upscaling a smaller
@@ skipping 116 matching lines @@
       extension, info_list, base::Bind(&OnIconsLoaded, web_app_info, callback));
 }
 
 bool IsValidBookmarkAppUrl(const GURL& url) {
   URLPattern origin_only_pattern(Extension::kValidWebExtentSchemes);
   origin_only_pattern.SetMatchAllURLs(true);
   return url.is_valid() && origin_only_pattern.MatchesURL(url);
 }
 
 }  // namespace extensions