BASELINE: Update Chromium to 88.0.4324.208

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

5 files changed, 109 insertions, 233 deletions

diff --git a/chromium/chrome/browser/resources/extensions/BUILD.gn b/chromium/chrome/browser/resources/extensions/BUILD.gn
index c7563df6715..cfed148d68b 100644
--- a/chromium/chrome/browser/resources/extensions/BUILD.gn
+++ b/chromium/chrome/browser/resources/extensions/BUILD.gn
@@ -4,18 +4,25 @@
 
 import("//chrome/common/features.gni")
 import("//third_party/closure_compiler/compile_js.gni")
+import("//tools/grit/grit_rule.gni")
 import("//tools/grit/preprocess_grit.gni")
 import("//tools/polymer/html_to_js.gni")
+import("//ui/webui/resources/tools/generate_grd.gni")
 import("../optimize_webui.gni")
 
+preprocess_folder = "preprocessed"
+preprocess_manifest = "preprocessed_manifest.json"
+preprocess_gen_manifest = "preprocessed_gen_manifest.json"
+
 if (optimize_webui) {
-  preprocess_folder = "preprocessed"
+  build_manifest = "build_manifest.json"
 
   optimize_webui("build") {
     host = "extensions"
     input = rebase_path("$target_gen_dir/$preprocess_folder", root_build_dir)
     js_out_files = [ "extensions.rollup.js" ]
     js_module_in_files = [ "extensions.js" ]
+    out_manifest = "$target_gen_dir/$build_manifest"
 
     deps = [
       ":preprocess",
@@ -24,65 +31,93 @@ if (optimize_webui) {
     ]
     excludes = [ "chrome://resources/js/cr.m.js" ]
   }
+}
+
+generate_grd("build_grd") {
+  grd_prefix = "extensions"
+  out_grd = "$target_gen_dir/${grd_prefix}_resources.grd"
+  input_files = [
+    "checkup_image_dark.svg",
+    "checkup_image.svg",
+    "extensions.html",
+  ]
+  input_files_base_dir = rebase_path(".", "//")
 
-  preprocess_grit("preprocess") {
-    in_folder = "./"
-    out_folder = "$target_gen_dir/$preprocess_folder"
-    in_files = [
-      "drag_and_drop_handler.js",
-      "extensions.js",
-      "item_behavior.js",
-      "item_util.js",
-      "keyboard_shortcut_delegate.js",
-      "navigation_helper.js",
-      "service.js",
-      "shortcut_util.js",
+  if (optimize_webui) {
+    deps = [ ":build" ]
+    resource_path_rewrites = [ "extensions.rollup.js|extensions.js" ]
+    manifest_files = [ "$target_gen_dir/$build_manifest" ]
+  } else {
+    deps = [
+      ":preprocess",
+      ":preprocess_generated",
+    ]
+    manifest_files = [
+      "$target_gen_dir/$preprocess_manifest",
+      "$target_gen_dir/$preprocess_gen_manifest",
     ]
+  }
+}
+
+preprocess_grit("preprocess") {
+  in_folder = "./"
+  out_folder = "$target_gen_dir/$preprocess_folder"
+  out_manifest = "$target_gen_dir/$preprocess_manifest"
+  in_files = [
+    "drag_and_drop_handler.js",
+    "extensions.js",
+    "item_behavior.js",
+    "item_util.js",
+    "keyboard_shortcut_delegate.js",
+    "navigation_helper.js",
+    "service.js",
+    "shortcut_util.js",
+  ]
 
-    if (is_chromeos) {
-      in_files += [ "kiosk_browser_proxy.js" ]
-    }
+  if (is_chromeos) {
+    in_files += [ "kiosk_browser_proxy.js" ]
   }
+}
 
-  preprocess_grit("preprocess_generated") {
-    deps = [ ":web_components" ]
-    in_folder = target_gen_dir
-    out_folder = "$target_gen_dir/$preprocess_folder"
-    in_files = [
-      "checkup.js",
-      "code_section.js",
-      "activity_log/activity_log_history_item.js",
-      "activity_log/activity_log_history.js",
-      "activity_log/activity_log.js",
-      "activity_log/activity_log_stream_item.js",
-      "activity_log/activity_log_stream.js",
-      "detail_view.js",
-      "drop_overlay.js",
-      "error_page.js",
-      "host_permissions_toggle_list.js",
-      "icons.js",
-      "install_warnings_dialog.js",
-      "item.js",
-      "item_list.js",
-      "keyboard_shortcuts.js",
-      "load_error.js",
-      "manager.js",
-      "options_dialog.js",
-      "pack_dialog_alert.js",
-      "pack_dialog.js",
-      "runtime_host_permissions.js",
-      "runtime_hosts_dialog.js",
-      "shared_style.js",
-      "shared_vars.js",
-      "shortcut_input.js",
-      "sidebar.js",
-      "toggle_row.js",
-      "toolbar.js",
-    ]
+preprocess_grit("preprocess_generated") {
+  deps = [ ":web_components" ]
+  in_folder = target_gen_dir
+  out_folder = "$target_gen_dir/$preprocess_folder"
+  out_manifest = "$target_gen_dir/$preprocess_gen_manifest"
+  in_files = [
+    "checkup.js",
+    "code_section.js",
+    "activity_log/activity_log_history_item.js",
+    "activity_log/activity_log_history.js",
+    "activity_log/activity_log.js",
+    "activity_log/activity_log_stream_item.js",
+    "activity_log/activity_log_stream.js",
+    "detail_view.js",
+    "drop_overlay.js",
+    "error_page.js",
+    "host_permissions_toggle_list.js",
+    "icons.js",
+    "install_warnings_dialog.js",
+    "item.js",
+    "item_list.js",
+    "keyboard_shortcuts.js",
+    "load_error.js",
+    "manager.js",
+    "options_dialog.js",
+    "pack_dialog_alert.js",
+    "pack_dialog.js",
+    "runtime_host_permissions.js",
+    "runtime_hosts_dialog.js",
+    "shared_style.js",
+    "shared_vars.js",
+    "shortcut_input.js",
+    "sidebar.js",
+    "toggle_row.js",
+    "toolbar.js",
+  ]
 
-    if (is_chromeos) {
-      in_files += [ "kiosk_dialog.js" ]
-    }
+  if (is_chromeos) {
+    in_files += [ "kiosk_dialog.js" ]
   }
 }
 
@@ -133,6 +168,23 @@ html_to_js("web_components_local") {
   }
 }
 
+grit("extensions_resources") {
+  defines = chrome_grit_defines
+
+  # These arguments are needed since the grd is generated at build time.
+  enable_input_discovery_for_gn_analyze = false
+  source = "$target_gen_dir/extensions_resources.grd"
+  deps = [ ":build_grd" ]
+
+  outputs = [
+    "grit/extensions_resources.h",
+    "grit/extensions_resources_map.cc",
+    "grit/extensions_resources_map.h",
+    "extensions_resources.pak",
+  ]
+  output_dir = "$root_gen_dir/chrome"
+}
+
 js_type_check("extensions_module_resources") {
   is_polymer3 = true
   deps = [
diff --git a/chromium/chrome/browser/resources/extensions/detail_view.html b/chromium/chrome/browser/resources/extensions/detail_view.html
index fc42d3289b4..17bb9b7e1d5 100644
--- a/chromium/chrome/browser/resources/extensions/detail_view.html
+++ b/chromium/chrome/browser/resources/extensions/detail_view.html
@@ -377,7 +377,8 @@
         external></cr-link-row>
     <cr-link-row class="hr"
         id="extensionsActivityLogLink" hidden$="[[!showActivityLog]]"
-        label="$i18n{viewActivityLog}" on-click="onActivityLogTap_">
+        label="$i18n{viewActivityLog}" on-click="onActivityLogTap_"
+        role-description="$i18n{subpageArrowRoleDescription}">
     </cr-link-row>
     <cr-link-row class="hr" hidden="[[!data.manifestHomePageUrl.length]]"
         id="extensionWebsite" label="$i18n{extensionWebsite}"
diff --git a/chromium/chrome/browser/resources/extensions/extensions.html b/chromium/chrome/browser/resources/extensions/extensions.html
index c5980f41fd1..3aa5c713503 100644
--- a/chromium/chrome/browser/resources/extensions/extensions.html
+++ b/chromium/chrome/browser/resources/extensions/extensions.html
@@ -3,6 +3,7 @@
     class="loading $i18n{loadTimeClasses}">
 <head>
   <meta charset="utf8">
+  <meta name="color-scheme" content="light dark">
   <title>$i18n{title}</title>
   <base href="chrome://extensions">
   <link rel="stylesheet" href="chrome://resources/css/md_colors.css">
diff --git a/chromium/chrome/browser/resources/extensions/extensions_resources.grd b/chromium/chrome/browser/resources/extensions/extensions_resources.grd
deleted file mode 100644
index b77dcf0982e..00000000000
--- a/chromium/chrome/browser/resources/extensions/extensions_resources.grd
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
-  <outputs>
-    <output filename="grit/extensions_resources.h" type="rc_header">
-      <emit emit_type='prepend'></emit>
-    </output>
-    <output filename="grit/extensions_resources_map.cc"
-            type="resource_file_map_source" />
-    <output filename="grit/extensions_resources_map.h"
-            type="resource_map_header" />
-    <output filename="extensions_resources.pak" type="data_package" />
-  </outputs>
-  <release seq="1">
-    <includes>
-      <include name="IDR_EXTENSIONS_CODE_SECTION_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/code_section.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_LOG_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/activity_log/activity_log.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_LOG_HISTORY_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/activity_log/activity_log_history.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_LOG_HISTORY_ITEM_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/activity_log/activity_log_history_item.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_LOG_STREAM_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/activity_log/activity_log_stream.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_LOG_STREAM_ITEM_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/activity_log/activity_log_stream_item.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_CHECKUP_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/checkup.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_DETAIL_VIEW_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/detail_view.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_DROP_OVERLAY_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/drop_overlay.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_ERROR_PAGE_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/error_page.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_KEYBOARD_SHORTCUTS_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/keyboard_shortcuts.js"
-               use_base_dir="false" type="BINDATA" />
-    <if expr="chromeos">
-      <include name="IDR_EXTENSIONS_KIOSK_DIALOG_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/kiosk_dialog.js"
-               use_base_dir="false" type="BINDATA" />
-    </if>
-      <include name="IDR_EXTENSIONS_MANAGER_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/manager.js"
-               preprocess="true" use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_ICONS_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/icons.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_INSTALL_WARNINGS_DIALOG_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/install_warnings_dialog.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_ITEM_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/item.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_ITEM_LIST_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/item_list.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_LOAD_ERROR_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/load_error.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_HOST_PERMISSIONS_TOGGLE_LIST_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/host_permissions_toggle_list.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_OPTIONS_DIALOG_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/options_dialog.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_PACK_DIALOG_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/pack_dialog.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_PACK_DIALOG_ALERT_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/pack_dialog_alert.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_RUNTIME_HOST_PERMISSIONS_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/runtime_host_permissions.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_RUNTIME_HOSTS_DIALOG_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/runtime_hosts_dialog.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_SHARED_STYLE_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/shared_style.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_SHARED_VARS_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/shared_vars.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_SHORTCUT_INPUT_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/shortcut_input.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_SIDEBAR_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/sidebar.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_TOGGLE_ROW_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/toggle_row.js"
-               use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_TOOLBAR_JS"
-               file="${root_gen_dir}/chrome/browser/resources/extensions/toolbar.js"
-               preprocess="true" use_base_dir="false" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_CHECKUP_IMAGE"
-               file="checkup_image.svg" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_CHECKUP_IMAGE_DARK"
-               file="checkup_image_dark.svg" type="BINDATA" />
-    </includes>
-    <structures>
-      <structure name="IDR_EXTENSIONS_ITEM_BEHAVIOR_JS"
-                 file="item_behavior.js"
-                 type="chrome_html" />
-      <structure name="IDR_EXTENSIONS_EXTENSIONS_HTML"
-                 file="extensions.html"
-                 type="chrome_html" />
-      <structure name="IDR_EXTENSIONS_DRAG_AND_DROP_HANDLER_JS"
-                 file="drag_and_drop_handler.js"
-                 type="chrome_html" />
-      <structure name="IDR_EXTENSIONS_EXTENSIONS_JS"
-                 file="extensions.js"
-                 preprocess="true"
-                 type="chrome_html" />
-      <structure name="IDR_EXTENSIONS_KEYBOARD_SHORTCUT_DELEGATE_JS"
-                 file="keyboard_shortcut_delegate.js"
-                 type="chrome_html" />
-    <if expr="chromeos">
-      <structure name="IDR_EXTENSIONS_KIOSK_BROWSER_PROXY_JS"
-                 file="kiosk_browser_proxy.js"
-                 type="chrome_html" />
-    </if>
-      <structure name="IDR_EXTENSIONS_ITEM_UTIL_JS"
-                 file="item_util.js"
-                 type="chrome_html" />
-      <structure name="IDR_EXTENSIONS_NAVIGATION_HELPER_JS"
-                 file="navigation_helper.js"
-                 type="chrome_html" />
-      <structure name="IDR_EXTENSIONS_SERVICE_JS"
-                 file="service.js"
-                 type="chrome_html" />
-      <structure name="IDR_EXTENSIONS_SHORTCUT_UTIL_JS"
-                 file="shortcut_util.js"
-                 type="chrome_html" />
-    </structures>
-  </release>
-</grit>
diff --git a/chromium/chrome/browser/resources/extensions/extensions_resources_vulcanized.grd b/chromium/chrome/browser/resources/extensions/extensions_resources_vulcanized.grd
deleted file mode 100644
index c8cbd992824..00000000000
--- a/chromium/chrome/browser/resources/extensions/extensions_resources_vulcanized.grd
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
-  <outputs>
-    <output filename="grit/extensions_resources.h" type="rc_header">
-      <emit emit_type='prepend'></emit>
-    </output>
-    <output filename="grit/extensions_resources_map.cc"
-            type="resource_map_source" />
-    <output filename="grit/extensions_resources_map.h"
-            type="resource_map_header" />
-    <output filename="extensions_resources.pak" type="data_package" />
-  </outputs>
-  <release seq="1">
-    <includes>
-      <include name="IDR_EXTENSIONS_EXTENSIONS_HTML"
-               file="extensions.html"
-               type="chrome_html" />
-      <include name="IDR_EXTENSIONS_EXTENSIONS_ROLLUP_JS"
-               file="${root_gen_dir}\chrome\browser\resources\extensions\extensions.rollup.js"
-               use_base_dir="false"
-               type="BINDATA" />
-      <include name="IDR_EXTENSIONS_CHECKUP_IMAGE"
-               file="checkup_image.svg"
-               type="BINDATA" />
-      <include name="IDR_EXTENSIONS_CHECKUP_IMAGE_DARK"
-               file="checkup_image_dark.svg"
-               type="BINDATA" />
-    </includes>
-  </release>
-</grit>