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/system/tray/system_tray.h" | 5 #include "ash/system/tray/system_tray.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "ash/accessibility_delegate.h" | 9 #include "ash/common/accessibility_delegate.h" |
10 #include "ash/root_window_controller.h" | 10 #include "ash/root_window_controller.h" |
11 #include "ash/shelf/shelf.h" | 11 #include "ash/shelf/shelf.h" |
12 #include "ash/shelf/shelf_widget.h" | 12 #include "ash/shelf/shelf_widget.h" |
13 #include "ash/shell.h" | 13 #include "ash/shell.h" |
14 #include "ash/system/status_area_widget.h" | 14 #include "ash/system/status_area_widget.h" |
15 #include "ash/system/tray/system_tray_bubble.h" | 15 #include "ash/system/tray/system_tray_bubble.h" |
16 #include "ash/system/tray/system_tray_item.h" | 16 #include "ash/system/tray/system_tray_item.h" |
17 #include "ash/system/tray/tray_constants.h" | 17 #include "ash/system/tray/tray_constants.h" |
18 #include "ash/system/tray/tray_popup_item_container.h" | 18 #include "ash/system/tray/tray_popup_item_container.h" |
19 #include "ash/system/web_notification/web_notification_tray.h" | 19 #include "ash/system/web_notification/web_notification_tray.h" |
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
569 // Hide the default view, ensure the system tray height is back to zero. | 569 // Hide the default view, ensure the system tray height is back to zero. |
570 ASSERT_TRUE(tray->CloseSystemBubble()); | 570 ASSERT_TRUE(tray->CloseSystemBubble()); |
571 RunAllPendingInMessageLoop(); | 571 RunAllPendingInMessageLoop(); |
572 | 572 |
573 EXPECT_EQ(0, notification_tray->system_tray_height_for_test()); | 573 EXPECT_EQ(0, notification_tray->system_tray_height_for_test()); |
574 } | 574 } |
575 #endif // OS_CHROMEOS | 575 #endif // OS_CHROMEOS |
576 | 576 |
577 } // namespace test | 577 } // namespace test |
578 } // namespace ash | 578 } // namespace ash |
OLD | NEW |