chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc - Issue 1547093002: Switch to standard integer types in chrome/browser/chromeos/.

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 1547093002: Switch to standard integer types in chrome/browser/chromeos/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 12 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_status_collector_browsertest.cc ('k') | chrome/browser/chromeos/policy/display_rotation_default_handler_browsertest.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/shell.h"	5 #include "ash/shell.h"

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

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

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

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

	10 #include "base/macros.h"

10 #include "base/message_loop/message_loop.h"	11 #include "base/message_loop/message_loop.h"

11 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"	12 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"

12 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"	13 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"

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

14 #include "chrome/browser/chromeos/settings/cros_settings.h"	15 #include "chrome/browser/chromeos/settings/cros_settings.h"

15 #include "chrome/browser/lifetime/application_lifetime.h"	16 #include "chrome/browser/lifetime/application_lifetime.h"

16 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"	17 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"

17 #include "chromeos/chromeos_switches.h"	18 #include "chromeos/chromeos_switches.h"

18 #include "content/public/test/test_utils.h"	19 #include "content/public/test/test_utils.h"

19 #include "testing/gtest/include/gtest/gtest.h"	20 #include "testing/gtest/include/gtest/gtest.h"

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

164 &system_use_24hour_clock));	165 &system_use_24hour_clock));

165 EXPECT_FALSE(system_use_24hour_clock);	166 EXPECT_FALSE(system_use_24hour_clock);

166 EXPECT_FALSE(GetSystemTrayDelegateShouldUse24HourClock());	167 EXPECT_FALSE(GetSystemTrayDelegateShouldUse24HourClock());

167 EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayTimeHourType());	168 EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayTimeHourType());

168 EXPECT_TRUE(TestPrimarySystemTrayHasDateDefaultView());	169 EXPECT_TRUE(TestPrimarySystemTrayHasDateDefaultView());

169 EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayDateHourType());	170 EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayDateHourType());

170 }	171 }

171	172

172 } // namespace chromeos	173 } // namespace chromeos

OLD	NEW