Aura Icon Capture

ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
index b19ee7f72780eb9ea16faf01cb956c4538ba34b6..81a1ecab5415c794820ddf3057034524283e9ebd 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
@@ -649,8 +649,10 @@ bool DesktopNativeWidgetAura::SetWindowTitle(const base::string16& title) {
 
 void DesktopNativeWidgetAura::SetWindowIcons(const gfx::ImageSkia& window_icon,
                                              const gfx::ImageSkia& app_icon) {
-  if (content_window_)
+  if (content_window_) {
     desktop_window_tree_host_->SetWindowIcons(window_icon, app_icon);
+    content_window_->SetIcon(!window_icon.isNull() ? window_icon : app_icon);

[sky, 2016/08/08 19:19:47]

Does the window capture work on non-chromeos platforms?

[qiangchen, 2016/08/09 16:48:40]

Yes. But that part of development (OS API calls) must be in webrtc project,
because the OS level capture code is there. 

See https://codereview.chromium.org/2202883003/.

[sky, 2016/08/09 19:12:11]

I wanted to make sure you really wanted this on non-chromeos platforms. Make
sense.

[qiangchen, 2016/08/09 21:10:28]

Yes. Currently we use aura capture for the chrome window itself, rather than
using OS capturer. Thus we have to take icon here, because we do not store the
OS window handle in the capture list for chrome window.

+  }
 }
 
 void DesktopNativeWidgetAura::InitModalType(ui::ModalType modal_type) {