| 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/common/accessibility_delegate.h" | 9 #include "ash/common/accessibility_delegate.h" |
| 10 #include "ash/common/system/tray/system_tray_item.h" | 10 #include "ash/common/system/tray/system_tray_item.h" |
| 11 #include "ash/common/system/tray/tray_constants.h" | 11 #include "ash/common/system/tray/tray_constants.h" |
| 12 #include "ash/common/system/tray/tray_popup_item_container.h" | 12 #include "ash/common/system/tray/tray_popup_item_container.h" |
| 13 #include "ash/root_window_controller.h" | |
| 14 #include "ash/shelf/shelf.h" | 13 #include "ash/shelf/shelf.h" |
| 15 #include "ash/shell.h" | 14 #include "ash/shell.h" |
| 16 #include "ash/system/status_area_widget.h" | 15 #include "ash/system/status_area_widget.h" |
| 17 #include "ash/system/tray/system_tray_bubble.h" | 16 #include "ash/system/tray/system_tray_bubble.h" |
| 18 #include "ash/system/web_notification/web_notification_tray.h" | 17 #include "ash/system/web_notification/web_notification_tray.h" |
| 19 #include "ash/test/ash_test_base.h" | 18 #include "ash/test/ash_test_base.h" |
| 20 #include "ash/test/status_area_widget_test_helper.h" | 19 #include "ash/test/status_area_widget_test_helper.h" |
| 21 #include "ash/wm/window_util.h" | 20 #include "ash/wm/window_util.h" |
| 22 #include "base/run_loop.h" | 21 #include "base/run_loop.h" |
| 23 #include "base/strings/utf_string_conversions.h" | 22 #include "base/strings/utf_string_conversions.h" |
| (...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 548 // Hide the default view, ensure the system tray height is back to zero. | 547 // Hide the default view, ensure the system tray height is back to zero. |
| 549 ASSERT_TRUE(tray->CloseSystemBubble()); | 548 ASSERT_TRUE(tray->CloseSystemBubble()); |
| 550 RunAllPendingInMessageLoop(); | 549 RunAllPendingInMessageLoop(); |
| 551 | 550 |
| 552 EXPECT_EQ(0, notification_tray->system_tray_height_for_test()); | 551 EXPECT_EQ(0, notification_tray->system_tray_height_for_test()); |
| 553 } | 552 } |
| 554 #endif // OS_CHROMEOS | 553 #endif // OS_CHROMEOS |
| 555 | 554 |
| 556 } // namespace test | 555 } // namespace test |
| 557 } // namespace ash | 556 } // namespace ash |
| OLD | NEW |