chrome/browser/ui/ash/property_util.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: chrome/browser/ui/ash/property_util.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: chrome/browser/ui/ash/property_util.cc

diff --git a/chrome/browser/ui/ash/property_util.cc b/chrome/browser/ui/ash/property_util.cc

index 810e79a00cd21b6660bdb9dc41fe28f88ac8510f..761a3a14f32298e07e458a30a6e2fec6ee100e2d 100644

--- a/chrome/browser/ui/ash/property_util.cc

+++ b/chrome/browser/ui/ash/property_util.cc

@@ -17,8 +17,6 @@ namespace {

// Get the corresponding ui::Window property key for an aura::Window key.

template <typename T>

const char* GetMusProperty(const aura::WindowProperty<T>* aura_key) {

- if (aura_key == ash::kShelfIconResourceIdKey)

- return ui::mojom::WindowManager::kShelfIconResourceId_Property;

if (aura_key == ash::kShelfItemTypeKey)

return ui::mojom::WindowManager::kShelfItemType_Property;

NOTREACHED();