Enhance chrome.app.window API with icon property

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 39 matching lines @@
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/switches.h"
 #include "extensions/grit/extensions_browser_resources.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/events/keycodes/keyboard_codes.h"
+#include "ui/gfx/image/image_skia_operations.h"
 
 #if !defined(OS_MACOSX)
 #include "components/prefs/pref_service.h"
 #include "extensions/browser/pref_names.h"
 #endif
 
 using content::BrowserContext;
 using content::ConsoleMessageLevel;
 using content::WebContents;
 using web_modal::WebContentsModalDialogHost;
@@ skipping 221 matching lines @@
   window_key_ = new_params.window_key;
 
   // Windows cannot be always-on-top in fullscreen mode for security reasons.
   cached_always_on_top_ = new_params.always_on_top;
   if (new_params.state == ui::SHOW_STATE_FULLSCREEN)
     new_params.always_on_top = false;
 
   requested_alpha_enabled_ = new_params.alpha_enabled;
   is_ime_window_ = params.is_ime_window;
   show_in_shelf_ = params.show_in_shelf;
+  window_icon_url_ = params.window_icon_url;
 
   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()));
+  }
   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 278 matching lines @@
 }
 
 void AppWindow::UpdateDraggableRegions(
     const std::vector<DraggableRegion>& regions) {
   native_app_window_->UpdateDraggableRegions(regions);
 }
 
 void AppWindow::UpdateAppIcon(const gfx::Image& image) {
   if (image.IsEmpty())
     return;
-  app_icon_ = image;
+  if (window_icon_url_.is_valid() && !app_icon_image_->image().IsEmpty()) {
+    app_icon_ = gfx::Image(gfx::ImageSkiaOperations::CreateIconWithBadge(
+        image.AsImageSkia(), app_icon_image_->image_skia()));
+    // Set default app icon placeholder with app_icon_image_ badge if
+    // the icon is empty.
+    if (app_icon_.IsEmpty()) {

[stevenjb, 2016/08/10 16:58:47]

This will never happen since we already checked that image is not empty above.

I beleive the logic should just be be:

base_image = !image.IsEmtpy() ? image :
...GetImageSkiaNamed(IDR_APP_DEFAULT_ICON);
 app_icon_ = ...CreateIconWithBadge(base_image, app_icon_image_);

?

[Andra Paraschiv, 2016/08/11 07:20:55]

Right, thank you for this, updated the CL. 

+      image_loader_ptr_factory_.InvalidateWeakPtrs();
+      gfx::ImageSkia app_default_icon =
+          *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+              IDR_APP_DEFAULT_ICON);
+      app_icon_ = gfx::Image(gfx::ImageSkiaOperations::CreateIconWithBadge(
+          app_default_icon, app_icon_image_->image_skia()));
+    }
+  } else {
+    app_icon_ = image;
+  }
   native_app_window_->UpdateWindowIcon();
   AppWindowRegistry::Get(browser_context_)->AppWindowIconChanged(this);
 }
 
 void AppWindow::SetFullscreen(FullscreenType type, bool enable) {
   DCHECK_NE(FULLSCREEN_TYPE_NONE, type);
 
   if (enable) {
 #if !defined(OS_MACOSX)
     // Do not enter fullscreen mode if disallowed by pref.
@@ skipping 188 matching lines @@
 
 //------------------------------------------------------------------------------
 // Private methods
 
 void AppWindow::DidDownloadFavicon(
     int id,
     int http_status_code,
     const GURL& image_url,
     const std::vector<SkBitmap>& bitmaps,
     const std::vector<gfx::Size>& original_bitmap_sizes) {
-  if (image_url != app_icon_url_ || bitmaps.empty())
+  if (((image_url != app_icon_url_) && (image_url != window_icon_url_)) ||
+      bitmaps.empty()) {
     return;
+  }
 
   // Bitmaps are ordered largest to smallest. Choose the smallest bitmap
   // whose height >= the preferred size.
   int largest_index = 0;
   for (size_t i = 1; i < bitmaps.size(); ++i) {
     if (bitmaps[i].height() < app_delegate_->PreferredIconSize())
       break;
     largest_index = i;
   }
   const SkBitmap& largest = bitmaps[largest_index];
@@ skipping 297 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