mash: Make ShelfWindowWatcher items for unknown windows.

ash/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/shelf/shelf_window_watcher.h"
 
 #include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shelf_item.h"
 #include "ash/public/cpp/shelf_model.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_resizer.h"
 #include "ash/wm/window_state.h"
-#include "base/strings/string_number_conversions.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/widget/widget.h"
+#include "ui/wm/core/transient_window_controller.h"
 
 namespace ash {
 namespace {
 
 // Create a test 1x1 icon image with a given |color|.
 gfx::ImageSkia CreateImageSkiaIcon(SkColor color) {
   SkBitmap bitmap;
   bitmap.allocN32Pixels(1, 1);
   bitmap.eraseColor(color);
   return gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
 }
 
 class ShelfWindowWatcherTest : public test::AshTestBase {
  public:
   ShelfWindowWatcherTest() : model_(nullptr) {}
   ~ShelfWindowWatcherTest() override {}
 
   void SetUp() override {
     test::AshTestBase::SetUp();
     model_ = Shell::Get()->shelf_model();
   }
 
   void TearDown() override {
     model_ = nullptr;
     test::AshTestBase::TearDown();
   }
 
   static ShelfID CreateShelfItem(aura::Window* window) {
     static int id = 0;
-    ShelfID shelf_id(base::IntToString(id++));
+    ShelfID shelf_id(std::to_string(id++));
     window->SetProperty(kShelfIDKey, new std::string(shelf_id.Serialize()));
     window->SetProperty(kShelfItemTypeKey, static_cast<int32_t>(TYPE_DIALOG));
     return shelf_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 valid ShelfItemType properties adds shelf items.
+  // Windows with valid ShelfItemType and ShelfID properties get shelf items.
   std::unique_ptr<views::Widget> widget1 =
       CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
   CreateShelfItem(widget1->GetNativeWindow());
   EXPECT_EQ(2, model_->item_count());
   std::unique_ptr<views::Widget> widget2 =
       CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
   CreateShelfItem(widget2->GetNativeWindow());
   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());
 }
 
+// Ensure shelf items are added and removed for unknown windows in mash.
+TEST_F(ShelfWindowWatcherTest, OpenAndCloseMash) {
+  if (Shell::GetAshConfig() != Config::MASH)
+    return;
+
+  // ShelfModel only has an APP_LIST item.
+  EXPECT_EQ(1, model_->item_count());
+
+  // Windows with no valid ShelfItemType and ShelfID properties get shelf items.
+  std::unique_ptr<views::Widget> widget1 =
+      CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
+  EXPECT_EQ(2, model_->item_count());
+  std::unique_ptr<views::Widget> widget2 =
+      CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
+  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());
+
+  // Windows with WindowState::ignored_by_shelf set do not get shelf items.
+  widget1 =
+      CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
+  wm::GetWindowState(widget1->GetNativeWindow())->set_ignored_by_shelf(true);
+  // TODO(msw): Make the flag a window property and remove this workaround.
+  widget1->GetNativeWindow()->SetProperty(aura::client::kDrawAttentionKey,
+                                          true);
+  EXPECT_EQ(1, model_->item_count());
+}
+
 TEST_F(ShelfWindowWatcherTest, CreateAndRemoveShelfItemProperties) {
   // TODO: investigate failure in mash. http://crbug.com/695562.
   if (Shell::GetAshConfig() == Config::MASH)
     return;
 
   // ShelfModel only has an APP_LIST item.
   EXPECT_EQ(1, model_->item_count());
 
   // Creating windows without a valid ShelfItemType does not add items.
   std::unique_ptr<views::Widget> widget1 =
@@ skipping 265 matching lines @@
   window->AddChild(child_window.get());
   child_window->Show();
   // |child_window| should not result in adding a new entry.
   EXPECT_EQ(initial_item_count + 1, model_->item_count());
 
   child_window.reset();
   window.reset();
   EXPECT_EQ(initial_item_count, model_->item_count());
 }
 
+TEST_F(ShelfWindowWatcherTest, DontCreateShelfEntriesForTransientWindows) {
+  const int initial_item_count = model_->item_count();
+
+  std::unique_ptr<aura::Window> window(base::MakeUnique<aura::Window>(
+      nullptr, aura::client::WINDOW_TYPE_NORMAL));
+  window->Init(ui::LAYER_NOT_DRAWN);
+  window->SetProperty(kShelfIDKey, new std::string(ShelfID("foo").Serialize()));
+  window->SetProperty(kShelfItemTypeKey, static_cast<int32_t>(TYPE_APP));
+  Shell::GetPrimaryRootWindow()
+      ->GetChildById(kShellWindowId_DefaultContainer)
+      ->AddChild(window.get());
+  window->Show();
+  EXPECT_EQ(initial_item_count + 1, model_->item_count());
+
+  std::unique_ptr<aura::Window> transient_window(base::MakeUnique<aura::Window>(
+      nullptr, aura::client::WINDOW_TYPE_NORMAL));
+  transient_window->Init(ui::LAYER_NOT_DRAWN);
+  transient_window->SetProperty(kShelfItemTypeKey,
+                                static_cast<int32_t>(TYPE_APP));
+  ::wm::TransientWindowController::Get()->AddTransientChild(
+      window.get(), transient_window.get());
+  transient_window->Show();
+  // |transient_window| should not result in adding a new entry.
+  EXPECT_EQ(initial_item_count + 1, model_->item_count());
+
+  transient_window.reset();
+  window.reset();
+  EXPECT_EQ(initial_item_count, model_->item_count());
+}
+
 // Ensures ShelfWindowWatcher supports windows opened prior to session start.
 using ShelfWindowWatcherSessionStartTest = test::NoSessionAshTestBase;
 TEST_F(ShelfWindowWatcherSessionStartTest, PreExistingWindow) {
   ShelfModel* model = Shell::Get()->shelf_model();
   ASSERT_FALSE(
       Shell::Get()->session_controller()->IsActiveUserSessionStarted());
 
   // ShelfModel only has an APP_LIST item.
   EXPECT_EQ(1, model->item_count());
 
   // Construct a window that should get a shelf item once the session starts.
   std::unique_ptr<views::Widget> widget =
       CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
   ShelfWindowWatcherTest::CreateShelfItem(widget->GetNativeWindow());
   EXPECT_EQ(1, model->item_count());
 
   // Start the test user session; ShelfWindowWatcher will find the open window.
   SetSessionStarted(true);
   EXPECT_EQ(2, model->item_count());
 }
 
 }  // namespace
 }  // namespace ash