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