ash/wm/window_properties.h - Issue 2514473003: Replace IDR window property use with gfx::ImageSkia icons.

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: ash/wm/window_properties.h

Issue 2514473003: Replace IDR window property use with gfx::ImageSkia icons. (Closed)

Patch Set: Remove TODOs let mash Task Manager and Settings icons temporarily regress. Created 4 years, 1 month 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: ash/wm/window_properties.h

diff --git a/ash/wm/window_properties.h b/ash/wm/window_properties.h

index 65aac254f7a6a7865fa1247fba991ad70df62f60..5c151e964c67532c55867ea8dbc0321fb29a8919 100644

--- a/ash/wm/window_properties.h

+++ b/ash/wm/window_properties.h

@@ -43,10 +43,6 @@ ASH_EXPORT extern const aura::WindowProperty<gfx::Rect*>* const

ASH_EXPORT extern const aura::WindowProperty<ui::WindowShowState>* const

kRestoreShowStateOverrideKey;

-// A property key to store the icon resource id for a window's shelf item.

-ASH_EXPORT extern const aura::WindowProperty<int>* const

- kShelfIconResourceIdKey;

// A property key to store the id for a window's shelf item.

ASH_EXPORT extern const aura::WindowProperty<ShelfID>* const kShelfIDKey;