mash: Support ShelfModel access in Chrome.

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/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/shelf/shelf_model.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 "ash/wm_window.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/gfx/image/image_skia.h"
 #include "ui/views/widget/widget.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();
   }
@@ skipping 259 matching lines @@
 
   // Each ShelfItem is removed when the associated window is destroyed.
   panel_widget.CloseNow();
   EXPECT_EQ(3, model_->item_count());
   widget2.reset();
   EXPECT_EQ(2, model_->item_count());
   widget1.reset();
   EXPECT_EQ(1, model_->item_count());
 }
 
+// Ensure items icons use the app icon and window icon aura::Window properties.
+TEST_F(ShelfWindowWatcherTest, ItemIcon) {
+  // ShelfModel only has an APP_LIST item.
+  EXPECT_EQ(1, model_->item_count());
+
+  // Create a ShelfItem for a window; it should have an empty icon.
+  std::unique_ptr<views::Widget> widget =
+      CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
+  aura::Window* window = widget->GetNativeWindow();
+  ShelfID id = CreateShelfItem(window);
+  EXPECT_EQ(2, model_->item_count());

[James Cook, 2017/05/30 22:47:48]

Was this supposed to look for an empty icon? If not, update the comment.

[msw, 2017/05/31 16:55:21]

Done.

+
+  // Setting a window icon should update the item icon.
+  const gfx::ImageSkia red = CreateImageSkiaIcon(SK_ColorRED);
+  window->SetProperty(aura::client::kWindowIconKey, new gfx::ImageSkia(red));
+  EXPECT_EQ(SK_ColorRED, model_->items()[1].image.bitmap()->getColor(0, 0));
+
+  // Setting an app icon should override the window icon.
+  const gfx::ImageSkia blue = CreateImageSkiaIcon(SK_ColorBLUE);
+  window->SetProperty(aura::client::kAppIconKey, new gfx::ImageSkia(blue));
+  EXPECT_EQ(SK_ColorBLUE, model_->items()[1].image.bitmap()->getColor(0, 0));
+
+  // Clearing the app icon should restore the window icon to the shelf item.
+  window->ClearProperty(aura::client::kAppIconKey);
+  EXPECT_EQ(SK_ColorRED, model_->items()[1].image.bitmap()->getColor(0, 0));
+}
+
 TEST_F(ShelfWindowWatcherTest, DontCreateShelfEntriesForChildWindows) {
   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)
@@ skipping 29 matching lines @@
   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