Commit 3a91057b authored by Sean Harrison's avatar Sean Harrison Committed by Commit Bot

Settings: Add help center link to cookies and security pages

Bug: 1032584
Change-Id: I89fa54cd86fbe13eade7e85efc86b15ec99474fe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2126932
Commit-Queue: Sean Harrison <harrisonsean@chromium.org>
Reviewed-by: default avatarMartin Šrámek <msramek@chromium.org>
Reviewed-by: default avatardpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#755328}
parent 6c873f51
...@@ -181,7 +181,8 @@ ...@@ -181,7 +181,8 @@
no-search="[[!privacySettingsRedesignEnabled_]]"> no-search="[[!privacySettingsRedesignEnabled_]]">
<settings-subpage id="security" page-title="$i18n{securityPageTitle}" <settings-subpage id="security" page-title="$i18n{securityPageTitle}"
no-search$="[[!privacySettingsRedesignEnabled_]]" no-search$="[[!privacySettingsRedesignEnabled_]]"
associated-control="[[$$('#securityLinkRow')]]"> associated-control="[[$$('#securityLinkRow')]]"
learn-more-url="$i18n{safeBrowsingHelpCenterURL}">
<settings-security-page prefs="{{prefs}}" <settings-security-page prefs="{{prefs}}"
focus-config="[[focusConfig_]]" focus-config="[[focusConfig_]]"
sync-status="[[syncStatus]]"> sync-status="[[syncStatus]]">
...@@ -250,6 +251,7 @@ ...@@ -250,6 +251,7 @@
<template is="dom-if" route-path="/cookies" <template is="dom-if" route-path="/cookies"
no-search="[[!privacySettingsRedesignEnabled_]]"> no-search="[[!privacySettingsRedesignEnabled_]]">
<settings-subpage id="cookies" page-title="$i18n{cookiePageTitle}" <settings-subpage id="cookies" page-title="$i18n{cookiePageTitle}"
learn-more-url="$i18n{cookiesSettingsHelpCenterURL}"
no-search$="[[!privacySettingsRedesignEnabled_]]" no-search$="[[!privacySettingsRedesignEnabled_]]"
search-label="$i18n{siteSettingsAllSitesSearch}" search-label="$i18n{siteSettingsAllSitesSearch}"
search-term="{{searchFilter_}}" search-term="{{searchFilter_}}"
......
...@@ -1240,8 +1240,15 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, ...@@ -1240,8 +1240,15 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
}; };
AddLocalizedStringsBulk(html_source, kLocalizedStrings); AddLocalizedStringsBulk(html_source, kLocalizedStrings);
html_source->AddString("cookiesSettingsHelpCenterURL",
chrome::kCookiesSettingsHelpCenterURL);
html_source->AddString("safeBrowsingHelpCenterURL",
chrome::kSafeBrowsingHelpCenterURL);
html_source->AddString("syncAndGoogleServicesLearnMoreURL", html_source->AddString("syncAndGoogleServicesLearnMoreURL",
chrome::kSyncAndGoogleServicesLearnMoreURL); chrome::kSyncAndGoogleServicesLearnMoreURL);
html_source->AddString( html_source->AddString(
"doNotTrackDialogMessage", "doNotTrackDialogMessage",
l10n_util::GetStringFUTF16( l10n_util::GetStringFUTF16(
......
...@@ -121,6 +121,9 @@ const char kCloudPrintCertificateErrorLearnMoreURL[] = ...@@ -121,6 +121,9 @@ const char kCloudPrintCertificateErrorLearnMoreURL[] =
const char kContentSettingsExceptionsLearnMoreURL[] = const char kContentSettingsExceptionsLearnMoreURL[] =
"https://support.google.com/chrome/?p=settings_manage_exceptions"; "https://support.google.com/chrome/?p=settings_manage_exceptions";
const char kCookiesSettingsHelpCenterURL[] =
"https://support.google.com/chrome?p=cpn_cookies";
const char kCrashReasonURL[] = const char kCrashReasonURL[] =
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
"https://support.google.com/chromebook/?p=e_awsnap"; "https://support.google.com/chromebook/?p=e_awsnap";
...@@ -242,6 +245,9 @@ const char kRemoveNonCWSExtensionURL[] = ...@@ -242,6 +245,9 @@ const char kRemoveNonCWSExtensionURL[] =
const char kResetProfileSettingsLearnMoreURL[] = const char kResetProfileSettingsLearnMoreURL[] =
"https://support.google.com/chrome/?p=ui_reset_settings"; "https://support.google.com/chrome/?p=ui_reset_settings";
const char kSafeBrowsingHelpCenterURL[] =
"https://support.google.com/chrome?p=cpn_safe_browsing";
const char kSafetyTipHelpCenterURL[] = const char kSafetyTipHelpCenterURL[] =
"https://support.google.com/chrome/?p=safety_tip"; "https://support.google.com/chrome/?p=safety_tip";
......
...@@ -124,6 +124,9 @@ extern const char kCloudPrintCertificateErrorLearnMoreURL[]; ...@@ -124,6 +124,9 @@ extern const char kCloudPrintCertificateErrorLearnMoreURL[];
extern const char kContentSettingsExceptionsLearnMoreURL[]; extern const char kContentSettingsExceptionsLearnMoreURL[];
// "Learn more" URL for cookies.
extern const char kCookiesSettingsHelpCenterURL[];
// "Learn more" URL for "Aw snap" page when showing "Reload" button. // "Learn more" URL for "Aw snap" page when showing "Reload" button.
extern const char kCrashReasonURL[]; extern const char kCrashReasonURL[];
...@@ -203,6 +206,9 @@ extern const char kRemoveNonCWSExtensionURL[]; ...@@ -203,6 +206,9 @@ extern const char kRemoveNonCWSExtensionURL[];
// "Learn more" URL for resetting profile preferences. // "Learn more" URL for resetting profile preferences.
extern const char kResetProfileSettingsLearnMoreURL[]; extern const char kResetProfileSettingsLearnMoreURL[];
// "Learn more" URL for Safebrowsing
extern const char kSafeBrowsingHelpCenterURL[];
// "Learn more" URL for safety tip bubble. // "Learn more" URL for safety tip bubble.
extern const char kSafetyTipHelpCenterURL[]; extern const char kSafetyTipHelpCenterURL[];
......
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