chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc - Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)

Patch Set: rebase Created 3 years, 9 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

« no previous file with comments | « chrome/browser/chromeos/policy/device_local_account_browsertest.cc ('k') | chrome/browser/chromeos/power/login_lock_state_notifier.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/common/login_status.h"

6 #include "ash/common/system/date/date_default_view.h"

7 #include "ash/common/system/date/date_view.h"

8 #include "ash/common/system/date/system_info_default_view.h"

9 #include "ash/common/system/date/tray_system_info.h"

10 #include "ash/common/system/tray/system_tray.h"

11 #include "ash/common/wm_shell.h"	6 #include "ash/common/wm_shell.h"

12 #include "ash/shell.h"	7 #include "ash/shell.h"

	8 #include "ash/system/date/date_default_view.h"

	9 #include "ash/system/date/date_view.h"

	10 #include "ash/system/date/system_info_default_view.h"

	11 #include "ash/system/date/tray_system_info.h"

	12 #include "ash/system/tray/system_tray.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