mash: Support ShelfWindowWatcher via ShelfItem properties.

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/shell_window_ids.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/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 {}
 
   void SetUp() override {
     test::AshTestBase::SetUp();
     model_ = WmShell::Get()->shelf_model();
   }
 
   void TearDown() override {
     model_ = nullptr;
     test::AshTestBase::TearDown();
   }
 
   ShelfID CreateShelfItem(WmWindow* window) {
     ShelfID id = model_->next_id();
-    ShelfItemDetails item_details;
-    item_details.type = TYPE_PLATFORM_APP;
-    window->SetShelfItemDetails(item_details);
+    window->SetIntProperty(WmWindowProperty::SHELF_ITEM_TYPE, TYPE_DIALOG);

[James Cook, 2016/09/28 20:41:03]

This is fine, but just curious: does it need to change from TYPE_PLATFORM_APP to
TYPE_DIALOG?

[msw, 2016/09/28 23:27:46]

Nope! Just done to keep it a one-liner. Let me know if I should change it back.

[James Cook, 2016/09/29 02:49:46]

This is fine.

     return id;
   }
 
  protected:
   ShelfModel* model_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcherTest);
 };
 
 // Ensure shelf items are added and removed as windows are opened and closed.
 TEST_F(ShelfWindowWatcherTest, OpenAndClose) {
   // ShelfModel only has an APP_LIST item.
   EXPECT_EQ(1, model_->item_count());
 
-  // Adding windows with ShelfItemDetails properties adds shelf items.
+  // Adding windows with valid ShelfItemType properties adds shelf items.

[James Cook, 2016/09/28 20:41:03]

Thanks for fixing all the comments.

[msw, 2016/09/28 23:27:46]

Acknowledged.

   std::unique_ptr<views::Widget> widget1 =
       CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
   CreateShelfItem(WmLookup::Get()->GetWindowForWidget(widget1.get()));
   EXPECT_EQ(2, model_->item_count());
   std::unique_ptr<views::Widget> widget2 =
       CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
   CreateShelfItem(WmLookup::Get()->GetWindowForWidget(widget2.get()));
   EXPECT_EQ(3, model_->item_count());
 
   // Each ShelfItem is removed when the associated window is destroyed.
   widget1.reset();
   EXPECT_EQ(2, model_->item_count());
   widget2.reset();
   EXPECT_EQ(1, model_->item_count());
 }
 
-TEST_F(ShelfWindowWatcherTest, CreateAndRemoveShelfItemDetails) {
+TEST_F(ShelfWindowWatcherTest, CreateAndRemoveShelfItemProperties) {
   // ShelfModel only has an APP_LIST item.
   EXPECT_EQ(1, model_->item_count());
 
-  // Creating windows without ShelfItemDetails does not add items.
+  // Creating windows without a valid ShelfItemType does not add items.
   std::unique_ptr<views::Widget> widget1 =
       CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
   WmWindow* window1 = WmLookup::Get()->GetWindowForWidget(widget1.get());
   std::unique_ptr<views::Widget> widget2 =
       CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
   WmWindow* window2 = WmLookup::Get()->GetWindowForWidget(widget2.get());
   EXPECT_EQ(1, model_->item_count());
 
   // Create a ShelfItem for the first window.
   ShelfID id_w1 = CreateShelfItem(window1);
   EXPECT_EQ(2, model_->item_count());
 
   int index_w1 = model_->ItemIndexByID(id_w1);
   EXPECT_EQ(STATUS_RUNNING, model_->items()[index_w1].status);
 
   // Create a ShelfItem for the second window.
   ShelfID id_w2 = CreateShelfItem(window2);
   EXPECT_EQ(3, model_->item_count());
 
   int index_w2 = model_->ItemIndexByID(id_w2);
   EXPECT_EQ(STATUS_ACTIVE, model_->items()[index_w2].status);
 
-  // ShelfItem is removed when its window property is cleared.
-  window1->ClearShelfItemDetails();
+  // ShelfItem is removed when the item type window property is cleared.
+  window1->SetIntProperty(WmWindowProperty::SHELF_ITEM_TYPE, TYPE_UNDEFINED);
   EXPECT_EQ(2, model_->item_count());
-  window2->ClearShelfItemDetails();
+  window2->SetIntProperty(WmWindowProperty::SHELF_ITEM_TYPE, TYPE_UNDEFINED);
   EXPECT_EQ(1, model_->item_count());
   // Clearing twice doesn't do anything.
-  window2->ClearShelfItemDetails();
+  window2->SetIntProperty(WmWindowProperty::SHELF_ITEM_TYPE, TYPE_UNDEFINED);

[James Cook, 2016/09/28 20:41:03]

How about adding a test that sets an icon ID but not a type and verifies that
that does nothing (or at least doesn't crash)?

[msw, 2016/09/28 23:27:46]

Done.

   EXPECT_EQ(1, model_->item_count());
 }
 
 TEST_F(ShelfWindowWatcherTest, ActivateWindow) {
   // ShelfModel only have APP_LIST item.
   EXPECT_EQ(1, model_->item_count());
   std::unique_ptr<views::Widget> widget1 =
       CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
   WmWindow* window1 = WmLookup::Get()->GetWindowForWidget(widget1.get());
   std::unique_ptr<views::Widget> widget2 =
@@ skipping 32 matching lines @@
       CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
   WmWindow* window = WmLookup::Get()->GetWindowForWidget(widget.get());
 
   // Create a ShelfItem for |window|.
   ShelfID id = CreateShelfItem(window);
   EXPECT_EQ(2, model_->item_count());
 
   int index = model_->ItemIndexByID(id);
   EXPECT_EQ(STATUS_ACTIVE, model_->items()[index].status);
 
-  // Update ShelfItem for |window|.
-  ShelfItemDetails details;
-  details.type = TYPE_PLATFORM_APP;
-
-  window->SetShelfItemDetails(details);
+  // Update the ShelfItemType for |window|.
+  window->SetIntProperty(WmWindowProperty::SHELF_ITEM_TYPE, TYPE_PLATFORM_APP);
   // No new item is created after updating a launcher item.
   EXPECT_EQ(2, model_->item_count());
   // index and id are not changed after updating a launcher item.
   EXPECT_EQ(index, model_->ItemIndexByID(id));
   EXPECT_EQ(id, model_->items()[index].id);
 }
 
 TEST_F(ShelfWindowWatcherTest, MaximizeAndRestoreWindow) {
   // ShelfModel only has an APP_LIST item.
   EXPECT_EQ(1, model_->item_count());
@@ skipping 88 matching lines @@
   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);
 }
 
 }  // namespace ash