Enhance chrome.app.window API with better shelf integration

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

 // 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.
 
 #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"
 
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 133 matching lines @@
   window_to_app_shelf_id_map_[window] = app_shelf_id;
   window->AddObserver(this);
 
   // Find or create an item controller and launcher item.
   std::string app_id = app_window->extension_id();
   ash::ShelfItemStatus status = ash::wm::IsActiveWindow(window)
                                     ? ash::STATUS_ACTIVE
                                     : ash::STATUS_RUNNING;
   AppControllerMap::iterator iter = app_controller_map_.find(app_shelf_id);
   ash::ShelfID shelf_id = 0;
-  if (iter != app_controller_map_.end()) {
+
+  if (!app_window->show_in_shelf() && iter != app_controller_map_.end()) {
     AppWindowLauncherItemController* controller = iter->second;
     DCHECK(controller->app_id() == app_id);
     shelf_id = controller->shelf_id();
     controller->AddAppWindow(app_window, status);
   } else {
     LauncherItemController::Type type =
         app_window->window_type_is_panel()
             ? LauncherItemController::TYPE_APP_PANEL
             : LauncherItemController::TYPE_APP;
     AppWindowLauncherItemController* controller =
         new AppWindowLauncherItemController(type, app_shelf_id, app_id, owner_);
     controller->AddAppWindow(app_window, status);
     // If the app shelf id is not unique, and there is already a shelf
-    // item for this app id (e.g. pinned), use that shelf item.
+    // item for this app id (e.g. pinned), use that shelf item, except for the
+    // case when the showInShelf parameter is true.
     if (app_shelf_id == app_id)
       shelf_id = owner_->GetShelfIDForAppID(app_id);
-    if (shelf_id == 0) {
+    if (shelf_id == 0 || app_window->show_in_shelf()) {

[stevenjb, 2016/03/17 23:36:15]

I think this logic would be more clear in the if statement on line 171 (also
less work).

       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()) {
         owner_->SetLauncherItemImage(shelf_id, app_icon.AsImageSkia());
         controller->set_image_set_by_controller(true);
       }
     } else {
       owner_->SetItemController(shelf_id, controller);
     }
-    const std::string app_shelf_id = GetAppShelfId(app_window);
-    app_controller_map_[app_shelf_id] = controller;
+    // We only need to change the controller associated with the app if the
+    // showInShelf parameter is false.

[stevenjb, 2016/03/17 23:36:15]

Is this true? What if the first window created for the app has show_in_shelf set
to true?

+    if (!app_window->show_in_shelf()) {
+      const std::string app_shelf_id = GetAppShelfId(app_window);
+      app_controller_map_[app_shelf_id] = controller;
+    }
   }
   owner_->SetItemStatus(shelf_id, status);
   ash::SetShelfIDForWindow(shelf_id, window);
 }
 
 void AppWindowLauncherController::UnregisterApp(aura::Window* window) {
   WindowToAppShelfIdMap::iterator iter1 =
       window_to_app_shelf_id_map_.find(window);
   DCHECK(iter1 != window_to_app_shelf_id_map_.end());
   std::string app_shelf_id = iter1->second;
@@ skipping 25 matching lines @@
   WindowToAppShelfIdMap::iterator iter1 =
       window_to_app_shelf_id_map_.find(window);
   if (iter1 == window_to_app_shelf_id_map_.end())
     return NULL;
   std::string app_shelf_id = iter1->second;
   AppControllerMap::iterator iter2 = app_controller_map_.find(app_shelf_id);
   if (iter2 == app_controller_map_.end())
     return NULL;
   return iter2->second;
 }