Aura Icon Capture

ui/views/widget/desktop_aura/desktop_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/desktop_aura/desktop_native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
@@ skipping 631 matching lines @@
 }
 
 bool DesktopNativeWidgetAura::SetWindowTitle(const base::string16& title) {
   if (!content_window_)
     return false;
   return desktop_window_tree_host_->SetWindowTitle(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) {
   // 99% of the time, we should not be asked to create a
   // DesktopNativeWidgetAura that is modal. We only support window modal
   // dialogs on the same lines as non AURA.
   desktop_window_tree_host_->InitModalType(modal_type);
 }
 
 gfx::Rect DesktopNativeWidgetAura::GetWindowBoundsInScreen() const {
@@ skipping 532 matching lines @@
   if (cursor_reference_count_ == 0) {
     // We are the last DesktopNativeWidgetAura instance, and we are responsible
     // for cleaning up |cursor_manager_|.
     delete cursor_manager_;
     native_cursor_manager_ = NULL;
     cursor_manager_ = NULL;
   }
 }
 
 }  // namespace views