ui/views/widget/native_widget_aura.cc - Issue 2222703002: Aura Icon Capture

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/widget/native_widget_aura.cc

Issue 2222703002: Aura Icon Capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add Icons To Aura::Window Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ui/views/widget/native_widget_aura.cc

diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc

index 1f72f3a80b73b784d387dc4fb401b40ea312b728..f1d24b240f36c2c0d96eac7234d168971699ef9c 100644

--- a/ui/views/widget/native_widget_aura.cc

+++ b/ui/views/widget/native_widget_aura.cc

@@ -355,7 +355,9 @@ bool NativeWidgetAura::SetWindowTitle(const base::string16& title) {

void NativeWidgetAura::SetWindowIcons(const gfx::ImageSkia& window_icon,

const gfx::ImageSkia& app_icon) {

- // Aura doesn't have window icons.

+ if (window_) {

+ window_->SetIcon(!window_icon.isNull() ? window_icon : app_icon);

+ }

}

void NativeWidgetAura::InitModalType(ui::ModalType modal_type) {