BASELINE: Update Chromium to 80.0.3987.136

Change-Id: I98e1649aafae85ba3a83e67af00bb27ef301db7b
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

1 files changed, 61 insertions, 20 deletions

diff --git a/chromium/chrome/browser/resources/settings/os_settings_resources.grd b/chromium/chrome/browser/resources/settings/os_settings_resources.grd
index 9d683c7b298..fcdec13a423 100644
--- a/chromium/chrome/browser/resources/settings/os_settings_resources.grd
+++ b/chromium/chrome/browser/resources/settings/os_settings_resources.grd
@@ -109,11 +109,11 @@
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_DOM_SWITCH_HTML"
                  file="chromeos/os_apps_page/app_management_page/dom_switch.html"
                  type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_PWA_PERMISSION_VIEW_JS"
-                 file="chromeos/os_apps_page/app_management_page/pwa_permission_view.js"
+      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_PWA_DETAIL_VIEW_JS"
+                 file="chromeos/os_apps_page/app_management_page/pwa_detail_view.js"
                  type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_PWA_PERMISSION_VIEW_HTML"
-                 file="chromeos/os_apps_page/app_management_page/pwa_permission_view.html"
+      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_PWA_DETAIL_VIEW_HTML"
+                 file="chromeos/os_apps_page/app_management_page/pwa_detail_view.html"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_PERMISSION_ITEM_JS"
                  file="chromeos/os_apps_page/app_management_page/permission_item.js"
@@ -133,23 +133,23 @@
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_TOGGLE_ROW_HTML"
                  file="chromeos/os_apps_page/app_management_page/toggle_row.html"
                  type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_APP_PERMISSION_VIEW_JS"
-                 file="chromeos/os_apps_page/app_management_page/app_permission_view.js"
+      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_APP_DETAIL_VIEW_JS"
+                 file="chromeos/os_apps_page/app_management_page/app_detail_view.js"
                  type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_APP_PERMISSION_VIEW_HTML"
-                 file="chromeos/os_apps_page/app_management_page/app_permission_view.html"
+      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_APP_DETAIL_VIEW_HTML"
+                 file="chromeos/os_apps_page/app_management_page/app_detail_view.html"
                  type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_ARC_PERMISSION_VIEW_JS"
-                 file="chromeos/os_apps_page/app_management_page/arc_permission_view.js"
+      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_ARC_DETAIL_VIEW_JS"
+                 file="chromeos/os_apps_page/app_management_page/arc_detail_view.js"
                  type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_ARC_PERMISSION_VIEW_HTML"
-                 file="chromeos/os_apps_page/app_management_page/arc_permission_view.html"
+      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_ARC_DETAIL_VIEW_HTML"
+                 file="chromeos/os_apps_page/app_management_page/arc_detail_view.html"
                  type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_CHROME_APP_PERMISSION_VIEW_JS"
-                 file="chromeos/os_apps_page/app_management_page/chrome_app_permission_view.js"
+      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_CHROME_APP_DETAIL_VIEW_JS"
+                 file="chromeos/os_apps_page/app_management_page/chrome_app_detail_view.js"
                  type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_CHROME_APP_PERMISSION_VIEW_HTML"
-                 file="chromeos/os_apps_page/app_management_page/chrome_app_permission_view.html"
+      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_CHROME_APP_DETAIL_VIEW_HTML"
+                 file="chromeos/os_apps_page/app_management_page/chrome_app_detail_view.html"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_ICONS_HTML"
                  file="chromeos/os_apps_page/app_management_page/icons.html"
@@ -343,10 +343,6 @@
       <structure name="IDR_OS_SETTINGS_CR_SETTINGS_PAGE_CSS_HTML"
                  file="settings_page_css.html"
                  type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_CR_SETTINGS_ICONS_CSS_HTML"
-                 file="settings_icons_css.html"
-                 flattenhtml="true"
-                 type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MAIN_PAGE_BEHAVIOR_HTML"
                  file="settings_page/main_page_behavior.html"
                  type="chrome_html" />
