Handle app custom icon via aura::Window property.

chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc

 // Copyright 2016 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/ui/ash/launcher/extension_app_window_launcher_item_controller.h"
 
 #include "ash/public/cpp/shelf_item_delegate.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
 #include "components/favicon/content/content_favicon_driver.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
 #include "ui/gfx/image/image.h"
 #include "ui/wm/core/window_animations.h"
 
 ExtensionAppWindowLauncherItemController::
-    ExtensionAppWindowLauncherItemController(const ash::ShelfID& shelf_id)
-    : AppWindowLauncherItemController(shelf_id) {}
+    ExtensionAppWindowLauncherItemController(const ash::ShelfID& shelf_id,
+                                             ChromeLauncherController* owner)
+    : AppWindowLauncherItemController(shelf_id, owner) {}
 
 ExtensionAppWindowLauncherItemController::
     ~ExtensionAppWindowLauncherItemController() {}
 
 void ExtensionAppWindowLauncherItemController::AddAppWindow(
     extensions::AppWindow* app_window) {
   DCHECK(!app_window->window_type_is_panel());
   AddWindow(app_window->GetBaseWindow());
 }
 
@@ skipping 13 matching lines @@
 
     ash::mojom::MenuItemPtr item(ash::mojom::MenuItem::New());
     item->command_id = window_index;
     item->label = app_window->GetTitle();
 
     // Use the app's web contents favicon, or the app window's icon.
     favicon::FaviconDriver* favicon_driver =
         favicon::ContentFaviconDriver::FromWebContents(
             app_window->web_contents());
     gfx::Image icon = favicon_driver->GetFavicon();
-    if (icon.IsEmpty())
-      icon = app_window->app_icon();
+    if (icon.IsEmpty()) {
+      const gfx::ImageSkia* app_icon = nullptr;
+      if (app_window->GetNativeWindow()) {
+        app_icon = app_window->GetNativeWindow()->GetProperty(
+            aura::client::kAppIconKey);
+      }
+      if (app_icon && !app_icon->isNull())
+        icon = gfx::Image(*app_icon);

[stevenjb, 2017/05/23 17:00:19]

Maybe put the above in AppWindow as GetAppIcon() instead?

[khmel, 2017/05/23 17:35:00]

I am not very sure. Actually ChromeNativeAppWindowViews is WidgetDelegate, and
as a delegate it implements:
  gfx::ImageSkia GetWindowAppIcon() override;
  gfx::ImageSkia GetWindowIcon() override;

I don't feel that asking app window back is good idea. Let decide how app icon
looks in one place, here. WDYT?

[msw, 2017/05/23 18:13:12]

Hmm, it seems like this code should call
ChromeNativeAppWindowViews::GetWindowIcon, and fallback to
ChromeNativeAppWindowViews::GetWindowAppIcon if the former is null/empty. Can we
call those here, perhaps indirectly if needed (eg. via AppWindow)?

+    }
     if (!icon.IsEmpty())
       item->image = *icon.ToSkBitmap();
     items.push_back(std::move(item));
     ++window_index;
   }
   return items;
 }
 
 void ExtensionAppWindowLauncherItemController::ExecuteCommand(
     uint32_t command_id,
     int32_t event_flags) {
   ChromeLauncherController::instance()->ActivateShellApp(app_id(), command_id);
 }