chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc - Issue 2393703005: MD Settings: Date and Time page, part 1/3

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

Unified Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Issue 2393703005: MD Settings: Date and Time page, part 1/3 (Closed)

Patch Set: Move SetInteger to WebUI CL Created 4 years, 2 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/webui/settings/chromeos/date_time_handler.cc ('k') | chrome/browser/ui/webui/settings/md_settings_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

index 69a418e3638e6a4c1a6d1ae26369c96caadd1933..c217a955d43f8581b0ddffdcc65e927bf3b4b70f 100644

--- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

+++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

@@ -652,18 +652,18 @@ void AddResetStrings(content::WebUIDataSource* html_source) {

#endif

}

+#if defined(OS_CHROMEOS)

void AddDateTimeStrings(content::WebUIDataSource* html_source) {

LocalizedString localized_strings[] = {

{"dateTimePageTitle", IDS_SETTINGS_DATE_TIME},

{"timeZone", IDS_SETTINGS_TIME_ZONE},

+ {"timeZoneGeolocation", IDS_SETTINGS_TIME_ZONE_GEOLOCATION},

{"use24HourClock", IDS_SETTINGS_USE_24_HOUR_CLOCK},

- {"dateTimeSetAutomatically", IDS_SETTINGS_DATE_TIME_SET_AUTOMATICALLY},

};

AddLocalizedStringsBulk(html_source, localized_strings,

arraysize(localized_strings));

}

-#if defined(OS_CHROMEOS)

void AddEasyUnlockStrings(content::WebUIDataSource* html_source) {

LocalizedString localized_strings[] = {

{"easyUnlockSectionTitle", IDS_SETTINGS_EASY_UNLOCK_SECTION_TITLE},

@@ -1664,8 +1664,8 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,

#if !defined(OS_CHROMEOS)

AddDefaultBrowserStrings(html_source);

#endif

- AddDateTimeStrings(html_source);

#if defined(OS_CHROMEOS)

+ AddDateTimeStrings(html_source);

AddDeviceStrings(html_source);

#endif

AddDownloadsStrings(html_source);