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

Side by Side Diff: ash/common/system/date/system_info_default_view_unittest.cc

Issue 2692663002: Gut ash::MaterialDesignController, and remove the about:flags entry. (Closed)
Patch Set: yet another rebase 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/date/system_info_default_view.h" 5 #include "ash/common/system/date/system_info_default_view.h"
6 #include "ash/common/system/tray/tray_constants.h" 6 #include "ash/common/system/tray/tray_constants.h"
7 #include "ash/common/test/material_design_controller_test_api.h"
8 #include "testing/gtest/include/gtest/gtest.h" 7 #include "testing/gtest/include/gtest/gtest.h"
9 #include "ui/views/view.h" 8 #include "ui/views/view.h"
10 9
11 namespace ash { 10 namespace ash {
12 11
13 class SystemInfoDefaultViewTest : public testing::Test { 12 class SystemInfoDefaultViewTest : public testing::Test {
14 public: 13 public:
15 SystemInfoDefaultViewTest() {} 14 SystemInfoDefaultViewTest() {}
16 15
17 protected: 16 protected:
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 TEST_F(SystemInfoDefaultViewTest, PreferredWidthGreaterThanThreeButtonWidths) { 68 TEST_F(SystemInfoDefaultViewTest, PreferredWidthGreaterThanThreeButtonWidths) {
70 const int kPreferredWidth = 69 const int kPreferredWidth =
71 kMenuButtonSize + (kSeparatorWidth + kMenuButtonSize) * 2 + 1; 70 kMenuButtonSize + (kSeparatorWidth + kMenuButtonSize) * 2 + 1;
72 const int effective_width = CalculateDateViewWidth(kPreferredWidth); 71 const int effective_width = CalculateDateViewWidth(kPreferredWidth);
73 72
74 EXPECT_EQ(effective_width, 73 EXPECT_EQ(effective_width,
75 kMenuButtonSize + (kSeparatorWidth + kMenuButtonSize) * 2); 74 kMenuButtonSize + (kSeparatorWidth + kMenuButtonSize) * 2);
76 } 75 }
77 76
78 } // namespace ash 77 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/chromeos/power/power_status_view_unittest.cc ('k') | ash/common/system/tray/tray_constants.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698