Handle app custom icon via aura::Window property.

chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.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/ui/ash/launcher/app_window_launcher_item_controller.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/base/base_window.h"
 #include "ui/wm/core/window_animations.h"
 
 AppWindowLauncherItemController::AppWindowLauncherItemController(
-    const ash::ShelfID& shelf_id)
-    : ash::ShelfItemDelegate(shelf_id), observed_windows_(this) {}
+    const ash::ShelfID& shelf_id,
+    ChromeLauncherController* owner)
+    : ash::ShelfItemDelegate(shelf_id),
+      owner_(owner),
+      observed_windows_(this) {}
 
 AppWindowLauncherItemController::~AppWindowLauncherItemController() {}
 
 void AppWindowLauncherItemController::AddWindow(ui::BaseWindow* app_window) {
   windows_.push_front(app_window);
   aura::Window* window = app_window->GetNativeWindow();
   if (window)
     observed_windows_.Add(window);
-  UpdateLauncherItem();
+  UpdateShelfItemIcon();
 }
 
 AppWindowLauncherItemController::WindowList::iterator
 AppWindowLauncherItemController::GetFromNativeWindow(aura::Window* window) {
   return std::find_if(windows_.begin(), windows_.end(),
                       [window](ui::BaseWindow* base_window) {
                         return base_window->GetNativeWindow() == window;
                       });
 }
 
 void AppWindowLauncherItemController::RemoveWindow(ui::BaseWindow* app_window) {
   DCHECK(app_window);
   aura::Window* window = app_window->GetNativeWindow();
   if (window)
     observed_windows_.Remove(window);
   if (app_window == last_active_window_)
     last_active_window_ = nullptr;
   auto iter = std::find(windows_.begin(), windows_.end(), app_window);
   if (iter == windows_.end()) {
     NOTREACHED();
     return;
   }
   windows_.erase(iter);
-  UpdateLauncherItem();
+  UpdateShelfItemIcon();
 }
 
 ui::BaseWindow* AppWindowLauncherItemController::GetAppWindow(
     aura::Window* window) {
   const auto iter = GetFromNativeWindow(window);
   if (iter != windows_.end())
     return *iter;
   return nullptr;
 }
 
 void AppWindowLauncherItemController::SetActiveWindow(aura::Window* window) {
   ui::BaseWindow* app_window = GetAppWindow(window);
   if (app_window)
     last_active_window_ = app_window;
-  UpdateLauncherItem();
+  UpdateShelfItemIcon();
 }
 
 AppWindowLauncherItemController*
 AppWindowLauncherItemController::AsAppWindowLauncherItemController() {
   return this;
 }
 
 void AppWindowLauncherItemController::ItemSelected(
     std::unique_ptr<ui::Event> event,
     int64_t display_id,
@@ skipping 56 matching lines @@
   if (key == aura::client::kDrawAttentionKey) {
     ash::ShelfItemStatus status;
     if (ash::wm::IsActiveWindow(window)) {
       status = ash::STATUS_ACTIVE;
     } else if (window->GetProperty(aura::client::kDrawAttentionKey)) {
       status = ash::STATUS_ATTENTION;
     } else {
       status = ash::STATUS_RUNNING;
     }
     ChromeLauncherController::instance()->SetItemStatus(shelf_id(), status);
+  } else if (key == aura::client::kAppIconKey) {
+    UpdateShelfItemIcon();
   }
 }
 
 ash::ShelfAction AppWindowLauncherItemController::ShowAndActivateOrMinimize(
     ui::BaseWindow* app_window) {
   // Either show or minimize windows when shown from the launcher.
   return ChromeLauncherController::instance()->ActivateWindowOrMinimizeIfActive(
       app_window, GetAppMenuItems(ui::EF_NONE).size() == 1);
 }
 
@@ skipping 11 matching lines @@
   if (window_to_show->IsActive()) {
     // Coming here, only a single window is active. For keyboard activations
     // the window gets animated.
     AnimateWindow(window_to_show->GetNativeWindow(),
                   wm::WINDOW_ANIMATION_TYPE_BOUNCE);
   } else {
     return ShowAndActivateOrMinimize(window_to_show);
   }
   return ash::SHELF_ACTION_NONE;
 }
+
+void AppWindowLauncherItemController::UpdateShelfItemIcon() {
+  // App window may optionally contain an attached icon we may use for the shelf

[msw, 2017/06/01 19:47:28]

optional nit: consider replacing this comment with "Set the shelf item icon from
the kAppIconKey property of the current (or most recently) active window. If
there is no valid icon, ask ChromeLauncherController to update the icon."

[khmel, 2017/06/01 21:55:46]

Thanks!

+  // item. Read this icon from the last active window in this controller. Note,
+  // last active window does not necessarily mean that is active window in the
+  // system, window from another controller may be active this time. In case
+  // such icon is available and non-empty set it as a shelf item icon. Otherwise
+  // use the default app icon. This function is called when the app window
+  // added/removed to/from this controller, active window was changed or window
+  // property that holds the icon is changed. In result, shelf icon may be
+  // dynamically changed for the same controller.
+  const gfx::ImageSkia* app_icon = nullptr;
+  ui::BaseWindow* last_active_window = GetLastActiveWindow();
+  if (last_active_window && last_active_window->GetNativeWindow()) {
+    app_icon = last_active_window->GetNativeWindow()->GetProperty(
+        aura::client::kAppIconKey);
+  }
+  // TODO(khmel): Remove using image_set_by_controller
+  if (app_icon && !app_icon->isNull()) {
+    set_image_set_by_controller(true);
+    owner()->SetLauncherItemImage(shelf_id(), *app_icon);
+  } else if (image_set_by_controller()) {
+    set_image_set_by_controller(false);
+    owner()->UpdateLauncherItemImage(shelf_id().app_id);
+  }
+}