James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 1 | // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 | // Use of this source code is governed by a BSD-style license that can be |
| 3 | // found in the LICENSE file. |
| 4 | |
| 5 | #include "ash/shelf/shelf_window_watcher.h" |
| 6 | |
Mitsuru Oshima | 04b54d0 | 2017-10-09 14:22:45 | [diff] [blame^] | 7 | #include <memory> |
| 8 | |
sky | e5fd122 | 2017-04-12 18:43:23 | [diff] [blame] | 9 | #include "ash/public/cpp/config.h" |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 10 | #include "ash/public/cpp/shelf_item.h" |
msw | 109806d | 2017-06-02 20:11:57 | [diff] [blame] | 11 | #include "ash/public/cpp/shelf_model.h" |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 12 | #include "ash/public/cpp/shell_window_ids.h" |
| 13 | #include "ash/public/cpp/window_properties.h" |
| 14 | #include "ash/root_window_controller.h" |
| 15 | #include "ash/session/session_controller.h" |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 16 | #include "ash/shell.h" |
| 17 | #include "ash/test/ash_test_base.h" |
| 18 | #include "ash/wm/window_resizer.h" |
| 19 | #include "ash/wm/window_state.h" |
msw | 19b30c2c | 2017-06-01 03:21:40 | [diff] [blame] | 20 | #include "third_party/skia/include/core/SkBitmap.h" |
| 21 | #include "ui/aura/client/aura_constants.h" |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 22 | #include "ui/aura/window.h" |
| 23 | #include "ui/base/hit_test.h" |
msw | 19b30c2c | 2017-06-01 03:21:40 | [diff] [blame] | 24 | #include "ui/base/resource/resource_bundle.h" |
| 25 | #include "ui/gfx/image/image_skia.h" |
| 26 | #include "ui/resources/grit/ui_resources.h" |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 27 | #include "ui/views/widget/widget.h" |
msw | 70ac45f | 2017-06-05 02:02:45 | [diff] [blame] | 28 | #include "ui/wm/core/transient_window_controller.h" |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 29 | |
| 30 | namespace ash { |
msw | 19b30c2c | 2017-06-01 03:21:40 | [diff] [blame] | 31 | namespace { |
| 32 | |
| 33 | // Create a test 1x1 icon image with a given |color|. |
| 34 | gfx::ImageSkia CreateImageSkiaIcon(SkColor color) { |
| 35 | SkBitmap bitmap; |
| 36 | bitmap.allocN32Pixels(1, 1); |
| 37 | bitmap.eraseColor(color); |
| 38 | return gfx::ImageSkia::CreateFrom1xBitmap(bitmap); |
| 39 | } |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 40 | |
James Cook | 317781a | 2017-07-18 02:08:06 | [diff] [blame] | 41 | class ShelfWindowWatcherTest : public AshTestBase { |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 42 | public: |
| 43 | ShelfWindowWatcherTest() : model_(nullptr) {} |
| 44 | ~ShelfWindowWatcherTest() override {} |
| 45 | |
| 46 | void SetUp() override { |
James Cook | 317781a | 2017-07-18 02:08:06 | [diff] [blame] | 47 | AshTestBase::SetUp(); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 48 | model_ = Shell::Get()->shelf_model(); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 49 | // ShelfModel creates an app list item. |
| 50 | ASSERT_EQ(1, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 51 | } |
| 52 | |
| 53 | void TearDown() override { |
| 54 | model_ = nullptr; |
James Cook | 317781a | 2017-07-18 02:08:06 | [diff] [blame] | 55 | AshTestBase::TearDown(); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 56 | } |
| 57 | |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 58 | static ShelfID CreateShelfItem(aura::Window* window) { |
msw | 84b8a5f | 2017-05-05 00:13:36 | [diff] [blame] | 59 | static int id = 0; |
msw | 70ac45f | 2017-06-05 02:02:45 | [diff] [blame] | 60 | ShelfID shelf_id(std::to_string(id++)); |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 61 | window->SetProperty(kShelfIDKey, new std::string(shelf_id.Serialize())); |
| 62 | window->SetProperty(kShelfItemTypeKey, static_cast<int32_t>(TYPE_DIALOG)); |
msw | 84b8a5f | 2017-05-05 00:13:36 | [diff] [blame] | 63 | return shelf_id; |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 64 | } |
| 65 | |
| 66 | protected: |
| 67 | ShelfModel* model_; |
| 68 | |
| 69 | private: |
| 70 | DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcherTest); |
| 71 | }; |
| 72 | |
| 73 | // Ensure shelf items are added and removed as windows are opened and closed. |
| 74 | TEST_F(ShelfWindowWatcherTest, OpenAndClose) { |
msw | 70ac45f | 2017-06-05 02:02:45 | [diff] [blame] | 75 | // Windows with valid ShelfItemType and ShelfID properties get shelf items. |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 76 | std::unique_ptr<views::Widget> widget1 = |
| 77 | CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 78 | CreateShelfItem(widget1->GetNativeWindow()); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 79 | EXPECT_EQ(2, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 80 | std::unique_ptr<views::Widget> widget2 = |
| 81 | CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 82 | CreateShelfItem(widget2->GetNativeWindow()); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 83 | EXPECT_EQ(3, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 84 | |
| 85 | // Each ShelfItem is removed when the associated window is destroyed. |
| 86 | widget1.reset(); |
Michael Wasserman | 78b6f3e | 2017-07-20 19:51:20 | [diff] [blame] | 87 | EXPECT_EQ(2, model_->item_count()); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 88 | widget2.reset(); |
| 89 | EXPECT_EQ(1, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 90 | } |
| 91 | |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 92 | // Ensure shelf items are added and removed for some unknown windows in mash. |
msw | 70ac45f | 2017-06-05 02:02:45 | [diff] [blame] | 93 | TEST_F(ShelfWindowWatcherTest, OpenAndCloseMash) { |
| 94 | if (Shell::GetAshConfig() != Config::MASH) |
| 95 | return; |
| 96 | |
msw | 70ac45f | 2017-06-05 02:02:45 | [diff] [blame] | 97 | // Windows with no valid ShelfItemType and ShelfID properties get shelf items. |
| 98 | std::unique_ptr<views::Widget> widget1 = |
| 99 | CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 100 | EXPECT_EQ(2, model_->item_count()); |
msw | 70ac45f | 2017-06-05 02:02:45 | [diff] [blame] | 101 | std::unique_ptr<views::Widget> widget2 = |
| 102 | CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 103 | EXPECT_EQ(3, model_->item_count()); |
msw | 70ac45f | 2017-06-05 02:02:45 | [diff] [blame] | 104 | |
| 105 | // Each ShelfItem is removed when the associated window is destroyed. |
| 106 | widget1.reset(); |
Michael Wasserman | 78b6f3e | 2017-07-20 19:51:20 | [diff] [blame] | 107 | EXPECT_EQ(2, model_->item_count()); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 108 | widget2.reset(); |
| 109 | EXPECT_EQ(1, model_->item_count()); |
msw | 70ac45f | 2017-06-05 02:02:45 | [diff] [blame] | 110 | |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 111 | // Windows with type WINDOW_TYPE_NORMAL get shelf items, others do not. |
| 112 | aura::client::WindowType no_item_types[] = { |
| 113 | aura::client::WINDOW_TYPE_UNKNOWN, aura::client::WINDOW_TYPE_NORMAL, |
| 114 | aura::client::WINDOW_TYPE_POPUP, aura::client::WINDOW_TYPE_CONTROL, |
| 115 | aura::client::WINDOW_TYPE_PANEL, aura::client::WINDOW_TYPE_MENU, |
| 116 | aura::client::WINDOW_TYPE_TOOLTIP}; |
| 117 | for (aura::client::WindowType type : no_item_types) { |
| 118 | std::unique_ptr<aura::Window> window = |
Mitsuru Oshima | 04b54d0 | 2017-10-09 14:22:45 | [diff] [blame^] | 119 | std::make_unique<aura::Window>(nullptr, type); |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 120 | window->Init(ui::LAYER_NOT_DRAWN); |
| 121 | Shell::GetPrimaryRootWindow() |
| 122 | ->GetChildById(kShellWindowId_DefaultContainer) |
| 123 | ->AddChild(window.get()); |
| 124 | window->Show(); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 125 | EXPECT_EQ(type == aura::client::WINDOW_TYPE_NORMAL ? 2 : 1, |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 126 | model_->item_count()); |
| 127 | } |
| 128 | |
msw | 70ac45f | 2017-06-05 02:02:45 | [diff] [blame] | 129 | // Windows with WindowState::ignored_by_shelf set do not get shelf items. |
| 130 | widget1 = |
| 131 | CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); |
| 132 | wm::GetWindowState(widget1->GetNativeWindow())->set_ignored_by_shelf(true); |
| 133 | // TODO(msw): Make the flag a window property and remove this workaround. |
| 134 | widget1->GetNativeWindow()->SetProperty(aura::client::kDrawAttentionKey, |
| 135 | true); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 136 | EXPECT_EQ(1, model_->item_count()); |
msw | 70ac45f | 2017-06-05 02:02:45 | [diff] [blame] | 137 | } |
| 138 | |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 139 | TEST_F(ShelfWindowWatcherTest, CreateAndRemoveShelfItemProperties) { |
| 140 | // TODO: investigate failure in mash. http://crbug.com/695562. |
sky | e5fd122 | 2017-04-12 18:43:23 | [diff] [blame] | 141 | if (Shell::GetAshConfig() == Config::MASH) |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 142 | return; |
| 143 | |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 144 | // Creating windows without a valid ShelfItemType does not add items. |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 145 | EXPECT_EQ(1, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 146 | std::unique_ptr<views::Widget> widget1 = |
| 147 | CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 148 | std::unique_ptr<views::Widget> widget2 = |
| 149 | CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 150 | EXPECT_EQ(1, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 151 | |
| 152 | // Create a ShelfItem for the first window. |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 153 | ShelfID id_w1 = CreateShelfItem(widget1->GetNativeWindow()); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 154 | EXPECT_EQ(2, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 155 | |
| 156 | int index_w1 = model_->ItemIndexByID(id_w1); |
| 157 | EXPECT_EQ(STATUS_RUNNING, model_->items()[index_w1].status); |
| 158 | |
| 159 | // Create a ShelfItem for the second window. |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 160 | ShelfID id_w2 = CreateShelfItem(widget2->GetNativeWindow()); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 161 | EXPECT_EQ(3, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 162 | |
| 163 | int index_w2 = model_->ItemIndexByID(id_w2); |
| 164 | EXPECT_EQ(STATUS_ACTIVE, model_->items()[index_w2].status); |
| 165 | |
| 166 | // ShelfItem is removed when the item type window property is cleared. |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 167 | widget1->GetNativeWindow()->SetProperty(kShelfItemTypeKey, |
| 168 | static_cast<int32_t>(TYPE_UNDEFINED)); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 169 | EXPECT_EQ(2, model_->item_count()); |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 170 | widget2->GetNativeWindow()->SetProperty(kShelfItemTypeKey, |
| 171 | static_cast<int32_t>(TYPE_UNDEFINED)); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 172 | EXPECT_EQ(1, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 173 | // Clearing twice doesn't do anything. |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 174 | widget2->GetNativeWindow()->SetProperty(kShelfItemTypeKey, |
| 175 | static_cast<int32_t>(TYPE_UNDEFINED)); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 176 | EXPECT_EQ(1, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 177 | } |
| 178 | |
| 179 | TEST_F(ShelfWindowWatcherTest, ActivateWindow) { |
| 180 | // TODO: investigate failure in mash. http://crbug.com/695562. |
sky | e5fd122 | 2017-04-12 18:43:23 | [diff] [blame] | 181 | if (Shell::GetAshConfig() == Config::MASH) |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 182 | return; |
| 183 | |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 184 | std::unique_ptr<views::Widget> widget1 = |
| 185 | CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 186 | std::unique_ptr<views::Widget> widget2 = |
| 187 | CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 188 | |
| 189 | // Create a ShelfItem for the first window. |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 190 | ShelfID id_w1 = CreateShelfItem(widget1->GetNativeWindow()); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 191 | EXPECT_EQ(2, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 192 | int index_w1 = model_->ItemIndexByID(id_w1); |
| 193 | EXPECT_EQ(STATUS_RUNNING, model_->items()[index_w1].status); |
| 194 | |
| 195 | // Create a ShelfItem for the second window. |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 196 | ShelfID id_w2 = CreateShelfItem(widget2->GetNativeWindow()); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 197 | EXPECT_EQ(3, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 198 | int index_w2 = model_->ItemIndexByID(id_w2); |
| 199 | EXPECT_EQ(STATUS_RUNNING, model_->items()[index_w1].status); |
| 200 | EXPECT_EQ(STATUS_ACTIVE, model_->items()[index_w2].status); |
| 201 | |
| 202 | // The ShelfItem for the first window is active when the window is activated. |
| 203 | widget1->Activate(); |
| 204 | EXPECT_EQ(STATUS_ACTIVE, model_->items()[index_w1].status); |
| 205 | EXPECT_EQ(STATUS_RUNNING, model_->items()[index_w2].status); |
| 206 | |
| 207 | // The ShelfItem for the second window is active when the window is activated. |
| 208 | widget2->Activate(); |
| 209 | EXPECT_EQ(STATUS_RUNNING, model_->items()[index_w1].status); |
| 210 | EXPECT_EQ(STATUS_ACTIVE, model_->items()[index_w2].status); |
| 211 | } |
| 212 | |
| 213 | TEST_F(ShelfWindowWatcherTest, UpdateWindowProperty) { |
Michael Wasserman | 78b6f3e | 2017-07-20 19:51:20 | [diff] [blame] | 214 | // Create a ShelfItem for a new window. |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 215 | EXPECT_EQ(1, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 216 | std::unique_ptr<views::Widget> widget = |
| 217 | CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 218 | ShelfID id = CreateShelfItem(widget->GetNativeWindow()); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 219 | EXPECT_EQ(2, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 220 | |
| 221 | int index = model_->ItemIndexByID(id); |
| 222 | EXPECT_EQ(STATUS_ACTIVE, model_->items()[index].status); |
| 223 | |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 224 | // Update the window's ShelfItemType. |
| 225 | widget->GetNativeWindow()->SetProperty(kShelfItemTypeKey, |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 226 | static_cast<int32_t>(TYPE_APP_PANEL)); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 227 | // No new item is created after updating a launcher item. |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 228 | EXPECT_EQ(2, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 229 | // index and id are not changed after updating a launcher item. |
| 230 | EXPECT_EQ(index, model_->ItemIndexByID(id)); |
| 231 | EXPECT_EQ(id, model_->items()[index].id); |
| 232 | } |
| 233 | |
| 234 | TEST_F(ShelfWindowWatcherTest, MaximizeAndRestoreWindow) { |
Michael Wasserman | 78b6f3e | 2017-07-20 19:51:20 | [diff] [blame] | 235 | // Create a ShelfItem for a new window. |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 236 | EXPECT_EQ(1, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 237 | std::unique_ptr<views::Widget> widget = |
| 238 | CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 239 | ShelfID id = CreateShelfItem(widget->GetNativeWindow()); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 240 | EXPECT_EQ(2, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 241 | |
| 242 | int index = model_->ItemIndexByID(id); |
| 243 | EXPECT_EQ(STATUS_ACTIVE, model_->items()[index].status); |
| 244 | |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 245 | // Maximize the window. |
Michael Wasserman | 78b6f3e | 2017-07-20 19:51:20 | [diff] [blame] | 246 | wm::WindowState* window_state = wm::GetWindowState(widget->GetNativeWindow()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 247 | EXPECT_FALSE(window_state->IsMaximized()); |
| 248 | window_state->Maximize(); |
| 249 | EXPECT_TRUE(window_state->IsMaximized()); |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 250 | // No new item is created after maximizing the window. |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 251 | EXPECT_EQ(2, model_->item_count()); |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 252 | // index and id are not changed after maximizing the window. |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 253 | EXPECT_EQ(index, model_->ItemIndexByID(id)); |
| 254 | EXPECT_EQ(id, model_->items()[index].id); |
| 255 | |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 256 | // Restore the window. |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 257 | window_state->Restore(); |
| 258 | EXPECT_FALSE(window_state->IsMaximized()); |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 259 | // No new item is created after restoring the window. |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 260 | EXPECT_EQ(2, model_->item_count()); |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 261 | // Index and id are not changed after maximizing the window. |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 262 | EXPECT_EQ(index, model_->ItemIndexByID(id)); |
| 263 | EXPECT_EQ(id, model_->items()[index].id); |
| 264 | } |
| 265 | |
| 266 | // Check |window|'s item is not changed during the dragging. |
| 267 | // TODO(simonhong): Add a test for removing a Window during the dragging. |
| 268 | TEST_F(ShelfWindowWatcherTest, DragWindow) { |
Michael Wasserman | 78b6f3e | 2017-07-20 19:51:20 | [diff] [blame] | 269 | // Create a ShelfItem for a new window. |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 270 | EXPECT_EQ(1, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 271 | std::unique_ptr<views::Widget> widget = |
| 272 | CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 273 | ShelfID id = CreateShelfItem(widget->GetNativeWindow()); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 274 | EXPECT_EQ(2, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 275 | |
| 276 | int index = model_->ItemIndexByID(id); |
| 277 | EXPECT_EQ(STATUS_ACTIVE, model_->items()[index].status); |
| 278 | |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 279 | // Simulate dragging of the window and check its item is not changed. |
sky | a5e9a12 | 2017-05-22 20:45:35 | [diff] [blame] | 280 | std::unique_ptr<WindowResizer> resizer( |
| 281 | CreateWindowResizer(widget->GetNativeWindow(), gfx::Point(), HTCAPTION, |
Thiago Farina | 3b086a0 | 2017-05-30 22:32:50 | [diff] [blame] | 282 | ::wm::WINDOW_MOVE_SOURCE_MOUSE)); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 283 | ASSERT_TRUE(resizer.get()); |
| 284 | resizer->Drag(gfx::Point(50, 50), 0); |
| 285 | resizer->CompleteDrag(); |
| 286 | |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 287 | // Index and id are not changed after dragging the window. |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 288 | EXPECT_EQ(index, model_->ItemIndexByID(id)); |
| 289 | EXPECT_EQ(id, model_->items()[index].id); |
| 290 | } |
| 291 | |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 292 | // Ensure panels and dialogs get shelf items. |
| 293 | TEST_F(ShelfWindowWatcherTest, PanelAndDialogWindows) { |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 294 | // An item is created for a dialog window. |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 295 | EXPECT_EQ(1, model_->item_count()); |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 296 | std::unique_ptr<views::Widget> dialog_widget = |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 297 | CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 298 | aura::Window* dialog = dialog_widget->GetNativeWindow(); |
| 299 | dialog->SetProperty(kShelfIDKey, new std::string(ShelfID("a").Serialize())); |
| 300 | dialog->SetProperty(kShelfItemTypeKey, static_cast<int32_t>(TYPE_DIALOG)); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 301 | EXPECT_EQ(2, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 302 | |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 303 | // An item is created for a panel window. |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 304 | views::Widget panel_widget; |
| 305 | views::Widget::InitParams panel_params(views::Widget::InitParams::TYPE_PANEL); |
| 306 | panel_params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |
Scott Violet | 66193f7 | 2017-06-26 22:24:18 | [diff] [blame] | 307 | panel_params.parent = Shell::GetPrimaryRootWindow()->GetChildById( |
| 308 | kShellWindowId_PanelContainer); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 309 | panel_widget.Init(panel_params); |
| 310 | panel_widget.Show(); |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 311 | aura::Window* panel = panel_widget.GetNativeWindow(); |
| 312 | panel->SetProperty(kShelfIDKey, new std::string(ShelfID("b").Serialize())); |
| 313 | panel->SetProperty(kShelfItemTypeKey, static_cast<int32_t>(TYPE_APP_PANEL)); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 314 | EXPECT_EQ(3, model_->item_count()); |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 315 | |
| 316 | // An item is not created for an app window. |
| 317 | std::unique_ptr<views::Widget> app_widget = |
| 318 | CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); |
| 319 | aura::Window* app = app_widget->GetNativeWindow(); |
| 320 | app->SetProperty(kShelfIDKey, new std::string(ShelfID("c").Serialize())); |
| 321 | app->SetProperty(kShelfItemTypeKey, static_cast<int32_t>(TYPE_APP)); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 322 | EXPECT_EQ(3, model_->item_count()); |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 323 | app_widget.reset(); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 324 | |
| 325 | // Each ShelfItem is removed when the associated window is destroyed. |
| 326 | panel_widget.CloseNow(); |
Michael Wasserman | 78b6f3e | 2017-07-20 19:51:20 | [diff] [blame] | 327 | EXPECT_EQ(2, model_->item_count()); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 328 | dialog_widget.reset(); |
| 329 | EXPECT_EQ(1, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 330 | } |
| 331 | |
msw | 19b30c2c | 2017-06-01 03:21:40 | [diff] [blame] | 332 | // Ensure items use the app icon and window icon aura::Window properties. |
| 333 | TEST_F(ShelfWindowWatcherTest, ItemIcon) { |
msw | 19b30c2c | 2017-06-01 03:21:40 | [diff] [blame] | 334 | // Create a ShelfItem for a window; it should have a default icon. |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 335 | EXPECT_EQ(1, model_->item_count()); |
msw | 19b30c2c | 2017-06-01 03:21:40 | [diff] [blame] | 336 | std::unique_ptr<views::Widget> widget = |
| 337 | CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); |
| 338 | aura::Window* window = widget->GetNativeWindow(); |
| 339 | ShelfID id = CreateShelfItem(window); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 340 | EXPECT_EQ(2, model_->item_count()); |
msw | 19b30c2c | 2017-06-01 03:21:40 | [diff] [blame] | 341 | ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); |
| 342 | gfx::Image default_image = rb.GetImageNamed(IDR_DEFAULT_FAVICON_32); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 343 | EXPECT_TRUE(model_->items()[1].image.BackedBySameObjectAs( |
msw | 19b30c2c | 2017-06-01 03:21:40 | [diff] [blame] | 344 | default_image.AsImageSkia())); |
| 345 | |
| 346 | // Setting a window icon should update the item icon. |
| 347 | const gfx::ImageSkia red = CreateImageSkiaIcon(SK_ColorRED); |
| 348 | window->SetProperty(aura::client::kWindowIconKey, new gfx::ImageSkia(red)); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 349 | EXPECT_EQ(SK_ColorRED, model_->items()[1].image.bitmap()->getColor(0, 0)); |
msw | 19b30c2c | 2017-06-01 03:21:40 | [diff] [blame] | 350 | |
| 351 | // Setting an app icon should override the window icon. |
| 352 | const gfx::ImageSkia blue = CreateImageSkiaIcon(SK_ColorBLUE); |
| 353 | window->SetProperty(aura::client::kAppIconKey, new gfx::ImageSkia(blue)); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 354 | EXPECT_EQ(SK_ColorBLUE, model_->items()[1].image.bitmap()->getColor(0, 0)); |
msw | 19b30c2c | 2017-06-01 03:21:40 | [diff] [blame] | 355 | |
| 356 | // Clearing the app icon should restore the window icon to the shelf item. |
| 357 | window->ClearProperty(aura::client::kAppIconKey); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 358 | EXPECT_EQ(SK_ColorRED, model_->items()[1].image.bitmap()->getColor(0, 0)); |
msw | 19b30c2c | 2017-06-01 03:21:40 | [diff] [blame] | 359 | } |
| 360 | |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 361 | TEST_F(ShelfWindowWatcherTest, DontCreateShelfEntriesForChildWindows) { |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 362 | EXPECT_EQ(1, model_->item_count()); |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 363 | std::unique_ptr<aura::Window> window = |
Mitsuru Oshima | 04b54d0 | 2017-10-09 14:22:45 | [diff] [blame^] | 364 | std::make_unique<aura::Window>(nullptr, aura::client::WINDOW_TYPE_NORMAL); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 365 | window->Init(ui::LAYER_NOT_DRAWN); |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 366 | window->SetProperty(kShelfIDKey, new std::string(ShelfID("a").Serialize())); |
| 367 | window->SetProperty(kShelfItemTypeKey, static_cast<int32_t>(TYPE_DIALOG)); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 368 | Shell::GetPrimaryRootWindow() |
| 369 | ->GetChildById(kShellWindowId_DefaultContainer) |
| 370 | ->AddChild(window.get()); |
| 371 | window->Show(); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 372 | EXPECT_EQ(2, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 373 | |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 374 | std::unique_ptr<aura::Window> child = |
Mitsuru Oshima | 04b54d0 | 2017-10-09 14:22:45 | [diff] [blame^] | 375 | std::make_unique<aura::Window>(nullptr, aura::client::WINDOW_TYPE_NORMAL); |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 376 | child->Init(ui::LAYER_NOT_DRAWN); |
| 377 | child->SetProperty(kShelfIDKey, new std::string(ShelfID("b").Serialize())); |
| 378 | child->SetProperty(kShelfItemTypeKey, static_cast<int32_t>(TYPE_DIALOG)); |
| 379 | window->AddChild(child.get()); |
| 380 | child->Show(); |
| 381 | // There should not be a new shelf item for |child|. |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 382 | EXPECT_EQ(2, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 383 | |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 384 | child.reset(); |
Michael Wasserman | 78b6f3e | 2017-07-20 19:51:20 | [diff] [blame] | 385 | EXPECT_EQ(2, model_->item_count()); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 386 | window.reset(); |
| 387 | EXPECT_EQ(1, model_->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 388 | } |
| 389 | |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 390 | TEST_F(ShelfWindowWatcherTest, CreateShelfEntriesForTransientWindows) { |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 391 | EXPECT_EQ(1, model_->item_count()); |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 392 | std::unique_ptr<aura::Window> window = |
Mitsuru Oshima | 04b54d0 | 2017-10-09 14:22:45 | [diff] [blame^] | 393 | std::make_unique<aura::Window>(nullptr, aura::client::WINDOW_TYPE_NORMAL); |
msw | 70ac45f | 2017-06-05 02:02:45 | [diff] [blame] | 394 | window->Init(ui::LAYER_NOT_DRAWN); |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 395 | window->SetProperty(kShelfIDKey, new std::string(ShelfID("a").Serialize())); |
| 396 | window->SetProperty(kShelfItemTypeKey, static_cast<int32_t>(TYPE_DIALOG)); |
msw | 70ac45f | 2017-06-05 02:02:45 | [diff] [blame] | 397 | Shell::GetPrimaryRootWindow() |
| 398 | ->GetChildById(kShellWindowId_DefaultContainer) |
| 399 | ->AddChild(window.get()); |
| 400 | window->Show(); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 401 | EXPECT_EQ(2, model_->item_count()); |
msw | 70ac45f | 2017-06-05 02:02:45 | [diff] [blame] | 402 | |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 403 | std::unique_ptr<aura::Window> transient = |
Mitsuru Oshima | 04b54d0 | 2017-10-09 14:22:45 | [diff] [blame^] | 404 | std::make_unique<aura::Window>(nullptr, aura::client::WINDOW_TYPE_NORMAL); |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 405 | transient->Init(ui::LAYER_NOT_DRAWN); |
| 406 | transient->SetProperty(kShelfIDKey, |
| 407 | new std::string(ShelfID("b").Serialize())); |
| 408 | transient->SetProperty(kShelfItemTypeKey, static_cast<int32_t>(TYPE_DIALOG)); |
| 409 | Shell::GetPrimaryRootWindow() |
| 410 | ->GetChildById(kShellWindowId_DefaultContainer) |
| 411 | ->AddChild(transient.get()); |
| 412 | ::wm::TransientWindowController::Get()->AddTransientChild(window.get(), |
| 413 | transient.get()); |
| 414 | transient->Show(); |
| 415 | // There should be a new shelf item for |transient|. |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 416 | EXPECT_EQ(3, model_->item_count()); |
msw | 70ac45f | 2017-06-05 02:02:45 | [diff] [blame] | 417 | |
msw | feae432 | 2017-06-08 04:24:22 | [diff] [blame] | 418 | transient.reset(); |
Michael Wasserman | 78b6f3e | 2017-07-20 19:51:20 | [diff] [blame] | 419 | EXPECT_EQ(2, model_->item_count()); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 420 | window.reset(); |
| 421 | EXPECT_EQ(1, model_->item_count()); |
msw | 70ac45f | 2017-06-05 02:02:45 | [diff] [blame] | 422 | } |
| 423 | |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 424 | // Ensures ShelfWindowWatcher supports windows opened prior to session start. |
James Cook | 317781a | 2017-07-18 02:08:06 | [diff] [blame] | 425 | using ShelfWindowWatcherSessionStartTest = NoSessionAshTestBase; |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 426 | TEST_F(ShelfWindowWatcherSessionStartTest, PreExistingWindow) { |
| 427 | ShelfModel* model = Shell::Get()->shelf_model(); |
| 428 | ASSERT_FALSE( |
| 429 | Shell::Get()->session_controller()->IsActiveUserSessionStarted()); |
| 430 | |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 431 | // ShelfModel creates an app list item. |
| 432 | EXPECT_EQ(1, model->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 433 | |
| 434 | // Construct a window that should get a shelf item once the session starts. |
| 435 | std::unique_ptr<views::Widget> widget = |
| 436 | CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); |
msw | 6958e7f | 2017-05-15 22:55:06 | [diff] [blame] | 437 | ShelfWindowWatcherTest::CreateShelfItem(widget->GetNativeWindow()); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 438 | EXPECT_EQ(1, model->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 439 | |
| 440 | // Start the test user session; ShelfWindowWatcher will find the open window. |
Xiyuan Xia | ffbc9203 | 2017-08-21 18:36:13 | [diff] [blame] | 441 | CreateUserSessions(1); |
Mike Wasserman | 717cd57 | 2017-09-23 17:01:40 | [diff] [blame] | 442 | EXPECT_EQ(2, model->item_count()); |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 443 | } |
| 444 | |
msw | 19b30c2c | 2017-06-01 03:21:40 | [diff] [blame] | 445 | } // namespace |
James Cook | b0bf8e8 | 2017-04-09 17:01:44 | [diff] [blame] | 446 | } // namespace ash |