Enhance chrome.app.window API with icon 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>
@@ skipping 178 matching lines @@
     bool always_on_top;
 
     // If true, the window will be visible on all workspaces. Defaults to false.
     bool visible_on_all_workspaces;
 
     // If true, the window will have its own shelf icon. Otherwise the window
     // will be grouped in the shelf with other windows that are associated with
     // 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;
 
     // The API enables developers to specify content or window size constraints.
     // These functions combine them so that we can work with one set of
     // constraints.
     gfx::Size GetContentMinimumSize(const gfx::Insets& frame_insets) const;
     gfx::Size GetContentMaximumSize(const gfx::Insets& frame_insets) const;
     gfx::Size GetWindowMinimumSize(const gfx::Insets& frame_insets) const;
@@ skipping 159 matching lines @@
   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 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);
   }
 
  protected:
   ~AppWindow() override;
 
  private:
   // PlatformAppBrowserTest needs access to web_contents()
@@ skipping 185 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 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_;
 
   base::WeakPtrFactory<AppWindow> image_loader_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AppWindow);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_H_