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 <utility> | 5 #include <utility> |
6 | 6 |
| 7 #include "ash/shelf/shelf.h" |
7 #include "ash/shelf/shelf_button.h" | 8 #include "ash/shelf/shelf_button.h" |
8 #include "ash/shelf/shelf_model.h" | 9 #include "ash/shelf/shelf_model.h" |
9 #include "ash/shelf/shelf_view.h" | 10 #include "ash/shelf/shelf_view.h" |
10 #include "ash/shelf/shelf_widget.h" | 11 #include "ash/shelf/shelf_widget.h" |
11 #include "ash/shelf/wm_shelf.h" | |
12 #include "ash/test/ash_test_base.h" | 12 #include "ash/test/ash_test_base.h" |
13 #include "ash/test/shelf_view_test_api.h" | 13 #include "ash/test/shelf_view_test_api.h" |
14 #include "base/strings/string_number_conversions.h" | 14 #include "base/strings/string_number_conversions.h" |
15 | 15 |
16 namespace ash { | 16 namespace ash { |
17 | 17 |
18 class ShelfTest : public test::AshTestBase { | 18 class ShelfTest : public test::AshTestBase { |
19 public: | 19 public: |
20 ShelfTest() : shelf_model_(nullptr) {} | 20 ShelfTest() : shelf_model_(nullptr) {} |
21 | 21 |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 // Remove one of the first items in the main shelf view. | 104 // Remove one of the first items in the main shelf view. |
105 ASSERT_GT(shelf_model()->item_count(), 1); | 105 ASSERT_GT(shelf_model()->item_count(), 1); |
106 shelf_model()->RemoveItemAt(1); | 106 shelf_model()->RemoveItemAt(1); |
107 | 107 |
108 // Waits for all transitions to finish and there should be no crash. | 108 // Waits for all transitions to finish and there should be no crash. |
109 test_api()->RunMessageLoopUntilAnimationsDone(); | 109 test_api()->RunMessageLoopUntilAnimationsDone(); |
110 EXPECT_FALSE(shelf_widget->IsShowingOverflowBubble()); | 110 EXPECT_FALSE(shelf_widget->IsShowingOverflowBubble()); |
111 } | 111 } |
112 | 112 |
113 } // namespace ash | 113 } // namespace ash |
OLD | NEW |