Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: ash/common/system/tray/system_tray_unittest.cc

Issue 2675983003: views::Separator cleanup. (Closed)
Patch Set: revert test change Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 13 matching lines...) Expand all
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/memory/ptr_util.h" 26 #include "base/memory/ptr_util.h"
27 #include "base/run_loop.h" 27 #include "base/run_loop.h"
28 #include "base/test/histogram_tester.h" 28 #include "base/test/histogram_tester.h"
29 #include "ui/base/ui_base_types.h" 29 #include "ui/base/ui_base_types.h"
30 #include "ui/compositor/scoped_animation_duration_scale_mode.h" 30 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
31 #include "ui/events/test/event_generator.h" 31 #include "ui/events/test/event_generator.h"
32 #include "ui/gfx/geometry/point.h" 32 #include "ui/gfx/geometry/point.h"
33 #include "ui/gfx/geometry/rect.h" 33 #include "ui/gfx/geometry/rect.h"
34 #include "ui/views/controls/separator.h"
34 #include "ui/views/view.h" 35 #include "ui/views/view.h"
35 #include "ui/views/widget/widget.h" 36 #include "ui/views/widget/widget.h"
36 #include "ui/views/widget/widget_delegate.h" 37 #include "ui/views/widget/widget_delegate.h"
37 38
38 namespace ash { 39 namespace ash {
39 namespace test { 40 namespace test {
40 41
41 namespace { 42 namespace {
42 43
43 const char kVisibleRowsHistogramName[] = 44 const char kVisibleRowsHistogramName[] =
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 RunAllPendingInMessageLoop(); 574 RunAllPendingInMessageLoop();
574 EXPECT_LT(0, notification_tray->tray_bubble_height_for_test()); 575 EXPECT_LT(0, notification_tray->tray_bubble_height_for_test());
575 576
576 // Hide the default view, ensure the tray bubble height is back to zero. 577 // Hide the default view, ensure the tray bubble height is back to zero.
577 ASSERT_TRUE(tray->CloseSystemBubble()); 578 ASSERT_TRUE(tray->CloseSystemBubble());
578 RunAllPendingInMessageLoop(); 579 RunAllPendingInMessageLoop();
579 580
580 EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test()); 581 EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test());
581 } 582 }
582 583
584 TEST_F(SystemTrayTest, SeparatorThickness) {
585 EXPECT_EQ(kSeparatorWidth, views::Separator::kThickness);
586 }
587
583 } // namespace test 588 } // namespace test
584 } // namespace ash 589 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/tray/special_popup_row.cc ('k') | ash/common/system/tray/tray_background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698