Handle app custom icon via aura::Window property.

chrome/browser/ui/ash/launcher/arc_app_deferred_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/arc_app_deferred_launcher_controller.h"
 
 #include "ash/shelf/shelf_model.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/arc/arc_util.h"
@@ skipping 98 matching lines @@
   AppControllerMap::const_iterator it = app_controller_map_.find(safe_app_id);
   if (it == app_controller_map_.end())
     return;
 
   const ash::ShelfID shelf_id(safe_app_id);
   const bool need_close_item =
       it->second == owner_->shelf_model()->GetShelfItemDelegate(shelf_id);
   app_controller_map_.erase(it);
   if (need_close_item)
     owner_->CloseLauncherItem(shelf_id);
-  UpdateApp(safe_app_id);
+  UpdateShelfItemIcon(safe_app_id);
 }
 
 void ArcAppDeferredLauncherController::OnAppReadyChanged(
     const std::string& app_id,
     bool ready) {
   if (!ready || app_controller_map_.empty())
     return;
 
   AppControllerMap::const_iterator it = app_controller_map_.find(app_id);
   if (it == app_controller_map_.end())
@@ skipping 26 matching lines @@
 
 base::TimeDelta ArcAppDeferredLauncherController::GetActiveTime(
     const std::string& app_id) const {
   AppControllerMap::const_iterator it = app_controller_map_.find(app_id);
   if (it == app_controller_map_.end())
     return base::TimeDelta();
 
   return it->second->GetActiveTime();
 }
 
-void ArcAppDeferredLauncherController::UpdateApp(const std::string& app_id) {
-  AppIconLoader* icon_loader = owner_->GetAppIconLoaderForApp(app_id);
-  if (icon_loader)
-    icon_loader->UpdateImage(app_id);
+void ArcAppDeferredLauncherController::UpdateShelfItemIcon(
+    const std::string& app_id) {
+  owner_->UpdateLauncherItemImage(app_id);
 }
 
 void ArcAppDeferredLauncherController::UpdateApps() {
   if (app_controller_map_.empty())
     return;
 
   RegisterNextUpdate();
   for (const auto pair : app_controller_map_)
-    UpdateApp(pair.first);
+    UpdateShelfItemIcon(pair.first);
 }
 
 void ArcAppDeferredLauncherController::RegisterNextUpdate() {
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, base::Bind(&ArcAppDeferredLauncherController::UpdateApps,
                             weak_ptr_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(kUpdateIconIntervalMs));
 }
 
 void ArcAppDeferredLauncherController::RegisterDeferredLaunch(
@@ skipping 24 matching lines @@
     owner_->shelf_model()->SetShelfItemDelegate(shelf_id,
                                                 std::move(controller));
     owner_->SetItemStatus(shelf_id, ash::STATUS_RUNNING);
   }
 
   if (app_controller_map_.empty())
     RegisterNextUpdate();
 
   app_controller_map_[app_id] = item_controller;
 }