BASELINE: Update Chromium to 78.0.3904.130

Change-Id: If185e0c0061b3437531c97c9c8c78f239352a68b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 28 insertions, 8 deletions

diff --git a/chromium/chrome/browser/resources/settings/about_page/about_page.html b/chromium/chrome/browser/resources/settings/about_page/about_page.html
index 18c371cdbbe..99c0a1c19a1 100644
--- a/chromium/chrome/browser/resources/settings/about_page/about_page.html
+++ b/chromium/chrome/browser/resources/settings/about_page/about_page.html
@@ -23,6 +23,7 @@
 <if expr="chromeos">
 <link rel="import" href="detailed_build_info.html">
 <link rel="import" href="update_warning_dialog.html">
+<link rel="import" href="../chromeos/os_icons.html">
 <link rel="import" href="../settings_page/settings_subpage.html">
 <link rel="import" href="../reset_page/powerwash_dialog.html">
 </if>
@@ -150,14 +151,19 @@
               </span>
 </if>
 <if expr="chromeos">
-             <div id="endOfLifeMessageContainer" hidden="[[!hasEndOfLife_]]">
-               $i18n{endOfLifeMessage}
-               <a href="$i18n{endOfLifeLearnMoreURL}" target="_blank">
-                 $i18n{learnMore}
-               </a>
-             </div>
+              <div id="endOfLifeMessageContainer" hidden="[[!hasEndOfLife_]]">
+                $i18n{endOfLifeMessage}
+                <a href="$i18n{endOfLifeLearnMoreURL}" target="_blank">
+                  $i18n{learnMore}
+                </a>
+              </div>
 </if>
               <div class="secondary">$i18n{aboutBrowserVersion}</div>
+<if expr="chromeos">
+              <div class="secondary"
+                  inner-h-t-m-l="[[getUpdateOsSettingsLink_()]]">
+              </div>
+</if>
             </div>
             <div class="separator" hidden="[[!showButtonContainer_]]"></div>
             <span id="buttonContainer" hidden="[[!showButtonContainer_]]">
@@ -233,7 +239,7 @@
 <if expr="_google_chrome">
           <cr-link-row class="hr" id="reportIssue" on-click="onReportIssueTap_"
               hidden="[[!prefs.feedback_allowed.value]]"
-              label="$i18n{aboutReportAnIssue}"></cr-link-row>
+              label="$i18n{aboutReportAnIssue}" external></cr-link-row>
 </if>
 <if expr="chromeos">
           <cr-link-row class="hr" id="detailed-build-info-trigger"
diff --git a/chromium/chrome/browser/resources/settings/about_page/about_page.js b/chromium/chrome/browser/resources/settings/about_page/about_page.js
index 4899236f7b7..d4781a4d1b7 100644
--- a/chromium/chrome/browser/resources/settings/about_page/about_page.js
+++ b/chromium/chrome/browser/resources/settings/about_page/about_page.js
@@ -491,7 +491,7 @@ Polymer({
     // If Chrome OS has reached end of life, display a special icon and
     // ignore UpdateStatus.
     if (this.hasEndOfLife_) {
-      return 'settings:end-of-life';
+      return 'os-settings:end-of-life';
     }
     // </if>
 
@@ -632,6 +632,20 @@ Polymer({
         this.i18nAdvanced('aboutProductOsLicense');
   },
 
+  // <if expr="chromeos">
+  /**
+   * @return {string}
+   * @private
+   */
+  getUpdateOsSettingsLink_: function() {
+    // Note: This string contains raw HTML and thus requires i18nAdvanced().
+    // Since the i18n template syntax (e.g., $i18n{}) does not include an
+    // "advanced" version, it's not possible to inline this link directly in the
+    // HTML.
+    return this.i18nAdvanced('aboutUpdateOsSettingsLink');
+  },
+  // </if>
+
   /**
    * @param {boolean} enabled True if Crostini is enabled.
    * @private