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/shell_window_ids.h" | |
10 #include "ash/common/wm/window_resizer.h" | 9 #include "ash/common/wm/window_resizer.h" |
11 #include "ash/common/wm/window_state.h" | 10 #include "ash/common/wm/window_state.h" |
12 #include "ash/common/wm_lookup.h" | 11 #include "ash/common/wm_lookup.h" |
13 #include "ash/common/wm_shell.h" | 12 #include "ash/common/wm_shell.h" |
14 #include "ash/common/wm_window.h" | 13 #include "ash/common/wm_window.h" |
15 #include "ash/common/wm_window_property.h" | 14 #include "ash/common/wm_window_property.h" |
| 15 #include "ash/public/cpp/shell_window_ids.h" |
16 #include "ash/test/ash_test_base.h" | 16 #include "ash/test/ash_test_base.h" |
17 #include "ui/base/hit_test.h" | 17 #include "ui/base/hit_test.h" |
18 #include "ui/views/widget/widget.h" | 18 #include "ui/views/widget/widget.h" |
19 | 19 |
20 namespace ash { | 20 namespace ash { |
21 | 21 |
22 class ShelfWindowWatcherTest : public test::AshTestBase { | 22 class ShelfWindowWatcherTest : public test::AshTestBase { |
23 public: | 23 public: |
24 ShelfWindowWatcherTest() : model_(nullptr) {} | 24 ShelfWindowWatcherTest() : model_(nullptr) {} |
25 ~ShelfWindowWatcherTest() override {} | 25 ~ShelfWindowWatcherTest() override {} |
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
262 ASSERT_TRUE(resizer.get()); | 262 ASSERT_TRUE(resizer.get()); |
263 resizer->Drag(gfx::Point(50, 50), 0); | 263 resizer->Drag(gfx::Point(50, 50), 0); |
264 resizer->CompleteDrag(); | 264 resizer->CompleteDrag(); |
265 | 265 |
266 // Index and id are not changed after dragging a |window|. | 266 // Index and id are not changed after dragging a |window|. |
267 EXPECT_EQ(index, model_->ItemIndexByID(id)); | 267 EXPECT_EQ(index, model_->ItemIndexByID(id)); |
268 EXPECT_EQ(id, model_->items()[index].id); | 268 EXPECT_EQ(id, model_->items()[index].id); |
269 } | 269 } |
270 | 270 |
271 } // namespace ash | 271 } // namespace ash |
OLD | NEW |