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

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

Issue 2675983003: views::Separator cleanup. (Closed)
Patch Set: 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 14 matching lines...) Expand all
25 #include "ash/test/status_area_widget_test_helper.h" 25 #include "ash/test/status_area_widget_test_helper.h"
26 #include "ash/test/test_system_tray_item.h" 26 #include "ash/test/test_system_tray_item.h"
27 #include "base/memory/ptr_util.h" 27 #include "base/memory/ptr_util.h"
28 #include "base/run_loop.h" 28 #include "base/run_loop.h"
29 #include "base/test/histogram_tester.h" 29 #include "base/test/histogram_tester.h"
30 #include "ui/base/ui_base_types.h" 30 #include "ui/base/ui_base_types.h"
31 #include "ui/compositor/scoped_animation_duration_scale_mode.h" 31 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
32 #include "ui/events/test/event_generator.h" 32 #include "ui/events/test/event_generator.h"
33 #include "ui/gfx/geometry/point.h" 33 #include "ui/gfx/geometry/point.h"
34 #include "ui/gfx/geometry/rect.h" 34 #include "ui/gfx/geometry/rect.h"
35 #include "ui/views/controls/separator.h"
35 #include "ui/views/view.h" 36 #include "ui/views/view.h"
36 #include "ui/views/widget/widget.h" 37 #include "ui/views/widget/widget.h"
37 #include "ui/views/widget/widget_delegate.h" 38 #include "ui/views/widget/widget_delegate.h"
38 39
39 namespace ash { 40 namespace ash {
40 namespace test { 41 namespace test {
41 42
42 namespace { 43 namespace {
43 44
44 const char kVisibleRowsHistogramName[] = 45 const char kVisibleRowsHistogramName[] =
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 RunAllPendingInMessageLoop(); 638 RunAllPendingInMessageLoop();
638 EXPECT_LT(0, notification_tray->tray_bubble_height_for_test()); 639 EXPECT_LT(0, notification_tray->tray_bubble_height_for_test());
639 640
640 // Hide the default view, ensure the tray bubble height is back to zero. 641 // Hide the default view, ensure the tray bubble height is back to zero.
641 ASSERT_TRUE(tray->CloseSystemBubble()); 642 ASSERT_TRUE(tray->CloseSystemBubble());
642 RunAllPendingInMessageLoop(); 643 RunAllPendingInMessageLoop();
643 644
644 EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test()); 645 EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test());
645 } 646 }
646 647
648 TEST_F(SystemTrayTest, SeparatorThickness) {
649 EXPECT_EQ(kSeparatorWidth, views::Separator::kThickness);
650 }
651
647 } // namespace test 652 } // namespace test
648 } // namespace ash 653 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698