Use Ash's ShelfWindowWatcher for app panel windows.

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/aura/wm_window_aura.h"
 #include "ash/common/shelf/shelf_delegate.h"
+#include "ash/common/shelf/shelf_item_types.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window_property.h"
+#include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
+#include "chrome/browser/ui/ash/property_util.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/common/extension.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 
 using extensions::AppWindow;
 using extensions::AppWindowRegistry;
 
 namespace {
 
 std::string GetLaunchId(AppWindow* app_window) {
   // Set launch_id default value to an empty string. If showInShelf parameter
-  // is true or the window type is panel and the window key is not empty, its
-  // value is appended to the launch_id. Otherwise, if the window key is
-  // empty, the session_id is used.
+  // is true and the window key is not empty, its value is appended to the
+  // launch_id. Otherwise, if the window key is empty, the session_id is used.
   std::string launch_id;
-  if (app_window->show_in_shelf() || app_window->window_type_is_panel()) {
+  if (app_window->show_in_shelf()) {

[James Cook, 2016/11/02 17:53:44]

Can you tell me more about this? This sounds like some stuff that was added by
Intel contributors for remote desktop apps. Are you sure it's OK to not check
for panels?

[msw, 2016/11/10 21:07:46]

I aimed to remove all panel use/control from this class, but I reverted this
change to support an existing unit test check, etc.

     if (!app_window->window_key().empty())
       launch_id = app_window->window_key();
     else
       launch_id = base::StringPrintf("%d", app_window->session_id().id());
   }
   return launch_id;
 }
 
 std::string GetAppShelfId(AppWindow* app_window) {
   // Set app_shelf_id value to app_id and then append launch_id.
@@ skipping 74 matching lines @@
     aura::Window* window) {
   UnregisterApp(window);
 }
 
 void ExtensionAppWindowLauncherController::RegisterApp(AppWindow* app_window) {
   // Windows created by IME extension should be treated the same way as the
   // virtual keyboard window, which does not register itself in launcher.
   if (app_window->is_ime_window())
     return;
 
+  // Ash's ShelfWindowWatcher handles app panel windows once their type is set.
   aura::Window* window = app_window->GetNativeWindow();
+  if (app_window->window_type_is_panel()) {
+    property_util::SetIntProperty(window, ash::kShelfItemTypeKey,
+                                  ash::TYPE_APP_PANEL);
+    return;
+  }
+
   // Get the app's shelf identifier and add an entry to the map.
   DCHECK(window_to_app_shelf_id_map_.find(window) ==
          window_to_app_shelf_id_map_.end());
   const std::string app_shelf_id = GetAppShelfId(app_window);
   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 app_controller_iter =
       app_controller_map_.find(app_shelf_id);
   ash::ShelfID shelf_id = 0;
 
   if (app_controller_iter != app_controller_map_.end()) {
     ExtensionAppWindowLauncherItemController* controller =
         app_controller_iter->second;
     DCHECK(controller->app_id() == app_id);
     shelf_id = controller->shelf_id();
     controller->AddAppWindow(app_window);
   } else {
-    LauncherItemController::Type type =
-        app_window->window_type_is_panel()
-            ? LauncherItemController::TYPE_APP_PANEL
-            : LauncherItemController::TYPE_APP;
+    LauncherItemController::Type type = LauncherItemController::TYPE_APP;
     std::string launch_id = GetLaunchId(app_window);
     ExtensionAppWindowLauncherItemController* controller =
         new ExtensionAppWindowLauncherItemController(type, app_id, launch_id,
                                                      owner());
     controller->AddAppWindow(app_window);
     // If there is already a shelf id mapped to this app_shelf_id (e.g. pinned),
     // use that shelf item.
     shelf_id =
         ash::WmShell::Get()->shelf_delegate()->GetShelfIDForAppIDAndLaunchID(
             app_id, launch_id);
@@ skipping 56 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;
 }