Use Ash's ShelfWindowWatcher for app panel windows.

ash/common/shelf/shelf_window_watcher_unittest.cc

 // Copyright 2013 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 "ash/common/shelf/shelf_window_watcher.h"
 
 #include "ash/common/shelf/shelf_item_types.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/wm/window_resizer.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/common/wm_window_property.h"
 #include "ash/public/cpp/shell_window_ids.h"
+#include "ash/shell/panel_window.h"

[James Cook, 2016/11/10 22:32:46]

Ah, this might be the reason. I would prefer you either move PanelWindow to
ash/test or create your own inline PanelWindow for this test.

[msw, 2016/11/10 23:30:52]

Yup, this was the reason. I tested an inlined panel-type widget here instead.

 #include "ash/test/ash_test_base.h"
 #include "ui/base/hit_test.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 class ShelfWindowWatcherTest : public test::AshTestBase {
  public:
   ShelfWindowWatcherTest() : model_(nullptr) {}
   ~ShelfWindowWatcherTest() override {}
@@ skipping 235 matching lines @@
       window, gfx::Point(), HTCAPTION, aura::client::WINDOW_MOVE_SOURCE_MOUSE));
   ASSERT_TRUE(resizer.get());
   resizer->Drag(gfx::Point(50, 50), 0);
   resizer->CompleteDrag();
 
   // Index and id are not changed after dragging a |window|.
   EXPECT_EQ(index, model_->ItemIndexByID(id));
   EXPECT_EQ(id, model_->items()[index].id);
 }
 
+// Ensure shelf items are added and removed as panels are opened and closed.
+TEST_F(ShelfWindowWatcherTest, PanelWindow) {
+  // ShelfModel only has an APP_LIST item.
+  EXPECT_EQ(1, model_->item_count());
+
+  // Adding windows with valid ShelfItemType properties adds shelf items.
+  std::unique_ptr<views::Widget> widget1 =
+      CreateTestWidget(nullptr, kShellWindowId_PanelContainer, gfx::Rect());
+  WmWindow* window1 = WmLookup::Get()->GetWindowForWidget(widget1.get());
+  window1->SetIntProperty(WmWindowProperty::SHELF_ITEM_TYPE, TYPE_APP_PANEL);
+  EXPECT_EQ(2, model_->item_count());
+  std::unique_ptr<views::Widget> widget2 =
+      CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
+  WmWindow* window2 = WmLookup::Get()->GetWindowForWidget(widget2.get());
+  window2->SetIntProperty(WmWindowProperty::SHELF_ITEM_TYPE, TYPE_APP_PANEL);
+  EXPECT_EQ(3, model_->item_count());
+
+  // Using ash_shell_lib's example PanelWindow also adds shelf items.
+  views::Widget* widget3 = PanelWindow::CreatePanelWindow(gfx::Rect());
+  EXPECT_EQ(4, model_->item_count());
+  views::Widget* widget4 = PanelWindow::CreatePanelWindow(gfx::Rect());
+  EXPECT_EQ(5, model_->item_count());
+
+  // Each ShelfItem is removed when the associated window is destroyed.
+  widget4->CloseNow();
+  EXPECT_EQ(4, model_->item_count());
+  widget3->CloseNow();
+  EXPECT_EQ(3, model_->item_count());
+  widget2.reset();
+  EXPECT_EQ(2, model_->item_count());
+  widget1.reset();
+  EXPECT_EQ(1, model_->item_count());
+}

[James Cook, 2016/11/10 22:32:46]

Nice test.

[msw, 2016/11/10 23:30:52]

Acknowledged.

+
 }  // namespace ash