Handle app custom icon via aura::Window property.

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

Index: chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc
index a2d0041d332476229c8ed44048849098e17f6ed0..d3f69402cde4aaedd64e5fe3383c8b0f17c2e2b2 100644
--- a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc
@@ -22,8 +22,7 @@
 ArcAppWindowLauncherItemController::ArcAppWindowLauncherItemController(
     const std::string& arc_app_id,
     ChromeLauncherController* owner)
-    : AppWindowLauncherItemController(ash::ShelfID(arc_app_id)),
-      owner_(owner) {}
+    : AppWindowLauncherItemController(ash::ShelfID(arc_app_id), owner) {}
 
 ArcAppWindowLauncherItemController::~ArcAppWindowLauncherItemController() {}
 
@@ -68,7 +67,7 @@ ash::MenuItemList ArcAppWindowLauncherItemController::GetAppMenuItems(
     int event_flags) {
   ash::MenuItemList items;
   base::string16 app_title =
-      LauncherControllerHelper::GetAppTitle(owner_->profile(), app_id());
+      LauncherControllerHelper::GetAppTitle(owner()->profile(), app_id());
   for (auto it = windows().begin(); it != windows().end(); ++it) {
     // TODO(khmel): resolve correct icon here.
     size_t i = std::distance(windows().begin(), it);
@@ -83,20 +82,3 @@ ash::MenuItemList ArcAppWindowLauncherItemController::GetAppMenuItems(
   return items;
 }
 
-void ArcAppWindowLauncherItemController::UpdateLauncherItem() {
-  const ArcAppWindow* arc_app_window =
-      static_cast<const ArcAppWindow*>(GetLastActiveWindow());
-  if (!arc_app_window || arc_app_window->icon().isNull()) {
-    if (!image_set_by_controller())
-      return;
-    set_image_set_by_controller(false);
-    owner_->SetLauncherItemImage(shelf_id(), gfx::ImageSkia());
-    AppIconLoader* icon_loader = owner_->GetAppIconLoaderForApp(app_id());
-    if (icon_loader)
-      icon_loader->UpdateImage(app_id());
-    return;
-  }
-
-  owner_->SetLauncherItemImage(shelf_id(), arc_app_window->icon());
-  set_image_set_by_controller(true);
-}