OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/system/tray/system_tray.h" | 5 #include "ash/common/system/tray/system_tray.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/common/accelerators/accelerator_controller.h" | 10 #include "ash/common/accelerators/accelerator_controller.h" |
11 #include "ash/common/accessibility_delegate.h" | 11 #include "ash/common/accessibility_delegate.h" |
12 #include "ash/common/shelf/wm_shelf.h" | 12 #include "ash/common/shelf/wm_shelf.h" |
13 #include "ash/common/shell_window_ids.h" | |
14 #include "ash/common/system/status_area_widget.h" | 13 #include "ash/common/system/status_area_widget.h" |
15 #include "ash/common/system/tray/system_tray_bubble.h" | 14 #include "ash/common/system/tray/system_tray_bubble.h" |
16 #include "ash/common/system/tray/system_tray_item.h" | 15 #include "ash/common/system/tray/system_tray_item.h" |
17 #include "ash/common/system/tray/tray_constants.h" | 16 #include "ash/common/system/tray/tray_constants.h" |
18 #include "ash/common/system/tray/tray_popup_item_container.h" | 17 #include "ash/common/system/tray/tray_popup_item_container.h" |
19 #include "ash/common/system/web_notification/web_notification_tray.h" | 18 #include "ash/common/system/web_notification/web_notification_tray.h" |
20 #include "ash/common/wm_root_window_controller.h" | 19 #include "ash/common/wm_root_window_controller.h" |
21 #include "ash/common/wm_shell.h" | 20 #include "ash/common/wm_shell.h" |
22 #include "ash/common/wm_window.h" | 21 #include "ash/common/wm_window.h" |
| 22 #include "ash/public/cpp/shell_window_ids.h" |
23 #include "ash/test/ash_test_base.h" | 23 #include "ash/test/ash_test_base.h" |
24 #include "ash/test/status_area_widget_test_helper.h" | 24 #include "ash/test/status_area_widget_test_helper.h" |
25 #include "ash/test/test_system_tray_item.h" | 25 #include "ash/test/test_system_tray_item.h" |
26 #include "base/run_loop.h" | 26 #include "base/run_loop.h" |
27 #include "base/test/histogram_tester.h" | 27 #include "base/test/histogram_tester.h" |
28 #include "ui/base/ui_base_types.h" | 28 #include "ui/base/ui_base_types.h" |
29 #include "ui/compositor/scoped_animation_duration_scale_mode.h" | 29 #include "ui/compositor/scoped_animation_duration_scale_mode.h" |
30 #include "ui/events/test/event_generator.h" | 30 #include "ui/events/test/event_generator.h" |
31 #include "ui/gfx/geometry/point.h" | 31 #include "ui/gfx/geometry/point.h" |
32 #include "ui/gfx/geometry/rect.h" | 32 #include "ui/gfx/geometry/rect.h" |
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
639 // Hide the default view, ensure the tray bubble height is back to zero. | 639 // Hide the default view, ensure the tray bubble height is back to zero. |
640 ASSERT_TRUE(tray->CloseSystemBubble()); | 640 ASSERT_TRUE(tray->CloseSystemBubble()); |
641 RunAllPendingInMessageLoop(); | 641 RunAllPendingInMessageLoop(); |
642 | 642 |
643 EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test()); | 643 EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test()); |
644 } | 644 } |
645 #endif // OS_CHROMEOS | 645 #endif // OS_CHROMEOS |
646 | 646 |
647 } // namespace test | 647 } // namespace test |
648 } // namespace ash | 648 } // namespace ash |
OLD | NEW |