OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/login_status.h" | 5 #include "ash/login_status.h" |
6 #include "ash/common/wm_shell.h" | |
7 #include "ash/shell.h" | 6 #include "ash/shell.h" |
8 #include "ash/system/date/date_default_view.h" | 7 #include "ash/system/date/date_default_view.h" |
9 #include "ash/system/date/date_view.h" | 8 #include "ash/system/date/date_view.h" |
10 #include "ash/system/date/system_info_default_view.h" | 9 #include "ash/system/date/system_info_default_view.h" |
11 #include "ash/system/date/tray_system_info.h" | 10 #include "ash/system/date/tray_system_info.h" |
12 #include "ash/system/tray/system_tray.h" | 11 #include "ash/system/tray/system_tray.h" |
| 12 #include "ash/wm_shell.h" |
13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
14 #include "base/location.h" | 14 #include "base/location.h" |
15 #include "base/macros.h" | 15 #include "base/macros.h" |
16 #include "base/run_loop.h" | 16 #include "base/run_loop.h" |
17 #include "base/single_thread_task_runner.h" | 17 #include "base/single_thread_task_runner.h" |
18 #include "base/threading/thread_task_runner_handle.h" | 18 #include "base/threading/thread_task_runner_handle.h" |
19 #include "chrome/browser/browser_process.h" | 19 #include "chrome/browser/browser_process.h" |
20 #include "chrome/browser/browser_process_platform_part.h" | 20 #include "chrome/browser/browser_process_platform_part.h" |
21 #include "chrome/browser/chromeos/login/ui/login_display_host.h" | 21 #include "chrome/browser/chromeos/login/ui/login_display_host.h" |
22 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" | 22 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 EXPECT_TRUE(CrosSettings::Get()->GetBoolean(kSystemUse24HourClock, | 177 EXPECT_TRUE(CrosSettings::Get()->GetBoolean(kSystemUse24HourClock, |
178 &system_use_24hour_clock)); | 178 &system_use_24hour_clock)); |
179 EXPECT_FALSE(system_use_24hour_clock); | 179 EXPECT_FALSE(system_use_24hour_clock); |
180 EXPECT_FALSE(SystemClockShouldUse24Hour()); | 180 EXPECT_FALSE(SystemClockShouldUse24Hour()); |
181 EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayTimeHourType()); | 181 EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayTimeHourType()); |
182 EXPECT_TRUE(TestPrimarySystemTrayHasDateDefaultView()); | 182 EXPECT_TRUE(TestPrimarySystemTrayHasDateDefaultView()); |
183 EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayDateHourType()); | 183 EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayDateHourType()); |
184 } | 184 } |
185 | 185 |
186 } // namespace chromeos | 186 } // namespace chromeos |
OLD | NEW |