Handle app custom icon via aura::Window property.

components/exo/shell_surface.cc

 // Copyright 2015 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 "components/exo/shell_surface.h"
 
 #include <algorithm>
 
 #include "ash/frame/custom_frame_view_ash.h"
 #include "ash/public/cpp/shelf_types.h"
@@ skipping 513 matching lines @@
   return window->GetProperty(kApplicationIdKey);
 }
 
 void ShellSurface::SetApplicationId(const std::string& application_id) {
   // Store the value in |application_id_| in case the window does not exist yet.
   application_id_ = application_id;
   if (widget_ && widget_->GetNativeWindow())
     SetApplicationId(widget_->GetNativeWindow(), application_id);
 }
 
+void ShellSurface::SetAppIcon(const gfx::ImageSkia& icon) {
+  icon_ = icon;
+  widget_->UpdateWindowIcon();

[reveman, 2017/06/01 22:05:36]

nit: please leave this up to the caller so icon can be set before we have a
widget and unnecessary updates can be avoided

[khmel, 2017/06/01 22:19:27]

I did it the same way as SetTitle

  if (widget_)
    widget_->UpdateWindowIcon();

[reveman, 2017/06/01 22:26:00]

Sounds good. Thanks!

+}
+
 void ShellSurface::Move() {
   TRACE_EVENT0("exo", "ShellSurface::Move");
 
   if (!widget_)
     return;
 
   switch (bounds_mode_) {
     case BoundsMode::SHELL:
     case BoundsMode::CLIENT:
       AttemptToStartDrag(HTCAPTION);
@@ skipping 268 matching lines @@
 }
 
 bool ShellSurface::CanMinimize() const {
   return can_minimize_;
 }
 
 base::string16 ShellSurface::GetWindowTitle() const {
   return title_;
 }
 
+gfx::ImageSkia ShellSurface::GetWindowIcon() {
+  return icon_;
+}
+
 void ShellSurface::SaveWindowPlacement(const gfx::Rect& bounds,
                                        ui::WindowShowState show_state) {
   if (bounds_mode_ != BoundsMode::CLIENT)
     WidgetDelegate::SaveWindowPlacement(bounds, show_state);
 }
 
 bool ShellSurface::GetSavedWindowPlacement(
     const views::Widget* widget,
     gfx::Rect* bounds,
     ui::WindowShowState* show_state) const {
@@ skipping 836 matching lines @@
 gfx::Point ShellSurface::GetMouseLocation() const {
   aura::Window* const root_window = widget_->GetNativeWindow()->GetRootWindow();
   gfx::Point location =
       root_window->GetHost()->dispatcher()->GetLastMouseLocationInRoot();
   aura::Window::ConvertPointToTarget(
       root_window, widget_->GetNativeWindow()->parent(), &location);
   return location;
 }
 
 }  // namespace exo