| 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_button.h" |
| 9 #include "ash/common/shelf/shelf_model.h" | 10 #include "ash/common/shelf/shelf_model.h" |
| 10 #include "ash/shelf/shelf_button.h" | |
| 11 #include "ash/shelf/shelf_view.h" | 11 #include "ash/shelf/shelf_view.h" |
| 12 #include "ash/shelf/shelf_widget.h" | 12 #include "ash/shelf/shelf_widget.h" |
| 13 #include "ash/test/ash_test_base.h" | 13 #include "ash/test/ash_test_base.h" |
| 14 #include "ash/test/shelf_test_api.h" | 14 #include "ash/test/shelf_test_api.h" |
| 15 #include "ash/test/shelf_view_test_api.h" | 15 #include "ash/test/shelf_view_test_api.h" |
| 16 #include "ash/test/test_shelf_item_delegate.h" | 16 #include "ash/test/test_shelf_item_delegate.h" |
| 17 #include "ash/wm/window_util.h" | 17 #include "ash/wm/window_util.h" |
| 18 #include "ui/aura/window_event_dispatcher.h" | 18 #include "ui/aura/window_event_dispatcher.h" |
| 19 #include "ui/views/view.h" | 19 #include "ui/views/view.h" |
| 20 #include "ui/views/widget/widget.h" | 20 #include "ui/views/widget/widget.h" |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 | 128 |
| 129 // Removes the first item in main shelf view. | 129 // Removes the first item in main shelf view. |
| 130 shelf_model()->RemoveItemAt(shelf_model()->ItemIndexByID(first_item_id)); | 130 shelf_model()->RemoveItemAt(shelf_model()->ItemIndexByID(first_item_id)); |
| 131 | 131 |
| 132 // Waits for all transitions to finish and there should be no crash. | 132 // Waits for all transitions to finish and there should be no crash. |
| 133 test_api()->RunMessageLoopUntilAnimationsDone(); | 133 test_api()->RunMessageLoopUntilAnimationsDone(); |
| 134 EXPECT_FALSE(shelf()->IsShowingOverflowBubble()); | 134 EXPECT_FALSE(shelf()->IsShowingOverflowBubble()); |
| 135 } | 135 } |
| 136 | 136 |
| 137 } // namespace ash | 137 } // namespace ash |
| OLD | NEW |