Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(34)

Unified Diff: extensions/common/manifest_handlers/icons_handler.cc

Issue 2900783003: Handle app custom icon via aura::Window property. (Closed)
Patch Set: nit 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:
View side-by-side diff with in-line comments
Download patch
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..ba1e50adf1a00c839749f54b7f6da072f5127e98 100644
--- a/extensions/common/manifest_handlers/icons_handler.cc
+++ b/extensions/common/manifest_handlers/icons_handler.cc
@@ -28,8 +28,10 @@ static base::LazyInstance<ExtensionIconSet>::DestructorAtExit g_empty_icon_set =
// static
const ExtensionIconSet& IconsInfo::GetIcons(const Extension* extension) {
- IconsInfo* info = static_cast<IconsInfo*>(
- extension->GetManifestData(keys::kIcons));
+ IconsInfo* info =
+ extension
+ ? static_cast<IconsInfo*>(extension->GetManifestData(keys::kIcons))
+ : nullptr;
return info ? info->icons : g_empty_icon_set.Get();
}

Powered by Google App Engine
This is Rietveld 408576698