Commit 89d4f7aa authored by Regan Hsu's avatar Regan Hsu Committed by Commit Bot

[CrOS Settings] Copy and modify SearchInSettings strings.

* Copy and clean SearchInSettings strings from Browser to OS.
* Add searchNoOsResultsHelp with it's own URL.

Bug: 967888
Change-Id: I824bd4385c123bdeace61ef89386818108afac10
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2013644Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Regan Hsu <hsuregan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#737065}
parent c09bee44
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</style> </style>
<div id="noSearchResults" hidden$="[[!showNoResultsFound_]]"> <div id="noSearchResults" hidden$="[[!showNoResultsFound_]]">
<div>$i18n{searchNoResults}</div> <div>$i18n{searchNoResults}</div>
<div>$i18nRaw{searchNoResultsHelp}</div> <div>$i18nRaw{searchNoOsResultsHelp}</div>
</div> </div>
<template is="dom-if" <template is="dom-if"
if="[[showManagedHeader_(inSearchMode_, showingSubpage_, if="[[showManagedHeader_(inSearchMode_, showingSubpage_,
......
...@@ -1374,6 +1374,24 @@ void AddPrintingStrings(content::WebUIDataSource* html_source) { ...@@ -1374,6 +1374,24 @@ void AddPrintingStrings(content::WebUIDataSource* html_source) {
base::FeatureList::IsEnabled(::features::kPrintServerUi)); base::FeatureList::IsEnabled(::features::kPrintServerUi));
} }
void AddSearchInSettingsStrings(content::WebUIDataSource* html_source) {
static constexpr webui::LocalizedString kLocalizedStrings[] = {
{"searchPrompt", IDS_SETTINGS_SEARCH_PROMPT},
{"searchNoResults", IDS_SEARCH_NO_RESULTS},
{"searchResults", IDS_SEARCH_RESULTS},
// TODO(dpapad): IDS_DOWNLOAD_CLEAR_SEARCH and IDS_HISTORY_CLEAR_SEARCH
// are identical, merge them to one and re-use here.
{"clearSearch", IDS_DOWNLOAD_CLEAR_SEARCH},
};
AddLocalizedStringsBulk(html_source, kLocalizedStrings);
html_source->AddString(
"searchNoOsResultsHelp",
l10n_util::GetStringFUTF16(
IDS_SETTINGS_SEARCH_NO_RESULTS_HELP,
base::ASCIIToUTF16(chrome::kOsSettingsSearchHelpURL)));
}
} // namespace } // namespace
void AddOsLocalizedStrings(content::WebUIDataSource* html_source, void AddOsLocalizedStrings(content::WebUIDataSource* html_source,
...@@ -1398,6 +1416,7 @@ void AddOsLocalizedStrings(content::WebUIDataSource* html_source, ...@@ -1398,6 +1416,7 @@ void AddOsLocalizedStrings(content::WebUIDataSource* html_source,
AddPersonalizationStrings(html_source); AddPersonalizationStrings(html_source);
AddPluginVmStrings(html_source, profile); AddPluginVmStrings(html_source, profile);
AddPrintingStrings(html_source); AddPrintingStrings(html_source);
AddSearchInSettingsStrings(html_source);
AddUsersStrings(html_source); AddUsersStrings(html_source);
} }
......
...@@ -229,11 +229,7 @@ const char kSafetyTipHelpCenterURL[] = ...@@ -229,11 +229,7 @@ const char kSafetyTipHelpCenterURL[] =
"https://support.google.com/chrome/?p=safety_tip"; "https://support.google.com/chrome/?p=safety_tip";
const char kSettingsSearchHelpURL[] = const char kSettingsSearchHelpURL[] =
#if defined(OS_CHROMEOS)
"https://support.google.com/chromebook/?p=settings_search_help";
#else
"https://support.google.com/chrome/?p=settings_search_help"; "https://support.google.com/chrome/?p=settings_search_help";
#endif
const char kSymantecSupportUrl[] = const char kSymantecSupportUrl[] =
"https://support.google.com/chrome?p=symantec#-202"; "https://support.google.com/chrome?p=symantec#-202";
...@@ -358,6 +354,9 @@ const char kOemEulaURLPath[] = "oem"; ...@@ -358,6 +354,9 @@ const char kOemEulaURLPath[] = "oem";
const char kOnlineEulaURLPath[] = const char kOnlineEulaURLPath[] =
"https://www.google.com/intl/%s/chrome/eula_text.html"; "https://www.google.com/intl/%s/chrome/eula_text.html";
const char kOsSettingsSearchHelpURL[] =
"https://support.google.com/chromebook/?p=settings_search_help";
const char kTPMFirmwareUpdateLearnMoreURL[] = const char kTPMFirmwareUpdateLearnMoreURL[] =
"https://support.google.com/chromebook/?p=tpm_update"; "https://support.google.com/chromebook/?p=tpm_update";
......
...@@ -310,6 +310,9 @@ extern const char kNaturalScrollHelpURL[]; ...@@ -310,6 +310,9 @@ extern const char kNaturalScrollHelpURL[];
// The URL path to offline OEM EULA. // The URL path to offline OEM EULA.
extern const char kOemEulaURLPath[]; extern const char kOemEulaURLPath[];
// Help URL for the OS settings page's search feature.
extern const char kOsSettingsSearchHelpURL[];
// The URL path to offline ARC++ Terms of Service. // The URL path to offline ARC++ Terms of Service.
extern const char kArcTermsURLPath[]; extern const char kArcTermsURLPath[];
......
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