Load the actual app icon in Athena.

apps/shell/common/shell_extensions_client.cc

Index: apps/shell/common/shell_extensions_client.cc
diff --git a/apps/shell/common/shell_extensions_client.cc b/apps/shell/common/shell_extensions_client.cc
index cc2f055762b6cd7c08ecf3489361376bae8f035b..8e9bd926dd9719116d9eb684391a6ca243ada3b2 100644
--- a/apps/shell/common/shell_extensions_client.cc
+++ b/apps/shell/common/shell_extensions_client.cc
@@ -17,6 +17,7 @@
 #include "extensions/common/features/permission_feature.h"
 #include "extensions/common/features/simple_feature.h"
 #include "extensions/common/manifest_handler.h"
+#include "extensions/common/manifest_handlers/icons_handler.h"
 #include "extensions/common/permissions/permission_message_provider.h"
 #include "extensions/common/permissions/permissions_info.h"
 #include "extensions/common/permissions/permissions_provider.h"
@@ -105,6 +106,9 @@ void ShellExtensionsClient::Initialize() {
   // initialization step specifically for API manifest handlers.
   (new extensions::SocketsManifestHandler)->Register();
 
+  // TODO(mukai): Why not icons handler in common?
+  (new extensions::IconsHandler)->Register();

[oshima, 2014/06/19 23:06:22]

I'll leave this to james

+
   extensions::ManifestHandler::FinalizeRegistration();
   // TODO(jamescook): Do we need to whitelist any extensions?