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();
 }
@@ skipping 104 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) {
+    UpdateLauncherItem();
   }
 }
 
 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::UpdateLauncherItem() {
+  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);
+  }
+  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()->UpdateAppItemImage(shelf_id().app_id);
+  }
+}