Chromium Code Reviews| 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..2066aa2dd9adcb922c13662d69439b9622f66db8 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,12 @@ 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_->SetProperty( |
| + aura::client::kWindowIconKey, |
| + new gfx::ImageSkia(!window_icon.isNull() ? window_icon : app_icon)); |
|
sky
2016/08/09 21:24:27
Is it possible the app_icon is also null? I would
qiangchen
2016/08/09 22:07:34
Done.
|
| + } |
| } |
| void DesktopNativeWidgetAura::InitModalType(ui::ModalType modal_type) { |