Fix icon with badge size for items shown in shelf

extensions/browser/app_window/app_window.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 "extensions/browser/app_window/app_window.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 292 matching lines @@
 
   AppWindowClient* app_window_client = AppWindowClient::Get();
   native_app_window_.reset(
       app_window_client->CreateNativeAppWindow(this, &new_params));
 
   helper_.reset(new AppWebContentsHelper(
       browser_context_, extension_id_, web_contents(), app_delegate_.get()));
 
   UpdateExtensionAppIcon();
   // Download showInShelf=true window icon.
-  if (window_icon_url_.is_valid()) {
-    image_loader_ptr_factory_.InvalidateWeakPtrs();
-    web_contents()->DownloadImage(
-        window_icon_url_,
-        true,   // is a favicon
-        0,      // no maximum size
-        false,  // normal cache policy
-        base::Bind(&AppWindow::DidDownloadFavicon,
-                   image_loader_ptr_factory_.GetWeakPtr()));
-  }
+  if (window_icon_url_.is_valid())
+    SetAppIconUrl(window_icon_url_);
+
   AppWindowRegistry::Get(browser_context_)->AddAppWindow(this);
 
   if (new_params.hidden) {
     // Although the window starts hidden by default, calling Hide() here
     // notifies observers of the window being hidden.
     Hide();
   } else {
     // Panels are not activated by default.
     Show(window_type_is_panel() || !new_params.focused ? SHOW_INACTIVE
                                                        : SHOW_ACTIVE);
@@ skipping 261 matching lines @@
   }
   base::RemoveChars(title, base::ASCIIToUTF16("\n"), &title);
   return title;
 }
 
 void AppWindow::SetAppIconUrl(const GURL& url) {
   // Avoid using any previous icons that were being downloaded.
   image_loader_ptr_factory_.InvalidateWeakPtrs();
 
   // Reset |app_icon_image_| to abort pending image load (if any).
-  app_icon_image_.reset();
+  if (!show_in_shelf_) {
+    app_icon_image_.reset();
+    app_icon_url_ = url;
+  } else {
+    window_icon_url_ = url;
+  }
 
-  app_icon_url_ = url;
   web_contents()->DownloadImage(
       url,
       true,   // is a favicon
       0,      // no maximum size
       false,  // normal cache policy
       base::Bind(&AppWindow::DidDownloadFavicon,
                  image_loader_ptr_factory_.GetWeakPtr()));
 }
 
 void AppWindow::UpdateShape(std::unique_ptr<SkRegion> region) {
   native_app_window_->UpdateShape(std::move(region));
 }
 
 void AppWindow::UpdateDraggableRegions(
     const std::vector<DraggableRegion>& regions) {
   native_app_window_->UpdateDraggableRegions(regions);
 }
 
 void AppWindow::UpdateAppIcon(const gfx::Image& image) {
   // Set the showInShelf=true window icon and add the app_icon_image_
   // as a badge. If the image is empty, set the default app icon placeholder
   // as the base image.
   if (window_icon_url_.is_valid() && !app_icon_image_->image().IsEmpty()) {
     gfx::Image base_image =
         !image.IsEmpty()
             ? image
             : gfx::Image(*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
                   IDR_APP_DEFAULT_ICON));
-    app_icon_ = gfx::Image(gfx::ImageSkiaOperations::CreateIconWithBadge(
-        base_image.AsImageSkia(), app_icon_image_->image_skia()));
+    // Scale the icon to EXTENSION_ICON_LARGE.
+    int large_icon_size = extension_misc::EXTENSION_ICON_LARGE;

[Reilly Grant (use Gerrit), 2016/12/06 18:49:08]

nit: const

[Andra Paraschiv, 2016/12/07 09:07:42]

Done.

+    if (base_image.Width() != large_icon_size ||
+        base_image.Height() != large_icon_size) {
+      gfx::Image resized_image(base_image);
+      resized_image = gfx::Image(gfx::ImageSkiaOperations::CreateResizedImage(
+          resized_image.AsImageSkia(), skia::ImageOperations::RESIZE_BEST,
+          gfx::Size(large_icon_size, large_icon_size)));
+      app_icon_ = gfx::Image(gfx::ImageSkiaOperations::CreateIconWithBadge(
+          resized_image.AsImageSkia(), app_icon_image_->image_skia()));

[Reilly Grant (use Gerrit), 2016/12/06 18:49:08]

Why are we constantly converting between gfx::Image and ImageSkia here? Why not:

gfx::ImageSkia resized_image = gfx::ImageSkiaOperations::CreateResizedImage(
    base_image.AsImageSkia(), skia::ImageOperations::RESIZE_BEST,
    gfx::Size(large_icon_size, large_icon_size)));
app_icon_ = gfx::Image(gfx::ImageSkiaOperations::CreateIconWithBadge(
    resized_image, app_icon_image_->image_skia()));

[Andra Paraschiv, 2016/12/07 09:07:42]

Done.

+    } else {
+      app_icon_ = gfx::Image(gfx::ImageSkiaOperations::CreateIconWithBadge(
+          base_image.AsImageSkia(), app_icon_image_->image_skia()));
+    }
   } else {
     if (image.IsEmpty())
       return;
 
     app_icon_ = image;
   }
   native_app_window_->UpdateWindowIcon();
   AppWindowRegistry::Get(browser_context_)->AppWindowIconChanged(this);
 }
 
@@ skipping 214 matching lines @@
       break;
     largest_index = i;
   }
   const SkBitmap& largest = bitmaps[largest_index];
   UpdateAppIcon(gfx::Image::CreateFrom1xBitmap(largest));
 }
 
 void AppWindow::OnExtensionIconImageChanged(IconImage* image) {
   DCHECK_EQ(app_icon_image_.get(), image);
 
-  UpdateAppIcon(gfx::Image(app_icon_image_->image_skia()));
+  // Update app_icon if no valid window icon url is set.
+  if (!window_icon_url_.is_valid())
+    UpdateAppIcon(gfx::Image(app_icon_image_->image_skia()));
 }
 
 void AppWindow::UpdateExtensionAppIcon() {
   // Avoid using any previous app icons were being downloaded.
   image_loader_ptr_factory_.InvalidateWeakPtrs();
 
   const Extension* extension = GetExtension();
   if (!extension)
     return;
 
@@ skipping 280 matching lines @@
         region.bounds.x(),
         region.bounds.y(),
         region.bounds.right(),
         region.bounds.bottom(),
         region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
   }
   return sk_region;
 }
 
 }  // namespace extensions