OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 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 | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/common/shelf/shelf_window_watcher.h" | 5 #include "ash/common/shelf/shelf_window_watcher.h" |
6 | 6 |
7 #include "ash/common/shelf/shelf_item_types.h" | 7 #include "ash/common/shelf/shelf_item_types.h" |
8 #include "ash/common/shelf/shelf_model.h" | 8 #include "ash/common/shelf/shelf_model.h" |
9 #include "ash/common/wm/window_resizer.h" | 9 #include "ash/common/wm/window_resizer.h" |
10 #include "ash/common/wm/window_state.h" | 10 #include "ash/common/wm/window_state.h" |
11 #include "ash/common/wm_lookup.h" | 11 #include "ash/common/wm_lookup.h" |
| 12 #include "ash/common/wm_root_window_controller.h" |
12 #include "ash/common/wm_shell.h" | 13 #include "ash/common/wm_shell.h" |
13 #include "ash/common/wm_window.h" | 14 #include "ash/common/wm_window.h" |
14 #include "ash/common/wm_window_property.h" | 15 #include "ash/common/wm_window_property.h" |
15 #include "ash/public/cpp/shell_window_ids.h" | 16 #include "ash/public/cpp/shell_window_ids.h" |
16 #include "ash/test/ash_test_base.h" | 17 #include "ash/test/ash_test_base.h" |
17 #include "ui/base/hit_test.h" | 18 #include "ui/base/hit_test.h" |
18 #include "ui/views/widget/widget.h" | 19 #include "ui/views/widget/widget.h" |
19 | 20 |
20 namespace ash { | 21 namespace ash { |
21 | 22 |
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
261 window, gfx::Point(), HTCAPTION, aura::client::WINDOW_MOVE_SOURCE_MOUSE)); | 262 window, gfx::Point(), HTCAPTION, aura::client::WINDOW_MOVE_SOURCE_MOUSE)); |
262 ASSERT_TRUE(resizer.get()); | 263 ASSERT_TRUE(resizer.get()); |
263 resizer->Drag(gfx::Point(50, 50), 0); | 264 resizer->Drag(gfx::Point(50, 50), 0); |
264 resizer->CompleteDrag(); | 265 resizer->CompleteDrag(); |
265 | 266 |
266 // Index and id are not changed after dragging a |window|. | 267 // Index and id are not changed after dragging a |window|. |
267 EXPECT_EQ(index, model_->ItemIndexByID(id)); | 268 EXPECT_EQ(index, model_->ItemIndexByID(id)); |
268 EXPECT_EQ(id, model_->items()[index].id); | 269 EXPECT_EQ(id, model_->items()[index].id); |
269 } | 270 } |
270 | 271 |
| 272 // Ensure shelf items are added and removed as panels are opened and closed. |
| 273 TEST_F(ShelfWindowWatcherTest, PanelWindow) { |
| 274 // ShelfModel only has an APP_LIST item. |
| 275 EXPECT_EQ(1, model_->item_count()); |
| 276 |
| 277 // Adding windows with valid ShelfItemType properties adds shelf items. |
| 278 std::unique_ptr<views::Widget> widget1 = |
| 279 CreateTestWidget(nullptr, kShellWindowId_PanelContainer, gfx::Rect()); |
| 280 WmWindow* window1 = WmLookup::Get()->GetWindowForWidget(widget1.get()); |
| 281 window1->SetIntProperty(WmWindowProperty::SHELF_ITEM_TYPE, TYPE_APP_PANEL); |
| 282 EXPECT_EQ(2, model_->item_count()); |
| 283 std::unique_ptr<views::Widget> widget2 = |
| 284 CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); |
| 285 WmWindow* window2 = WmLookup::Get()->GetWindowForWidget(widget2.get()); |
| 286 window2->SetIntProperty(WmWindowProperty::SHELF_ITEM_TYPE, TYPE_APP_PANEL); |
| 287 EXPECT_EQ(3, model_->item_count()); |
| 288 |
| 289 // Create a panel-type widget to mimic Chrome's app panel windows. |
| 290 views::Widget panel_widget; |
| 291 views::Widget::InitParams panel_params(views::Widget::InitParams::TYPE_PANEL); |
| 292 panel_params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |
| 293 WmShell::Get() |
| 294 ->GetPrimaryRootWindow() |
| 295 ->GetRootWindowController() |
| 296 ->ConfigureWidgetInitParamsForContainer( |
| 297 &panel_widget, kShellWindowId_PanelContainer, &panel_params); |
| 298 panel_widget.Init(panel_params); |
| 299 panel_widget.Show(); |
| 300 WmWindow* panel_window = WmLookup::Get()->GetWindowForWidget(&panel_widget); |
| 301 panel_window->SetIntProperty(WmWindowProperty::SHELF_ITEM_TYPE, |
| 302 TYPE_APP_PANEL); |
| 303 EXPECT_EQ(4, model_->item_count()); |
| 304 |
| 305 // Each ShelfItem is removed when the associated window is destroyed. |
| 306 panel_widget.CloseNow(); |
| 307 EXPECT_EQ(3, model_->item_count()); |
| 308 widget2.reset(); |
| 309 EXPECT_EQ(2, model_->item_count()); |
| 310 widget1.reset(); |
| 311 EXPECT_EQ(1, model_->item_count()); |
| 312 } |
| 313 |
271 } // namespace ash | 314 } // namespace ash |
OLD | NEW |