Handle app custom icon via aura::Window property.

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

 // Copyright 2017 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_window.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_icon.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h"
@@ skipping 15 matching lines @@
       owner_(owner) {}
 
 ArcAppWindow::~ArcAppWindow() {
   ImageDecoder::Cancel(this);
 }
 
 void ArcAppWindow::SetController(
     ArcAppWindowLauncherItemController* controller) {
   DCHECK(!controller_ || !controller);
   controller_ = controller;
-  if (controller_)
-    controller_->UpdateLauncherItem();
 }
 
 void ArcAppWindow::SetFullscreenMode(FullScreenMode mode) {
   DCHECK(mode != FullScreenMode::NOT_DEFINED);
   fullscreen_mode_ = mode;
 }
 
 void ArcAppWindow::SetDescription(
     const std::string& title,
     const std::vector<uint8_t>& unsafe_icon_data_png) {
@@ skipping 103 matching lines @@
 bool ArcAppWindow::IsAlwaysOnTop() const {
   NOTREACHED();
   return false;
 }
 
 void ArcAppWindow::SetAlwaysOnTop(bool always_on_top) {
   NOTREACHED();
 }
 
 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)));
 }