Add location information to Plugin VM shared path instructions

Fix text to include location information as per UX spec.  See bug.

Bug: b/161645291
Change-Id: If6524cf9608f75579af33923cc6e2a171c428086
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2306114
Commit-Queue: Joel Hockey <joelhockey@chromium.org>
Commit-Queue: Kyle Horimoto <khorimoto@chromium.org>
Auto-Submit: Joel Hockey <joelhockey@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Timothy Loh <timloh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790242}

chrome/app/os_settings_strings.grdp

@@ -988,6 +988,9 @@
   <message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS_LIST_HEADING" desc="Label for list of shared folders.">
     Shared folders
   </message>
+  <message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS_INSTRUCTIONS_LOCATE" desc="Instructions for how to locate shared folders in Crostini.">
+    Shared folders are available in Linux at <ph name="BASE_DIR">$1<ex>/mnt/chromeos</ex></ph>.
+  </message>
   <message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS_INSTRUCTIONS_ADD" desc="Instructions for how to add shared folders in Crostini.">
     To share, right-click on a folder in Files app, then select "Share with Linux".
   </message>
@@ -1207,9 +1210,6 @@
   <message name="IDS_SETTINGS_CROSTINI_ARC_ADB_CONFIRMATION_MESSAGE_DISABLE" desc="Describes what will happen if the user disables ADB Sideloading.">
     Disabling ADB debugging will reset this <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> to factory settings. All user accounts and local data will be erased.
   </message>
-  <message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS_INSTRUCTIONS_LOCATE" desc="Instructions for how to locate shared folders in Crostini.">
-    Shared folders are available in Linux at <ph name="BASE_DIR">$1<ex>/mnt/chromeos</ex></ph>.
-  </message>
   <message name="IDS_SETTINGS_CROSTINI_SUBTEXT" desc="Description for the section for enabling and managing Crostini.">
     Run Linux tools, editors, and IDEs on your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>. &lt;a target="_blank" href="<ph name="URL">$2<ex>https://google.com/</ex></ph>"&gt;Learn more&lt;/a&gt;
   </message>
@@ -2828,6 +2828,9 @@
   <message name="IDS_SETTINGS_APPS_PLUGIN_VM_SHARED_PATHS_LIST_HEADING" desc="Label for list of shared folders.">
     Shared folders
   </message>
+  <message name="IDS_SETTINGS_APPS_PLUGIN_VM_SHARED_PATHS_INSTRUCTIONS_LOCATE" desc="Instructions for how to locate shared folders in Parallels.">
+      Shared folders are available in Windows at <ph name="BASE_DIR">$1<ex>Network › ChromeOS</ex></ph>.
+  </message>
   <message name="IDS_SETTINGS_APPS_PLUGIN_VM_SHARED_PATHS_INSTRUCTIONS_ADD" desc="Instructions for how to add shared folders in Parallels.">
     To share, right-click on a folder in Files app, then select "Share with Parallels Desktop".
   </message>

chrome/app/os_settings_strings_grdp/IDS_SETTINGS_APPS_PLUGIN_VM_SHARED_PATHS_INSTRUCTIONS_LOCATE.png.sha1

+2ec689b80b5f11dc023d94519a8c8aee7dcc745a
\ No newline at end of file

chrome/browser/chromeos/plugin_vm/plugin_vm_util.cc

@@ -36,6 +36,7 @@ namespace plugin_vm {
 
 const char kPluginVmShelfAppId[] = "lgjpclljbbmphhnalkeplcmnjpfmmaek";
 const char kPluginVmName[] = "PvmDefault";
+const char kChromeOSBaseDirectoryDisplayText[] = "Network \u203a ChromeOS";
 
 namespace {
 

chrome/browser/chromeos/plugin_vm/plugin_vm_util.h

@@ -33,6 +33,9 @@ extern const char kPluginVmShelfAppId[];
 // Name of the Plugin VM.
 extern const char kPluginVmName[];
 
+// Base directory for shared paths in Plugin VM, formatted for display.
+extern const char kChromeOSBaseDirectoryDisplayText[];
+
 const net::NetworkTrafficAnnotationTag kPluginVmNetworkTrafficAnnotation =
     net::DefineNetworkTrafficAnnotation("plugin_vm_image_download", R"(
       semantics {

chrome/browser/resources/settings/chromeos/crostini_page/crostini_shared_paths.html

@@ -12,7 +12,7 @@
   <template>
     <style include="settings-shared"></style>
     <div class="settings-box first">
-      <div>
+      <div role="text">
         $i18n{crostiniSharedPathsInstructionsLocate}
         $i18n{crostiniSharedPathsInstructionsAdd}
         <span id="crostiniInstructionsRemove"

chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/plugin_vm_page/plugin_vm_shared_paths.html

@@ -9,7 +9,8 @@
   <template>
     <style include="settings-shared"></style>
     <div class="settings-box first">
-      <div>
+      <div role="text">
+        $i18n{pluginVmSharedPathsInstructionsLocate}
         $i18n{pluginVmSharedPathsInstructionsAdd}
         <span id="pluginVmInstructionsRemove"
             hidden="[[!sharedPaths_.length]]">

chrome/browser/ui/webui/settings/chromeos/apps_section.cc

@@ -6,6 +6,7 @@
 
 #include "base/feature_list.h"
 #include "base/no_destructor.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/arc/arc_util.h"
 #include "chrome/browser/chromeos/plugin_vm/plugin_vm_pref_names.h"
 #include "chrome/browser/chromeos/plugin_vm/plugin_vm_util.h"
@@ -325,6 +326,11 @@ void AppsSection::AddPluginVmLoadTimeData(
 
   html_source->AddBoolean("showPluginVm",
                           ShowPluginVm(profile(), *pref_service_));
+  html_source->AddString(
+      "pluginVmSharedPathsInstructionsLocate",
+      l10n_util::GetStringFUTF16(
+          IDS_SETTINGS_APPS_PLUGIN_VM_SHARED_PATHS_INSTRUCTIONS_LOCATE,
+          base::UTF8ToUTF16(plugin_vm::kChromeOSBaseDirectoryDisplayText)));
   html_source->AddBoolean(
       "showPluginVmCameraPermissions",
       base::FeatureList::IsEnabled(