@@ -607,6 +603,10 @@
                  file="chromeos/os_icons.html"
                  type="chrome_html"
                  preprocess="true" />
+      <structure name="IDR_OS_SETTINGS_OS_SETTINGS_ICONS_CSS_HTML"
+                 file="chromeos/os_settings_icons_css.html"
+                 flattenhtml="true"
+                 type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_POWERWASH_DIALOG_HTML"
                  file="chromeos/os_reset_page/os_powerwash_dialog.html"
                  type="chrome_html" />
@@ -689,6 +689,21 @@
                  file="chromeos/os_people_page/os_people_page.js"
                  type="chrome_html"
                  allowexternalscript="true" />
+      <structure name="IDR_OS_SETTINGS_OS_SYNC_BROWSER_PROXY_HTML"
+                 file="chromeos/os_people_page/os_sync_browser_proxy.html"
+                 type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_OS_SYNC_BROWSER_PROXY_JS"
+                 file="chromeos/os_people_page/os_sync_browser_proxy.js"
+                 type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_OS_SYNC_CONTROLS_JS"
+                 file="chromeos/os_people_page/os_sync_controls.js"
+                 type="chrome_html"
+                 preprocess="true" />
+      <structure name="IDR_OS_SETTINGS_OS_SYNC_CONTROLS_HTML"
+                 file="chromeos/os_people_page/os_sync_controls.html"
+                 type="chrome_html"
+                 preprocess="true"
+                 allowexternalscript="true" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_PAGE_SIGNOUT_DIALOG_HTML"
                  file="people_page/signout_dialog.html"
                  type="chrome_html"
@@ -865,6 +880,14 @@
                  preprocess="true"
                  type="chrome_html" />
       <!-- TODO(jamescook): Remove after sync settings is forked. -->
+      <structure name="IDR_OS_SETTINGS_PASSWORDS_LEAK_DETECTION_TOGGLE_HTML"
+                 file="privacy_page/passwords_leak_detection_toggle.html"
+                 type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_PASSWORDS_LEAK_DETECTION_TOGGLE_JS"
+                 file="privacy_page/passwords_leak_detection_toggle.js"
+                 type="chrome_html"
+                 preprocess="true" />
+      <!-- TODO(jamescook): Remove after sync settings is forked. -->
       <structure name="IDR_OS_SETTINGS_PRIVACY_PAGE_HTML"
                  file="privacy_page/privacy_page.html"
                  type="chrome_html"
@@ -906,6 +929,12 @@
                  file="route.js"
                  type="chrome_html"
                  preprocess="true" />
+      <structure name="IDR_SETTINGS_ROUTE_ORIGIN_BEHAVIOR_HTML"
+                 file="route_origin_behavior.html"
+                 type="chrome_html" />
+      <structure name="IDR_SETTINGS_ROUTE_ORIGIN_BEHAVIOR_JS"
+                 file="route_origin_behavior.js"
+                 type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_SITE_FAVICON_HTML"
                  file="site_favicon.html"
                  type="chrome_html" />
@@ -1147,6 +1176,18 @@
       <structure name="IDR_OS_SETTINGS_CROSTINI_SUBPAGE_JS"
                  file="crostini_page/crostini_subpage.js"
                  type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_CROSTINI_ARC_ADB_HTML"
+                 file="crostini_page/crostini_arc_adb.html"
+                 type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_CROSTINI_ARC_ADB_JS"
+                 file="crostini_page/crostini_arc_adb.js"
+                 type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_CROSTINI_ARC_ADB_CONFIRMATION_DIALOG_HTML"
+                 file="crostini_page/crostini_arc_adb_confirmation_dialog.html"
+                 type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_CROSTINI_ARC_ADB_CONFIRMATION_DIALOG_JS"
+                 file="crostini_page/crostini_arc_adb_confirmation_dialog.js"
+                 type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_EXPORT_IMPORT_HTML"
                  file="crostini_page/crostini_export_import.html"
                  type="chrome_html" />