Aura Icon Capture

ui/views/widget/native_widget_aura.cc

 // Copyright (c) 2012 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 "ui/views/widget/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 79 matching lines @@
   aura::client::SetActivationChangeObserver(window_, this);
 }
 
 // static
 void NativeWidgetAura::RegisterNativeWidgetForWindow(
       internal::NativeWidgetPrivate* native_widget,
       aura::Window* window) {
   window->set_user_data(native_widget);
 }
 
+// static
+void NativeWidgetAura::AssignIconToAuraWindow(aura::Window* window,
+                                              const gfx::ImageSkia& window_icon,
+                                              const gfx::ImageSkia& app_icon) {
+  if (!window)
+    return;
+
+  if (window_icon.isNull() && app_icon.isNull())
+    return;

[sky, 2016/08/09 22:32:25]

This should clear the property.

[qiangchen, 2016/08/09 22:53:55]

Ah, you are right. I just thought the use case that icon is set only once.

+
+  window->SetProperty(
+      aura::client::kWindowIconKey,
+      new gfx::ImageSkia(!window_icon.isNull() ? window_icon : app_icon));
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, internal::NativeWidgetPrivate implementation:
 
 void NativeWidgetAura::InitNativeWidget(const Widget::InitParams& params) {
   // Aura needs to know which desktop (Ash or regular) will manage this widget.
   // See Widget::InitParams::context for details.
   DCHECK(params.parent || params.context);
 
   ownership_ = params.ownership;
 
@@ skipping 238 matching lines @@
   if (!window_)
     return false;
   if (window_->title() == title)
     return false;
   window_->SetTitle(title);
   return true;
 }
 
 void NativeWidgetAura::SetWindowIcons(const gfx::ImageSkia& window_icon,
                                       const gfx::ImageSkia& app_icon) {
-  // Aura doesn't have window icons.
+  AssignIconToAuraWindow(window_, window_icon, app_icon);
 }
 
 void NativeWidgetAura::InitModalType(ui::ModalType modal_type) {
   if (modal_type != ui::MODAL_TYPE_NONE)
     window_->SetProperty(aura::client::kModalKey, modal_type);
 }
 
 gfx::Rect NativeWidgetAura::GetWindowBoundsInScreen() const {
   return window_ ? window_->GetBoundsInScreen() : gfx::Rect();
 }
@@ skipping 827 matching lines @@
     gfx::NativeView native_view) {
   aura::client::CaptureClient* capture_client =
       aura::client::GetCaptureClient(native_view->GetRootWindow());
   if (!capture_client)
     return nullptr;
   return capture_client->GetGlobalCaptureWindow();
 }
 
 }  // namespace internal
 }  // namespace views