Handle app custom icon via aura::Window property.

extensions/common/manifest_handlers/icons_handler.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/common/manifest_handlers/icons_handler.h"
 
 #include <memory>
 
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
@@ skipping 10 matching lines @@
 
 namespace extensions {
 
 namespace keys = manifest_keys;
 
 static base::LazyInstance<ExtensionIconSet>::DestructorAtExit g_empty_icon_set =
     LAZY_INSTANCE_INITIALIZER;
 
 // static
 const ExtensionIconSet& IconsInfo::GetIcons(const Extension* extension) {
-  IconsInfo* info = static_cast<IconsInfo*>(
-      extension->GetManifestData(keys::kIcons));
+  IconsInfo* info =
+      extension

[Devlin, 2017/05/31 22:00:01]

I think I'd rather put the onus of checking |extension| on the callers.

[khmel, 2017/06/01 16:56:52]

Done.

+          ? static_cast<IconsInfo*>(extension->GetManifestData(keys::kIcons))
+          : nullptr;
   return info ? info->icons : g_empty_icon_set.Get();
 }
 
 // static
 ExtensionResource IconsInfo::GetIconResource(
     const Extension* extension,
     int size,
     ExtensionIconSet::MatchType match_type) {
   const std::string& path = GetIcons(extension).Get(size, match_type);
   return path.empty() ? ExtensionResource() : extension->GetResource(path);
@@ skipping 37 matching lines @@
                                              extension,
                                              IDS_EXTENSION_LOAD_ICON_FAILED,
                                              error);
 }
 
 const std::vector<std::string> IconsHandler::Keys() const {
   return SingleKey(keys::kIcons);
 }
 
 }  // namespace extensions