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

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.cc

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

index 35f7ca20681d25c508e3e3cf0ab4e230af539b44..1e446774adf3b78d7c6b3f0b94f89ccee960479b 100644

--- a/ash/wm/window_properties.cc

+++ b/ash/wm/window_properties.cc

@@ -19,10 +19,6 @@ DEFINE_WINDOW_PROPERTY_KEY(ui::WindowShowState,

kRestoreShowStateOverrideKey,

ui::SHOW_STATE_DEFAULT);

-DEFINE_WINDOW_PROPERTY_KEY(int,

- kShelfIconResourceIdKey,

- kInvalidImageResourceID);

DEFINE_WINDOW_PROPERTY_KEY(ShelfID, kShelfIDKey, kInvalidShelfID);

DEFINE_WINDOW_PROPERTY_KEY(int, kShelfItemTypeKey, TYPE_UNDEFINED);