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 #include "ash/shelf/shelf_button.h" | 6 #include "ash/shelf/shelf_button.h" |
7 #include "ash/shelf/shelf_item_delegate_manager.h" | 7 #include "ash/shelf/shelf_item_delegate_manager.h" |
8 #include "ash/shelf/shelf_model.h" | 8 #include "ash/shelf/shelf_model.h" |
9 #include "ash/shelf/shelf_view.h" | 9 #include "ash/shelf/shelf_view.h" |
10 #include "ash/shelf/shelf_widget.h" | 10 #include "ash/shelf/shelf_widget.h" |
11 #include "ash/shell.h" | 11 #include "ash/shell.h" |
12 #include "ash/test/ash_test_base.h" | 12 #include "ash/test/ash_test_base.h" |
13 #include "ash/test/shelf_test_api.h" | 13 #include "ash/test/shelf_test_api.h" |
14 #include "ash/test/shelf_view_test_api.h" | 14 #include "ash/test/shelf_view_test_api.h" |
15 #include "ash/test/test_shelf_item_delegate.h" | 15 #include "ash/test/test_shelf_item_delegate.h" |
16 #include "ash/wm/window_util.h" | 16 #include "ash/wm/window_util.h" |
17 #include "ui/aura/window_event_dispatcher.h" | 17 #include "ui/aura/window_event_dispatcher.h" |
18 #include "ui/gfx/display.h" | 18 #include "ui/gfx/display.h" |
19 #include "ui/gfx/screen.h" | 19 #include "ui/gfx/screen.h" |
20 #include "ui/views/corewm/corewm_switches.h" | |
21 #include "ui/views/view.h" | 20 #include "ui/views/view.h" |
22 #include "ui/views/widget/widget.h" | 21 #include "ui/views/widget/widget.h" |
23 | 22 |
24 #if defined(OS_WIN) | 23 #if defined(OS_WIN) |
25 #include "base/win/windows_version.h" | 24 #include "base/win/windows_version.h" |
26 #endif | 25 #endif |
27 | 26 |
28 using ash::internal::ShelfView; | 27 using ash::internal::ShelfView; |
29 using ash::internal::ShelfButton; | 28 using ash::internal::ShelfButton; |
30 | 29 |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 | 155 |
157 // Removes the first item in main shelf view. | 156 // Removes the first item in main shelf view. |
158 shelf_model()->RemoveItemAt(shelf_model()->ItemIndexByID(first_item_id)); | 157 shelf_model()->RemoveItemAt(shelf_model()->ItemIndexByID(first_item_id)); |
159 | 158 |
160 // Waits for all transitions to finish and there should be no crash. | 159 // Waits for all transitions to finish and there should be no crash. |
161 test_api()->RunMessageLoopUntilAnimationsDone(); | 160 test_api()->RunMessageLoopUntilAnimationsDone(); |
162 EXPECT_FALSE(shelf()->IsShowingOverflowBubble()); | 161 EXPECT_FALSE(shelf()->IsShowingOverflowBubble()); |
163 } | 162 } |
164 | 163 |
165 } // namespace ash | 164 } // namespace ash |
OLD | NEW |