Merge to M103: [Human presence] Added "learn more" settings link.

Merge bug: b:233689893 The "learn more" link in the screen privacy settings subpage has thus-far pointed only to a blank page. This CL updates the link to point to a URL that will (eventually) offer guidance for screen privacy features. (cherry picked from commit 35a9085) Bug: b:233689893 Change-Id: Ie105c9cfdde2a043a3d2de7922eb6866c46d96da Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3671278 Reviewed-by: Christopher Lam <calamity@chromium.org> Commit-Queue: Michael Martis <martis@chromium.org> Cr-Original-Commit-Position: refs/heads/main@{#1008113} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3682038 Cr-Commit-Position: refs/branch-heads/5060@{#454} Cr-Branched-From: b83393d-refs/heads/main@{#1002911}
chromium · Jun 1, 2022 · 8c487a6 · 8c487a6
1 parent b443560
commit 8c487a6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/chrome/browser/resources/settings/chromeos/os_privacy_page/smart_privacy_page.html b/chrome/browser/resources/settings/chromeos/os_privacy_page/smart_privacy_page.html
@@ -48,7 +48,7 @@
   <div>
     <localized-link
         localized-string="$i18n{smartPrivacyDesc}"
-        link-url="$i18n{smartPrivacyLearnMoreLink}">
+        link-url="$i18n{smartPrivacyLearnMoreURL}">
     </localized-link>
   </div>
 </div>

diff --git a/chrome/browser/ui/webui/settings/chromeos/privacy_section.cc b/chrome/browser/ui/webui/settings/chromeos/privacy_section.cc
@@ -332,8 +332,8 @@ void PrivacySection::AddLoadTimeData(content::WebUIDataSource* html_source) {
       "smartPrivacyDesc",
       ui::SubstituteChromeOSDeviceType(IDS_OS_SETTINGS_SMART_PRIVACY_DESC));
 
-  // TODO(1294649): update this to the real link.
-  html_source->AddString("smartPrivacyLearnMoreLink", "about:blank");
+  html_source->AddString("smartPrivacyLearnMoreURL",
+                         chrome::kSmartPrivacySettingsLearnMoreURL);
 
   html_source->AddString("suggestedContentLearnMoreURL",
                          chrome::kSuggestedContentLearnMoreURL);

diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
@@ -419,6 +419,9 @@ const char kTPMFirmwareUpdateLearnMoreURL[] =
 const char kTimeZoneSettingsLearnMoreURL[] =
     "https://support.google.com/chromebook?p=chromebook_timezone&hl=%s";
 
+const char kSmartPrivacySettingsLearnMoreURL[] =
+    "https://support.google.com/chromebook?p=screen_privacy_m100";
+
 const char kSmbSharesLearnMoreURL[] =
     "https://support.google.com/chromebook?p=network_file_shares";
 

diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
@@ -389,6 +389,9 @@ extern const char kTPMFirmwareUpdateLearnMoreURL[];
 // The URL for the "Learn more" page for the time zone settings page.
 extern const char kTimeZoneSettingsLearnMoreURL[];
 
+// The URL for the "Learn more" page for screen privacy protections.
+extern const char kSmartPrivacySettingsLearnMoreURL[];
+
 // The URL for the "Learn more" page for the network file shares settings page.
 extern const char kSmbSharesLearnMoreURL[];