chrome://devices: Add link to string

Add the appropriate help link to chrome://devices

Also fixing a typo in the link itself - should be support.google.com,
not www.google.com.

Note: String itself is not modified by this change, but is detected
as a change due to adding the URL argument.

Bug: 1114186
Change-Id: Ibb8583d419639da3b1ba13058060cf91298deeb9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2353406Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797785}

chrome/app/generated_resources.grd

@@ -9569,7 +9569,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
 
       <!--Cloud printing deprecation messages for chrome://devices & Print Preview-->
       <message name="IDS_CLOUD_PRINTING_NOT_SUPPORTED_WARNING" desc="Warning shown to the user to inform them that cloud printing will no longer be supported.">
-        Cloud printing will no longer be supported after December 31. <ph name="BEGIN_LINK_LEARN_MORE">&lt;a is="action-link" href="" target="_blank"&gt;</ph>Learn more<ph name="END_LINK_LEARN_MORE">&lt;/a&gt;</ph>
+        Cloud printing will no longer be supported after December 31. <ph name="BEGIN_LINK_LEARN_MORE">&lt;a is="action-link" href="$1" target="_blank"&gt;</ph>Learn more<ph name="END_LINK_LEARN_MORE">&lt;/a&gt;</ph>
       </message>
       <message name="IDS_CLOUD_PRINTING_NOT_SUPPORTED_WARNING_ENTERPRISE" desc="Warning shown to users managed by enterprise policy to inform them that cloud printing will no longer be supported.">
         Cloud printing will no longer be supported after December 31. Contact your administrator.

chrome/app/generated_resources_grd/IDS_CLOUD_PRINTING_NOT_SUPPORTED_WARNING.png.sha1

-c97dec35a8d887da3cc35b31438ad7bcc208c1ab
+4718d4b2fdf1d1d568e31fc99b052ed9b9766243
\ No newline at end of file

chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc

@@ -6,6 +6,7 @@
 
 #include <memory>
 
+#include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ui_features.h"
@@ -16,11 +17,13 @@
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/browser_resources.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/cloud_devices/common/cloud_devices_urls.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "printing/buildflags/buildflags.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/webui/web_ui_util.h"
 
 namespace {
@@ -33,11 +36,17 @@ content::WebUIDataSource* CreateLocalDiscoveryWarningHTMLSource() {
   source->AddLocalizedString("devicesTitle",
                              IDS_LOCAL_DISCOVERY_DEVICES_PAGE_TITLE);
 
-  source->AddLocalizedString(
-      "cloudPrintDeprecationWarning",
-      webui::IsEnterpriseManaged()
-          ? IDS_CLOUD_PRINTING_NOT_SUPPORTED_WARNING_ENTERPRISE
-          : IDS_CLOUD_PRINTING_NOT_SUPPORTED_WARNING);
+  if (webui::IsEnterpriseManaged()) {
+    source->AddLocalizedString(
+        "cloudPrintDeprecationWarning",
+        IDS_CLOUD_PRINTING_NOT_SUPPORTED_WARNING_ENTERPRISE);
+  } else {
+    source->AddString(
+        "cloudPrintDeprecationWarning",
+        l10n_util::GetStringFUTF16(
+            IDS_CLOUD_PRINTING_NOT_SUPPORTED_WARNING,
+            base::ASCIIToUTF16(cloud_devices::kCloudPrintDeprecationHelpURL)));
+  }
 
   source->DisableDenyXFrameOptions();
 

components/cloud_devices/common/cloud_devices_urls.cc

@@ -18,9 +18,9 @@ const char kCloudPrintAuthScope[] =
 
 const char kCloudPrintDeprecationHelpURL[] =
 #if defined(OS_CHROMEOS)
-    "https://www.google.com/chromebook/?p=cloudprint";
+    "https://support.google.com/chromebook/?p=cloudprint";
 #else
-    "https://www.google.com/chrome/?p=cloudprint";
+    "https://support.google.com/chrome/?p=cloudprint";
 #endif
 
 const char kCloudPrintLearnMoreURL[] =