extensions/common/manifest_handlers/icons_handler.cc - Issue 2900783003: Handle app custom icon via aura::Window property.

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: extensions/common/manifest_handlers/icons_handler.cc

Issue 2900783003: Handle app custom icon via aura::Window property. (Closed)

Patch Set: fix mac compile Created 3 years, 7 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: extensions/common/manifest_handlers/icons_handler.cc

diff --git a/extensions/common/manifest_handlers/icons_handler.cc b/extensions/common/manifest_handlers/icons_handler.cc

index 2825ae917b7dcf672fd4551ffa9d0b5ed79a9467..6fb5ce537fc736bdc74a35f2ab4606058937443a 100644

--- a/extensions/common/manifest_handlers/icons_handler.cc

+++ b/extensions/common/manifest_handlers/icons_handler.cc

@@ -28,6 +28,7 @@ static base::LazyInstance<ExtensionIconSet>::DestructorAtExit g_empty_icon_set =

// static

const ExtensionIconSet& IconsInfo::GetIcons(const Extension* extension) {

+ DCHECK(extension);

IconsInfo* info = static_cast<IconsInfo*>(

extension->GetManifestData(keys::kIcons));

return info ? info->icons : g_empty_icon_set.Get();