Enhance chrome.app.window API with icon 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 1e30bab83f4e42725ef6e9ecc69b45b01c8a9212..4d505b42887f51c92e8e090835cd5d0df20808de 100644
--- a/extensions/browser/app_window/app_window.h
+++ b/extensions/browser/app_window/app_window.h
@@ -196,6 +196,9 @@ class AppWindow : public content::WebContentsDelegate,
     // the app. Defaults to false.
     bool show_in_shelf;
 
+    // Icon URL to be used for setting the window icon.
+    GURL window_icon_url;
+
     // The API enables developers to specify content or window bounds. This
     // function combines them into a single, constrained window size.
     gfx::Rect GetInitialWindowBounds(const gfx::Insets& frame_insets) const;
@@ -375,6 +378,12 @@ class AppWindow : public content::WebContentsDelegate,
 
   bool show_in_shelf() const { return show_in_shelf_; }
 
+  const gfx::Image& window_icon() const { return window_icon_; }
+
+  const GURL& window_icon_url() const { return window_icon_url_; }
+
+  void UpdateWindowIcon(const gfx::Image& image);
+
   void SetAppWindowContentsForTesting(
       std::unique_ptr<AppWindowContents> contents) {
     app_window_contents_ = std::move(contents);
@@ -580,6 +589,13 @@ class AppWindow : public content::WebContentsDelegate,
   // Whether |show_in_shelf| was set in the CreateParams.
   bool show_in_shelf_;
 
+  // Icon of the window shown in task bar.
+  gfx::Image window_icon_;

[Reilly Grant (use Gerrit), 2016/08/04 18:02:42]

Why is this a separate field from app_icon_ if we never show app_icon_ when
window_icon_url_ is provided?

[stevenjb, 2016/08/04 21:00:47]

I tend to agree. If we use a single icon image and put the logic in AppWindow to
set its icon appropriately, we can remove that logic elsewhere.

[Andra Paraschiv, 2016/08/08 13:34:12]

Thank you, Reilly and Steven, for feedback. I updated the CL to use only
app_icon, without a separate window_icon field.

Then we could use the app_icon_image variable, instead of app_icon, to set the
default app icon badge of the showInShelf=true windows.

+
+  // Icon URL to be used for setting the window icon. If not empty,
+  // window_icon_ will be fetched and set using this URL.
+  GURL window_icon_url_;
+
   // PlzNavigate: this is called when the first navigation is ready to commit.
   base::Closure on_first_commit_callback_;