Handle app custom icon via aura::Window property.

chrome/browser/ui/ash/launcher/extension_app_window_launcher_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_controller.h"
 
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/wm/window_util.h"
@@ skipping 57 matching lines @@
     return;
 
   AppWindowRegistry* registry = AppWindowRegistry::Get(profile);
   if (registry_.find(registry) != registry_.end())
     return;
 
   registry->AddObserver(this);
   registry_.insert(registry);
 }
 
-void ExtensionAppWindowLauncherController::OnAppWindowIconChanged(
-    AppWindow* app_window) {
-  const ash::ShelfID shelf_id = GetShelfId(app_window);
-  AppControllerMap::iterator iter = app_controller_map_.find(shelf_id);
-  if (iter == app_controller_map_.end())
-    return;
-
-  // Check if the window actually overrides its default icon. Otherwise use app
-  // icon loader provided by owner.
-  if (!app_window->HasCustomIcon() || app_window->app_icon().IsEmpty())
-    return;
-
-  ExtensionAppWindowLauncherItemController* controller = iter->second;
-  controller->set_image_set_by_controller(true);
-  owner()->SetLauncherItemImage(controller->shelf_id(),
-                                app_window->app_icon().AsImageSkia());
-}
-
 void ExtensionAppWindowLauncherController::OnAppWindowShown(
     AppWindow* app_window,
     bool was_hidden) {
   aura::Window* window = app_window->GetNativeWindow();
   if (!IsRegisteredApp(window))
     RegisterApp(app_window);
 }
 
 void ExtensionAppWindowLauncherController::OnAppWindowHidden(
     AppWindow* app_window) {
@@ skipping 36 matching lines @@
 
   if (app_controller_iter != app_controller_map_.end()) {
     ExtensionAppWindowLauncherItemController* controller =
         app_controller_iter->second;
     DCHECK_EQ(controller->app_id(), shelf_id.app_id);
     controller->AddAppWindow(app_window);
   } else {
     std::unique_ptr<ExtensionAppWindowLauncherItemController> controller =
         base::MakeUnique<ExtensionAppWindowLauncherItemController>(shelf_id);
     app_controller_map_[shelf_id] = controller.get();
-    controller->AddAppWindow(app_window);
 
     // Check for any existing pinned shelf item with a matching |shelf_id|.
     if (!owner()->GetItem(shelf_id)) {
       owner()->CreateAppLauncherItem(std::move(controller), status);
-      // Restore any existing app icon and flag as set.
-      if (app_window->HasCustomIcon() && !app_window->app_icon().IsEmpty()) {
-        owner()->SetLauncherItemImage(shelf_id,
-                                      app_window->app_icon().AsImageSkia());
-        app_controller_map_[shelf_id]->set_image_set_by_controller(true);
-      }
     } else {
       owner()->shelf_model()->SetShelfItemDelegate(shelf_id,
                                                    std::move(controller));
     }
+
+    // Register the window after a shelf item is created to let the controller
+    // set the shelf icon property.
+    app_controller_map_[shelf_id]->AddAppWindow(app_window);
   }
 
   owner()->SetItemStatus(shelf_id, status);
 }
 
 void ExtensionAppWindowLauncherController::UnregisterApp(aura::Window* window) {
   const auto window_iter = window_to_shelf_id_map_.find(window);
   DCHECK(window_iter != window_to_shelf_id_map_.end());
   ash::ShelfID shelf_id = window_iter->second;
   window_to_shelf_id_map_.erase(window_iter);
@@ skipping 25 matching lines @@
 ExtensionAppWindowLauncherController::ControllerForWindow(
     aura::Window* window) {
   const auto window_iter = window_to_shelf_id_map_.find(window);
   if (window_iter == window_to_shelf_id_map_.end())
     return nullptr;
   const auto controller_iter = app_controller_map_.find(window_iter->second);
   if (controller_iter == app_controller_map_.end())
     return nullptr;
   return controller_iter->second;
 }