Commit 3a1b728b authored by Kyle Horimoto's avatar Kyle Horimoto Committed by Commit Bot

[CrOS Settings] Add link to Chrome OS settings from browser settings.

Since we split settings between browser vs. OS, the settings page which
alerts the user about whether an OS update is available is part of OS
settings. However, some existing users were used to visiting
chrome://settings/help to check for this information. To ensure that
these users are not confused, this CL adds a link from the "About Chrome"
settings page to the "About Chrome OS" settings page.

Bug: 1010996
Change-Id: Ia7efc888195f444668d7b89617a698d03d4b9466
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1847906Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Commit-Queue: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704332}
parent 62c1eb03
...@@ -26,6 +26,9 @@ ...@@ -26,6 +26,9 @@
<message name="IDS_SETTINGS_ABOUT_OS" desc="Menu title for the About Chromium OS page."> <message name="IDS_SETTINGS_ABOUT_OS" desc="Menu title for the About Chromium OS page.">
About Chromium OS About Chromium OS
</message> </message>
<message name="IDS_SETTINGS_ABOUT_SEE_OS_SETTINGS_FOR_UPDATE_MESSAGE" desc="Message shown to users on Chromium browser settings which alerts the user that OS updates are shown in Chromium OS settings.">
To see if your device is up to date, go to <ph name="LINK_BEGIN">&lt;a href="chrome://os-settings/help"&gt;</ph>Chromium OS Settings<ph name="LINK_END">&lt;/a&gt;</ph>
</message>
<message name="IDS_SETTINGS_GET_HELP_USING_CHROME_OS" desc="Text of the button which takes the user to the Chrome help page."> <message name="IDS_SETTINGS_GET_HELP_USING_CHROME_OS" desc="Text of the button which takes the user to the Chrome help page.">
Get help with Chromium OS Get help with Chromium OS
</message> </message>
......
...@@ -26,6 +26,9 @@ ...@@ -26,6 +26,9 @@
<message name="IDS_SETTINGS_ABOUT_OS" desc="Menu title for the About Chrome OS page."> <message name="IDS_SETTINGS_ABOUT_OS" desc="Menu title for the About Chrome OS page.">
About Chrome OS About Chrome OS
</message> </message>
<message name="IDS_SETTINGS_ABOUT_SEE_OS_SETTINGS_FOR_UPDATE_MESSAGE" desc="Message shown to users on Chrome browser settings which alerts the user that OS updates are shown in Chrome OS settings.">
To see if your device is up to date, go to <ph name="LINK_BEGIN">&lt;a href="chrome://os-settings/help"&gt;</ph>Chrome OS Settings<ph name="LINK_END">&lt;/a&gt;</ph>
</message>
<message name="IDS_SETTINGS_GET_HELP_USING_CHROME_OS" desc="Text of the button which takes the user to the Chrome help page."> <message name="IDS_SETTINGS_GET_HELP_USING_CHROME_OS" desc="Text of the button which takes the user to the Chrome help page.">
Get help with Chrome OS Get help with Chrome OS
</message> </message>
......
...@@ -151,14 +151,19 @@ ...@@ -151,14 +151,19 @@
</span> </span>
</if> </if>
<if expr="chromeos"> <if expr="chromeos">
<div id="endOfLifeMessageContainer" hidden="[[!hasEndOfLife_]]"> <div id="endOfLifeMessageContainer" hidden="[[!hasEndOfLife_]]">
$i18n{endOfLifeMessage} $i18n{endOfLifeMessage}
<a href="$i18n{endOfLifeLearnMoreURL}" target="_blank"> <a href="$i18n{endOfLifeLearnMoreURL}" target="_blank">
$i18n{learnMore} $i18n{learnMore}
</a> </a>
</div> </div>
</if> </if>
<div class="secondary">$i18n{aboutBrowserVersion}</div> <div class="secondary">$i18n{aboutBrowserVersion}</div>
<if expr="chromeos">
<div class="secondary"
inner-h-t-m-l="[[getUpdateOsSettingsLink_()]]">
</div>
</if>
</div> </div>
<div class="separator" hidden="[[!showButtonContainer_]]"></div> <div class="separator" hidden="[[!showButtonContainer_]]"></div>
<span id="buttonContainer" hidden="[[!showButtonContainer_]]"> <span id="buttonContainer" hidden="[[!showButtonContainer_]]">
......
...@@ -632,6 +632,20 @@ Polymer({ ...@@ -632,6 +632,20 @@ Polymer({
this.i18nAdvanced('aboutProductOsLicense'); this.i18nAdvanced('aboutProductOsLicense');
}, },
// <if expr="chromeos">
/**
* @return {string}
* @private
*/
getUpdateOsSettingsLink_: function() {
// Note: This string contains raw HTML and thus requires i18nAdvanced().
// Since the i18n template syntax (e.g., $i18n{}) does not include an
// "advanced" version, it's not possible to inline this link directly in the
// HTML.
return this.i18nAdvanced('aboutUpdateOsSettingsLink');
},
// </if>
/** /**
* @param {boolean} enabled True if Crostini is enabled. * @param {boolean} enabled True if Crostini is enabled.
* @private * @private
......
...@@ -447,6 +447,8 @@ void AddAboutStrings(content::WebUIDataSource* html_source) { ...@@ -447,6 +447,8 @@ void AddAboutStrings(content::WebUIDataSource* html_source) {
IDS_SETTINGS_ABOUT_PAGE_RELAUNCH_AND_POWERWASH}, IDS_SETTINGS_ABOUT_PAGE_RELAUNCH_AND_POWERWASH},
{"aboutRollbackInProgress", IDS_SETTINGS_UPGRADE_ROLLBACK_IN_PROGRESS}, {"aboutRollbackInProgress", IDS_SETTINGS_UPGRADE_ROLLBACK_IN_PROGRESS},
{"aboutRollbackSuccess", IDS_SETTINGS_UPGRADE_ROLLBACK_SUCCESS}, {"aboutRollbackSuccess", IDS_SETTINGS_UPGRADE_ROLLBACK_SUCCESS},
{"aboutUpdateOsSettingsLink",
IDS_SETTINGS_ABOUT_SEE_OS_SETTINGS_FOR_UPDATE_MESSAGE},
{"aboutUpgradeUpdatingChannelSwitch", {"aboutUpgradeUpdatingChannelSwitch",
IDS_SETTINGS_UPGRADE_UPDATING_CHANNEL_SWITCH}, IDS_SETTINGS_UPGRADE_UPDATING_CHANNEL_SWITCH},
{"aboutUpgradeSuccessChannelSwitch", {"aboutUpgradeSuccessChannelSwitch",
......
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