Handle app custom icon via aura::Window property.

extensions/browser/app_window/app_window.h

 // 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.
 
 #ifndef EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_H_
 #define EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "components/sessions/core/session_id.h"
 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #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"
 #include "ui/gfx/image/image.h"
 
 class GURL;
 class SkRegion;
 
 namespace base {
 class DictionaryValue;
@@ skipping 47 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AppWindowContents);
 };
 
 // AppWindow is the type of window used by platform apps. App windows
 // have a WebContents but none of the chrome of normal browser windows.
 class AppWindow : public content::WebContentsDelegate,
                   public content::WebContentsObserver,
                   public web_modal::WebContentsModalDialogManagerDelegate,
-                  public IconImage::Observer,
                   public ExtensionFunctionDispatcher::Delegate,
                   public ExtensionRegistryObserver {
  public:
   enum WindowType {
     WINDOW_TYPE_DEFAULT = 1 << 0,   // Default app window.
     WINDOW_TYPE_PANEL = 1 << 1,     // OS controlled panel window (Ash only).
     WINDOW_TYPE_V1_PANEL = 1 << 2,  // For apps v1 support in Ash; deprecate
                                     // with v1 apps.
   };
 
@@ skipping 131 matching lines @@
   const std::string& window_key() const { return window_key_; }
   const SessionID& session_id() const { return session_id_; }
   const std::string& extension_id() const { return extension_id_; }
   content::WebContents* web_contents() const;
   WindowType window_type() const { return window_type_; }
   bool window_type_is_panel() const {
     return (window_type_ == WINDOW_TYPE_PANEL ||
             window_type_ == WINDOW_TYPE_V1_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_; }
 
   const Extension* GetExtension() const;
   NativeAppWindow* GetBaseWindow();
   gfx::NativeWindow GetNativeWindow();
 
   // Returns the bounds that should be reported to the renderer.
   gfx::Rect GetClientBounds() const;
@@ skipping 100 matching lines @@
   void RestoreAlwaysOnTop();
 
   // Retrieve the current state of the app window as a dictionary, to pass to
   // the renderer.
   void GetSerializedState(base::DictionaryValue* properties) const;
 
   // Notifies the window's contents that the render view is ready and it can
   // 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_; }
 
   // Whether the app window is created by IME extensions.
   // TODO(bshe): rename to hide_app_window_in_launcher if it is not used
   // anywhere other than app_window_launcher_controller after M45. Otherwise,
   // remove this TODO.
   bool is_ime_window() const { return is_ime_window_; }
 
   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) {
     app_window_contents_ = std::move(contents);
   }
 
  protected:
   ~AppWindow() override;
 
  private:
@@ skipping 80 matching lines @@
   void AdjustBoundsToBeVisibleOnScreen(const gfx::Rect& cached_bounds,
                                        const gfx::Rect& cached_screen_bounds,
                                        const gfx::Rect& current_screen_bounds,
                                        const gfx::Size& minimum_size,
                                        gfx::Rect* bounds) const;
 
   // Loads the appropriate default or cached window bounds. Returns a new
   // 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();
 
   // Returns true if there is any overlap between the window and the taskbar
   // (Windows only).
   bool IntersectsWithTaskbar() const;
 
   // Update the always-on-top bit in the native app window.
   void UpdateNativeAlwaysOnTop();
 
   // Sends the onWindowShown event to the app if the window has been shown. Only
   // has an effect in tests.
   void SendOnWindowShownIfShown();
 
   // web_modal::WebContentsModalDialogManagerDelegate implementation.
   web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost()
       override;
 
   // Callback from web_contents()->DownloadFavicon.
   void DidDownloadFavicon(int id,
                           int http_status_code,
                           const GURL& image_url,
                           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_;
 
   const std::string extension_id_;
 
   // Identifier that is used when saving and restoring geometry for this
   // window.
   std::string window_key_;
 
   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 shelf.

[msw, 2017/05/23 00:02:30]

nit: the shelf is chrome's 'task bar', so you can probably remove "or in shelf",
or change it to "or in the Chrome OS shelf."

[khmel, 2017/05/23 16:11:44]

Done.

+  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_;
   std::unique_ptr<AppWebContentsHelper> helper_;
 
   // The initial url this AppWindow was navigated to.
   GURL initial_url_;
 
   // Bit field of FullscreenType.
   int fullscreen_types_;
@@ skipping 18 matching lines @@
 
   // Whether |alpha_enabled| was set in the CreateParams.
   bool requested_alpha_enabled_;
 
   // Whether |is_ime_window| was set in the CreateParams.
   bool is_ime_window_;
 
   // 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_;
 
   base::WeakPtrFactory<AppWindow> image_loader_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AppWindow);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_H_