chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc - Issue 2099793002: mash: Migrate some system user files to common.

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 2099793002: mash: Migrate some system user files to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Cleanup Created 4 years, 5 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

« ash/root_window_controller.h ('K') | « ash/test/test_system_tray_delegate.cc ('k') | chrome/browser/chromeos/power/power_button_observer.cc » ('j') | no next file with comments »

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/system/date/date_default_view.h"	6 #include "ash/common/system/date/date_default_view.h"

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

7 #include "ash/common/wm_shell.h"	8 #include "ash/common/wm_shell.h"

8 #include "ash/shell.h"	9 #include "ash/shell.h"

9 #include "ash/system/user/login_status.h"

10 #include "base/command_line.h"	10 #include "base/command_line.h"

11 #include "base/location.h"	11 #include "base/location.h"

12 #include "base/macros.h"	12 #include "base/macros.h"

13 #include "base/message_loop/message_loop.h"	13 #include "base/message_loop/message_loop.h"

14 #include "base/single_thread_task_runner.h"	14 #include "base/single_thread_task_runner.h"

15 #include "base/threading/thread_task_runner_handle.h"	15 #include "base/threading/thread_task_runner_handle.h"

16 #include "chrome/browser/chromeos/login/ui/login_display_host.h"	16 #include "chrome/browser/chromeos/login/ui/login_display_host.h"

17 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"	17 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"

18 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"	18 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"

19 #include "chrome/browser/chromeos/settings/cros_settings.h"	19 #include "chrome/browser/chromeos/settings/cros_settings.h"

(...skipping 148 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
168 EXPECT_TRUE(CrosSettings::Get()->GetBoolean(kSystemUse24HourClock,	168 EXPECT_TRUE(CrosSettings::Get()->GetBoolean(kSystemUse24HourClock,

169 &system_use_24hour_clock));	169 &system_use_24hour_clock));

170 EXPECT_FALSE(system_use_24hour_clock);	170 EXPECT_FALSE(system_use_24hour_clock);

171 EXPECT_FALSE(GetSystemTrayDelegateShouldUse24HourClock());	171 EXPECT_FALSE(GetSystemTrayDelegateShouldUse24HourClock());

172 EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayTimeHourType());	172 EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayTimeHourType());

173 EXPECT_TRUE(TestPrimarySystemTrayHasDateDefaultView());	173 EXPECT_TRUE(TestPrimarySystemTrayHasDateDefaultView());

174 EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayDateHourType());	174 EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayDateHourType());

175 }	175 }

176	176

177 } // namespace chromeos	177 } // namespace chromeos

OLD	NEW