Handle app custom icon via aura::Window property.

chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
index 00d59c44e35622fce017a3eefbfcd1a7558b0d99..19ee2d9e90ae3e8988ba498ec090adf0a4f7107b 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
@@ -150,6 +150,9 @@ class ChromeLauncherController
   void SetLauncherItemImage(const ash::ShelfID& shelf_id,
                             const gfx::ImageSkia& image);
 
+  // Updates the image for a specific shelf item from the app's icon loader.
+  void UpdateLauncherItemImage(const std::string& app_id);
+
   // Notify the controller that the state of an non platform app's tabs
   // have changed,
   void UpdateAppState(content::WebContents* contents, AppState app_state);
@@ -219,8 +222,6 @@ class ChromeLauncherController
   // Controller to launch ARC apps in deferred mode.
   ArcAppDeferredLauncherController* GetArcDeferredLauncher();
 
-  AppIconLoader* GetAppIconLoaderForApp(const std::string& app_id);
-
   // Sets the shelf auto-hide and/or alignment behavior from prefs.
   void SetShelfAutoHideBehaviorFromPrefs();
   void SetShelfAlignmentFromPrefs();
@@ -389,6 +390,9 @@ class ChromeLauncherController
   // An internal helper to unpin a shelf item; this does not update prefs.
   void UnpinShelfItemInternal(const ash::ShelfID& id);
 
+  // Resolves the app icon image loader for the app.
+  AppIconLoader* GetAppIconLoaderForApp(const std::string& app_id);
+
   static ChromeLauncherController* instance_;
 
   // The currently loaded profile used for prefs and loading extensions. This is