Enhance chrome.app.window API with icon property

chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc

 // Copyright 2016 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.
 
 #include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h"
 
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/wm/window_util.h"
@@ skipping 67 matching lines @@
 }
 
 void ExtensionAppWindowLauncherController::OnAppWindowIconChanged(
     AppWindow* app_window) {
   const std::string app_shelf_id = GetAppShelfId(app_window);
   AppControllerMap::iterator iter = app_controller_map_.find(app_shelf_id);
   if (iter == app_controller_map_.end())
     return;
   ExtensionAppWindowLauncherItemController* controller = iter->second;
   controller->set_image_set_by_controller(true);
+  // Set window icon for showInShelf=true window.
+  if (app_window->show_in_shelf() && !app_window->window_icon().IsEmpty()) {
+    owner()->SetLauncherItemImage(controller->shelf_id(),
+                                  app_window->window_icon().AsImageSkia());
+    return;

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

nit: I would use an else here instead of an early exit since the two conditions
are doing mostly the same thing.

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

Done.

+  }
   owner()->SetLauncherItemImage(controller->shelf_id(),
                                 app_window->app_icon().AsImageSkia());
 }
 
 void ExtensionAppWindowLauncherController::OnAppWindowShown(
     AppWindow* app_window,
     bool was_hidden) {
   aura::Window* window = app_window->GetNativeWindow();
   if (!IsRegisteredApp(window))
     RegisterApp(app_window);
@@ skipping 75 matching lines @@
               id_map.begin(), id_map.end(),
               [shelf_id](const AppShelfIdToShelfIdMap::value_type& pair) {
                 return pair.second == shelf_id;
               }) != id_map.end()) {
         shelf_id = 0;
       }
     }
 
     if (shelf_id == 0) {
       shelf_id = owner()->CreateAppLauncherItem(controller, app_id, status);
-      // Restore any existing app icon and flag as set.
       const gfx::Image& app_icon = app_window->app_icon();
-      if (!app_icon.IsEmpty()) {
+      const gfx::Image& window_icon = app_window->window_icon();
+      // Restore any existing window icon for showInShelf=true window
+      // and flag as set.
+      if (app_window->show_in_shelf() && !window_icon.IsEmpty()) {
+        owner()->SetLauncherItemImage(shelf_id, window_icon.AsImageSkia());
+        controller->set_image_set_by_controller(true);
+        // Restore any existing app icon and flag as set.

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

This is confusing here. I would put both comments inside each if/else clause.

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

Done.

+      } else if (!app_icon.IsEmpty()) {
         owner()->SetLauncherItemImage(shelf_id, app_icon.AsImageSkia());
         controller->set_image_set_by_controller(true);
       }
     } else {
       owner()->SetItemController(shelf_id, controller);
     }
 
     // We need to change the controller associated with app_shelf_id.
     app_controller_map_[app_shelf_id] = controller;
     app_shelf_id_to_shelf_id_map_[app_shelf_id] = shelf_id;
@@ skipping 43 matching lines @@
   WindowToAppShelfIdMap::iterator window_iter =
       window_to_app_shelf_id_map_.find(window);
   if (window_iter == window_to_app_shelf_id_map_.end())
     return nullptr;
   AppControllerMap::iterator app_controller_iter =
       app_controller_map_.find(window_iter->second);
   if (app_controller_iter == app_controller_map_.end())
     return nullptr;
   return app_controller_iter->second;
 }