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/shelf/shelf.h" | 5 #include "ash/shelf/shelf.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
| 9 #include "ash/common/shelf/shelf_item_delegate_manager.h" |
| 10 #include "ash/common/shelf/shelf_model.h" |
9 #include "ash/shelf/shelf_button.h" | 11 #include "ash/shelf/shelf_button.h" |
10 #include "ash/shelf/shelf_item_delegate_manager.h" | |
11 #include "ash/shelf/shelf_model.h" | |
12 #include "ash/shelf/shelf_view.h" | 12 #include "ash/shelf/shelf_view.h" |
13 #include "ash/shelf/shelf_widget.h" | 13 #include "ash/shelf/shelf_widget.h" |
14 #include "ash/shell.h" | 14 #include "ash/shell.h" |
15 #include "ash/test/ash_test_base.h" | 15 #include "ash/test/ash_test_base.h" |
16 #include "ash/test/shelf_test_api.h" | 16 #include "ash/test/shelf_test_api.h" |
17 #include "ash/test/shelf_view_test_api.h" | 17 #include "ash/test/shelf_view_test_api.h" |
18 #include "ash/test/test_shelf_item_delegate.h" | 18 #include "ash/test/test_shelf_item_delegate.h" |
19 #include "ash/wm/window_util.h" | 19 #include "ash/wm/window_util.h" |
20 #include "ui/aura/window_event_dispatcher.h" | 20 #include "ui/aura/window_event_dispatcher.h" |
21 #include "ui/views/view.h" | 21 #include "ui/views/view.h" |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
154 | 154 |
155 // Removes the first item in main shelf view. | 155 // Removes the first item in main shelf view. |
156 shelf_model()->RemoveItemAt(shelf_model()->ItemIndexByID(first_item_id)); | 156 shelf_model()->RemoveItemAt(shelf_model()->ItemIndexByID(first_item_id)); |
157 | 157 |
158 // Waits for all transitions to finish and there should be no crash. | 158 // Waits for all transitions to finish and there should be no crash. |
159 test_api()->RunMessageLoopUntilAnimationsDone(); | 159 test_api()->RunMessageLoopUntilAnimationsDone(); |
160 EXPECT_FALSE(shelf()->IsShowingOverflowBubble()); | 160 EXPECT_FALSE(shelf()->IsShowingOverflowBubble()); |
161 } | 161 } |
162 | 162 |
163 } // namespace ash | 163 } // namespace ash |
OLD | NEW |