Handle app custom icon via aura::Window property.

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

Index: chrome/browser/ui/ash/launcher/arc_app_window.cc
diff --git a/chrome/browser/ui/ash/launcher/arc_app_window.cc b/chrome/browser/ui/ash/launcher/arc_app_window.cc
index d47bf54ef72a1e9207b9945d97a8d38faac75b99..d9f491ccb137cfcade4cd3dcec2b503de7b4351c 100644
--- a/chrome/browser/ui/ash/launcher/arc_app_window.cc
+++ b/chrome/browser/ui/ash/launcher/arc_app_window.cc
@@ -33,8 +33,6 @@ void ArcAppWindow::SetController(
     ArcAppWindowLauncherItemController* controller) {
   DCHECK(!controller_ || !controller);
   controller_ = controller;
-  if (controller_)
-    controller_->UpdateLauncherItem();
 }
 
 void ArcAppWindow::SetFullscreenMode(FullScreenMode mode) {
@@ -158,20 +156,15 @@ void ArcAppWindow::SetAlwaysOnTop(bool always_on_top) {
 }
 
 void ArcAppWindow::ResetIcon() {
-  if (icon_.isNull())
-    return;
-  icon_ = gfx::ImageSkia();
-  if (controller_)
-    controller_->UpdateLauncherItem();
+  exo::ShellSurface::SetAppIcon(GetNativeWindow(), gfx::ImageSkia());
 }
 
 void ArcAppWindow::OnImageDecoded(const SkBitmap& decoded_image) {
-  // TODO(khmel): Use aura::Window property http://crbug.com/724292
-  icon_ = gfx::ImageSkiaOperations::CreateResizedImage(
-      gfx::ImageSkia(gfx::ImageSkiaRep(decoded_image, 1.0f)),
-      skia::ImageOperations::RESIZE_BEST,
-      gfx::Size(extension_misc::EXTENSION_ICON_SMALL,
-                extension_misc::EXTENSION_ICON_SMALL));
-  if (controller_)
-    controller_->UpdateLauncherItem();
+  exo::ShellSurface::SetAppIcon(
+      GetNativeWindow(),
+      gfx::ImageSkiaOperations::CreateResizedImage(
+          gfx::ImageSkia(gfx::ImageSkiaRep(decoded_image, 1.0f)),
+          skia::ImageOperations::RESIZE_BEST,
+          gfx::Size(extension_misc::EXTENSION_ICON_SMALL,
+                    extension_misc::EXTENSION_ICON_SMALL)));
 }