Handle app custom icon via aura::Window property.

extensions/browser/app_window/app_window.h

Index: extensions/browser/app_window/app_window.h
diff --git a/extensions/browser/app_window/app_window.h b/extensions/browser/app_window/app_window.h
index a850d7137c0ff293eba7e93f14ee1537946a7778..ab812c21c36e27f202388e890e9d3dab44177385 100644
--- a/extensions/browser/app_window/app_window.h
+++ b/extensions/browser/app_window/app_window.h
@@ -19,7 +19,6 @@
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "extensions/browser/extension_function_dispatcher.h"
-#include "extensions/browser/extension_icon_image.h"
 #include "extensions/browser/extension_registry_observer.h"
 #include "ui/base/ui_base_types.h"  // WindowShowState
 #include "ui/gfx/geometry/rect.h"
@@ -87,7 +86,6 @@ class AppWindowContents {
 class AppWindow : public content::WebContentsDelegate,
                   public content::WebContentsObserver,
                   public web_modal::WebContentsModalDialogManagerDelegate,
-                  public IconImage::Observer,
                   public ExtensionFunctionDispatcher::Delegate,
                   public ExtensionRegistryObserver {
  public:
@@ -236,7 +234,7 @@ class AppWindow : public content::WebContentsDelegate,
     return window_type_ == WINDOW_TYPE_PANEL;
   }
   content::BrowserContext* browser_context() const { return browser_context_; }
-  const gfx::Image& app_icon() const { return app_icon_; }
+  const gfx::Image& custom_app_icon() const { return custom_app_icon_; }
   const GURL& app_icon_url() const { return app_icon_url_; }
   const GURL& initial_url() const { return initial_url_; }
   bool is_hidden() const { return is_hidden_; }
@@ -357,10 +355,6 @@ class AppWindow : public content::WebContentsDelegate,
   // unblock resource requests.
   void NotifyRenderViewReady();
 
-  // Returns true if window has custom icon in case either |window_icon_url_| or
-  // |app_icon_url_| is set. Custom icon may be not loaded yet.
-  bool HasCustomIcon() const;
-
   // Whether the app window wants to be alpha enabled.
   bool requested_alpha_enabled() const { return requested_alpha_enabled_; }
 
@@ -372,7 +366,7 @@ class AppWindow : public content::WebContentsDelegate,
 
   bool show_in_shelf() const { return show_in_shelf_; }
 
-  const GURL& window_icon_url() const { return window_icon_url_; }
+  AppDelegate* app_delegate() { return app_delegate_.get(); }
 
   void SetAppWindowContentsForTesting(
       std::unique_ptr<AppWindowContents> contents) {
@@ -473,9 +467,6 @@ class AppWindow : public content::WebContentsDelegate,
   // CreateParams that should be used to create the window.
   CreateParams LoadDefaults(CreateParams params) const;
 
-  // Load the app's image, firing a load state change when loaded.
-  void UpdateExtensionAppIcon();
-
   // Set the fullscreen state in the native app window.
   void SetNativeWindowFullscreen();
 
@@ -501,9 +492,6 @@ class AppWindow : public content::WebContentsDelegate,
                           const std::vector<SkBitmap>& bitmaps,
                           const std::vector<gfx::Size>& original_bitmap_sizes);
 
-  // IconImage::Observer implementation.
-  void OnExtensionIconImageChanged(IconImage* image) override;
-
   // The browser context with which this window is associated. AppWindow does
   // not own this object.
   content::BrowserContext* browser_context_;
@@ -517,16 +505,13 @@ class AppWindow : public content::WebContentsDelegate,
   const SessionID session_id_;
   WindowType window_type_;
 
-  // Icon shown in the task bar.
-  gfx::Image app_icon_;
+  // Custom icon shown in the task bar or in Chrome OS shelf.
+  gfx::Image custom_app_icon_;
 
   // Icon URL to be used for setting the app icon. If not empty, app_icon_ will
   // be fetched and set using this URL.
   GURL app_icon_url_;
 
-  // An object to load the app's icon as an extension resource.
-  std::unique_ptr<IconImage> app_icon_image_;
-
   std::unique_ptr<NativeAppWindow> native_app_window_;
   std::unique_ptr<AppWindowContents> app_window_contents_;
   std::unique_ptr<AppDelegate> app_delegate_;
@@ -565,11 +550,6 @@ class AppWindow : public content::WebContentsDelegate,
   // Whether |show_in_shelf| was set in the CreateParams.
   bool show_in_shelf_;
 
-  // Icon URL to be used for setting the window icon. If not empty,
-  // app_icon_ will be fetched and set using this URL and will have
-  // app_icon_image_ as a badge.
-  GURL window_icon_url_;
-
   // PlzNavigate: this is called when the first navigation is ready to commit.
   base::Closure on_first_commit_callback_;