Commit 57603738 authored by Alexander Alekseev's avatar Alexander Alekseev Committed by Commit Bot

Chrome OS: Add Learm More link to Date and Time settings page.

Bug: 805078
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Ib9f558e1154744b99d9ce750a165ade07a5bafb3
Reviewed-on: https://chromium-review.googlesource.com/900022Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Commit-Queue: Alexander Alekseev <alemate@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534153}
parent 07062c95
...@@ -88,7 +88,8 @@ ...@@ -88,7 +88,8 @@
<template is="dom-if" route-path="/dateTime/timeZone"> <template is="dom-if" route-path="/dateTime/timeZone">
<settings-subpage data-route="DATETIME_TIMEZONE_SUBPAGE" <settings-subpage data-route="DATETIME_TIMEZONE_SUBPAGE"
associated-control="[[$$('#timeZoneSettingsTrigger')]]" associated-control="[[$$('#timeZoneSettingsTrigger')]]"
page-title="$i18n{timeZoneSubpageTitle}"> page-title="$i18n{timeZoneSubpageTitle}"
learn-more-url="$i18n{timeZoneSettingsLearnMoreURL}">
<timezone-subpage id="timezoneSubpage" prefs="{{prefs}}" <timezone-subpage id="timezoneSubpage" prefs="{{prefs}}"
active-time-zone-display-name="{{activeTimeZoneDisplayName}}"> active-time-zone-display-name="{{activeTimeZoneDisplayName}}">
</timezone-subpage> </timezone-subpage>
......
...@@ -945,6 +945,11 @@ void AddDateTimeStrings(content::WebUIDataSource* html_source) { ...@@ -945,6 +945,11 @@ void AddDateTimeStrings(content::WebUIDataSource* html_source) {
}; };
AddLocalizedStringsBulk(html_source, localized_strings, AddLocalizedStringsBulk(html_source, localized_strings,
arraysize(localized_strings)); arraysize(localized_strings));
html_source->AddString(
"timeZoneSettingsLearnMoreURL",
base::ASCIIToUTF16(base::StringPrintf(
chrome::kTimeZoneSettingsLearnMoreURL,
g_browser_process->GetApplicationLocale().c_str())));
} }
void AddEasyUnlockStrings(content::WebUIDataSource* html_source) { void AddEasyUnlockStrings(content::WebUIDataSource* html_source) {
......
...@@ -311,4 +311,9 @@ const char kOutdatedPluginLearnMoreURL[] = ...@@ -311,4 +311,9 @@ const char kOutdatedPluginLearnMoreURL[] =
"https://support.google.com/chrome/?p=ib_outdated_plugin"; "https://support.google.com/chrome/?p=ib_outdated_plugin";
#endif #endif
#if defined(OS_CHROMEOS)
const char kTimeZoneSettingsLearnMoreURL[] =
"https://support.google.com/chromebook/answer/177871?hl=%s";
#endif
} // namespace chrome } // namespace chrome
...@@ -260,6 +260,11 @@ extern const char kBlockedPluginLearnMoreURL[]; ...@@ -260,6 +260,11 @@ extern const char kBlockedPluginLearnMoreURL[];
extern const char kOutdatedPluginLearnMoreURL[]; extern const char kOutdatedPluginLearnMoreURL[];
#endif #endif
#if defined(OS_CHROMEOS)
// The URL for the "Learn more" page for the time zone settings page.
extern const char kTimeZoneSettingsLearnMoreURL[];
#endif
} // namespace chrome } // namespace chrome
#endif // CHROME_COMMON_URL_CONSTANTS_H_ #endif // CHROME_COMMON_URL_CONSTANTS_H_
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment