| 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" |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 | 114 |
| 115 tray->ShowDefaultView(BUBBLE_CREATE_NEW); | 115 tray->ShowDefaultView(BUBBLE_CREATE_NEW); |
| 116 RunAllPendingInMessageLoop(); | 116 RunAllPendingInMessageLoop(); |
| 117 histogram_tester.ExpectBucketCount(kVisibleRowsHistogramName, | 117 histogram_tester.ExpectBucketCount(kVisibleRowsHistogramName, |
| 118 SystemTrayItem::UMA_NOT_RECORDED, 0); | 118 SystemTrayItem::UMA_NOT_RECORDED, 0); |
| 119 | 119 |
| 120 ASSERT_TRUE(tray->CloseSystemBubble()); | 120 ASSERT_TRUE(tray->CloseSystemBubble()); |
| 121 RunAllPendingInMessageLoop(); | 121 RunAllPendingInMessageLoop(); |
| 122 } | 122 } |
| 123 | 123 |
| 124 // TODO(bruthig): Re-enable. See https://crbug.com/665960. |
| 125 #if defined(OS_WIN) |
| 126 #define MAYBE_NullDefaultViewIsNotRecorded DISABLED_NullDefaultViewIsNotRecorded |
| 127 #else |
| 128 #define MAYBE_NullDefaultViewIsNotRecorded NullDefaultViewIsNotRecorded |
| 129 #endif |
| 124 // Verifies null default views are not recorded in the | 130 // Verifies null default views are not recorded in the |
| 125 // "Ash.SystemMenu.DefaultView.VisibleItems" histogram. | 131 // "Ash.SystemMenu.DefaultView.VisibleItems" histogram. |
| 126 TEST_F(SystemTrayTest, NullDefaultViewIsNotRecorded) { | 132 TEST_F(SystemTrayTest, MAYBE_NullDefaultViewIsNotRecorded) { |
| 127 SystemTray* tray = GetPrimarySystemTray(); | 133 SystemTray* tray = GetPrimarySystemTray(); |
| 128 ASSERT_TRUE(tray->GetWidget()); | 134 ASSERT_TRUE(tray->GetWidget()); |
| 129 | 135 |
| 130 TestSystemTrayItem* test_item = new TestSystemTrayItem(); | 136 TestSystemTrayItem* test_item = new TestSystemTrayItem(); |
| 131 test_item->set_has_views(false); | 137 test_item->set_has_views(false); |
| 132 tray->AddTrayItem(test_item); | 138 tray->AddTrayItem(test_item); |
| 133 | 139 |
| 134 base::HistogramTester histogram_tester; | 140 base::HistogramTester histogram_tester; |
| 135 | 141 |
| 136 tray->ShowDefaultView(BUBBLE_CREATE_NEW); | 142 tray->ShowDefaultView(BUBBLE_CREATE_NEW); |
| (...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 655 // Hide the default view, ensure the tray bubble height is back to zero. | 661 // Hide the default view, ensure the tray bubble height is back to zero. |
| 656 ASSERT_TRUE(tray->CloseSystemBubble()); | 662 ASSERT_TRUE(tray->CloseSystemBubble()); |
| 657 RunAllPendingInMessageLoop(); | 663 RunAllPendingInMessageLoop(); |
| 658 | 664 |
| 659 EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test()); | 665 EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test()); |
| 660 } | 666 } |
| 661 #endif // OS_CHROMEOS | 667 #endif // OS_CHROMEOS |
| 662 | 668 |
| 663 } // namespace test | 669 } // namespace test |
| 664 } // namespace ash | 670 } // namespace ash |
| OLD | NEW |