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 24 matching lines @@
 #include "ui/display/screen.h"
 #include "ui/gfx/path.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/coordinate_conversion.h"
 #include "ui/wm/core/shadow.h"
 #include "ui/wm/core/shadow_controller.h"
 #include "ui/wm/core/shadow_types.h"
 #include "ui/wm/core/window_animations.h"
 #include "ui/wm/core/window_util.h"
 
+DECLARE_UI_CLASS_PROPERTY_TYPE(exo::ShellSurface*)

[reveman, 2017/06/01 18:28:42]

Don't add this. Launcher code can get the ShellSurface instance from:

static_cast<ShellSurface*>(widget->widget_delegate()->GetContentsView())

after verifying that ShellSurface::GetMainSurface is non-null.

[khmel, 2017/06/01 21:55:46]

Good point, thanks!

+
 namespace exo {
 namespace {
 
 DEFINE_LOCAL_UI_CLASS_PROPERTY_KEY(Surface*, kMainSurfaceKey, nullptr)
+DEFINE_LOCAL_UI_CLASS_PROPERTY_KEY(ShellSurface*, kThisSurfaceKey, nullptr)
 
 // Application Id set by the client.
 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kApplicationIdKey, nullptr);
 
 // This is a struct for accelerator keys used to close ShellSurfaces.
 const struct Accelerator {
   ui::KeyboardCode keycode;
   int modifiers;
 } kCloseWindowAccelerators[] = {
     {ui::VKEY_W, ui::EF_CONTROL_DOWN},
@@ skipping 465 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);
 }
 
+// static
+void ShellSurface::SetAppIcon(aura::Window* window,
+                              const gfx::ImageSkia& icon) {
+  DCHECK(GetApplicationId(window) && !GetApplicationId(window)->empty());
+  ShellSurface* this_surface = window->GetProperty(kThisSurfaceKey);
+  if (this_surface) {
+    this_surface->icon_ = icon;
+    this_surface->widget_->UpdateWindowIcon();
+  } else {
+    // Support unit test case.
+    window->SetProperty(aura::client::kAppIconKey, new gfx::ImageSkia(icon));
+  }
+}
+
 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 317 matching lines @@
   widget_->Init(params);
 
   aura::Window* window = widget_->GetNativeWindow();
   window->SetName("ExoShellSurface");
   window->SetProperty(aura::client::kAccessibilityFocusFallsbackToWidgetKey,
                       false);
   window->AddChild(surface_->window());
   window->SetEventTargeter(base::WrapUnique(new CustomWindowTargeter(widget_)));
   SetApplicationId(window, application_id_);
   SetMainSurface(window, surface_);
+  window->SetProperty(kThisSurfaceKey, this);
 
   // Start tracking changes to window bounds and window state.
   window->AddObserver(this);
   ash::wm::WindowState* window_state = ash::wm::GetWindowState(window);
   window_state->AddObserver(this);
 
   // Allow the client to request bounds that do not fill the entire work area
   // when maximized, or the entire display when fullscreen.
   window_state->set_allow_set_bounds_direct(bounds_mode_ == BoundsMode::CLIENT);
 
@@ skipping 499 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