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"
 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.h"
 #include "components/exo/shell_surface.h"
 #include "extensions/common/constants.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image_skia_operations.h"
+#include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget.h"
 
 ArcAppWindow::ArcAppWindow(int task_id,
                            const arc::ArcAppShelfId& app_shelf_id,
                            views::Widget* widget,
                            ArcAppWindowLauncherController* owner)
     : task_id_(task_id),
       app_shelf_id_(app_shelf_id),
       widget_(widget),
       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) {
   if (!title.empty())
     GetNativeWindow()->SetTitle(base::UTF8ToUTF16(title));
   ImageDecoder::Cancel(this);
   if (unsafe_icon_data_png.empty()) {
-    ResetIcon();
+    SetIcon(gfx::ImageSkia());
     return;
   }
 
   if (ArcAppIcon::IsSafeDecodingDisabledForTesting()) {
     SkBitmap bitmap;
     if (gfx::PNGCodec::Decode(&unsafe_icon_data_png[0],
                               unsafe_icon_data_png.size(), &bitmap)) {
       OnImageDecoded(bitmap);
     } else {
       OnDecodeImageFailed();
@@ skipping 87 matching lines @@
 
 bool ArcAppWindow::IsAlwaysOnTop() const {
   NOTREACHED();
   return false;
 }
 
 void ArcAppWindow::SetAlwaysOnTop(bool always_on_top) {
   NOTREACHED();
 }
 
-void ArcAppWindow::ResetIcon() {
-  if (icon_.isNull())
+void ArcAppWindow::SetIcon(const gfx::ImageSkia& icon) {
+  if (!exo::ShellSurface::GetMainSurface(GetNativeWindow())) {
+    // Support unit tests where we don't have exo system initialized.
+    views::NativeWidgetAura::AssignIconToAuraWindow(
+        GetNativeWindow(), gfx::ImageSkia() /* window_icon */,
+        icon /* app_icon */);
     return;
-  icon_ = gfx::ImageSkia();
-  if (controller_)
-    controller_->UpdateLauncherItem();
+  }
+  exo::ShellSurface* shell_surface = static_cast<exo::ShellSurface*>(
+      widget_->widget_delegate()->GetContentsView());
+  if (!shell_surface)
+    return;
+  shell_surface->SetIcon(icon);
 }
 
 void ArcAppWindow::OnImageDecoded(const SkBitmap& decoded_image) {
-  // TODO(khmel): Use aura::Window property http://crbug.com/724292
-  icon_ = gfx::ImageSkiaOperations::CreateResizedImage(
+  SetIcon(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();
+                extension_misc::EXTENSION_ICON_SMALL)));
 }