Image Loader: Add explicit background.html

This is a preparation to migrate to JS modules. Bug: 1133186 Change-Id: I92b0e8c2078a1ecdb3ef814c5c6479c5b97df592 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2469653 Commit-Queue: Luciano Pacheco <lucmult@chromium.org> Reviewed-by: Noel Gordon <noel@chromium.org> Auto-Submit: Luciano Pacheco <lucmult@chromium.org> Cr-Commit-Position: refs/heads/master@{#818410}

Image Loader: Add explicit background.html
This is a preparation to migrate to JS modules. Bug: 1133186 Change-Id: I92b0e8c2078a1ecdb3ef814c5c6479c5b97df592 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2469653 Commit-Queue: Luciano Pacheco <lucmult@chromium.org> Reviewed-by: Noel Gordon <noel@chromium.org> Auto-Submit: Luciano Pacheco <lucmult@chromium.org> Cr-Commit-Position: refs/heads/master@{#818410}
9c730fae · Luciano Pacheco · Commit Bot · cb51eef7 · 9c730fae · 9c730fae
Commit 9c730fae authored Oct 19, 2020 by Luciano Pacheco Committed by Commit Bot Oct 19, 2020
3 changed files
--- a/ui/file_manager/file_manager_resources.grd
+++ b/ui/file_manager/file_manager_resources.grd
@@ -181,6 +181,7 @@
      <if expr="chromeos">
        <include name="IDR_IMAGE_LOADER_MANIFEST" file="image_loader/manifest.json" type="BINDATA" />
        <include name="IDR_IMAGE_LOADER_BACKGROUND_JS" file="image_loader/background_scripts.js" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_IMAGE_LOADER_BACKGROUND_HTML" file="image_loader/background.html" type="BINDATA" />
        <include name="IDR_IMAGE_LOADER_CLIENT_JS" file="image_loader/image_loader_client.js" type="BINDATA" />
        <include name="IDR_IMAGE_LOADER_PIEX_WASM_JS" file="image_loader/piex/piex.js.wasm" type="BINDATA" />
        <include name="IDR_IMAGE_LOADER_PIEX_WASM" file="image_loader/piex/piex.out.wasm" type="BINDATA" />

--- a/ui/file_manager/image_loader/background.html
+++ b/ui/file_manager/image_loader/background.html
+<!DOCTYPE html>
+<meta charset="utf-8">
+
+<script src="chrome://resources/js/assert.js"></script>
+<script src="piex/piex.js.wasm"></script>
+<script src="background_scripts.js"></script>
--- a/ui/file_manager/image_loader/manifest.json
+++ b/ui/file_manager/image_loader/manifest.json
@@ -17,11 +17,7 @@
  ],
  "content_security_policy": "default-src 'none'; script-src 'self' 'wasm-eval' blob: filesystem: chrome://resources chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj; style-src 'self' blob: filesystem:; frame-src 'self' blob: filesystem:; img-src 'self' blob: filesystem: data:; media-src 'self' blob: filesystem:; connect-src 'self' blob: filesystem:",
  "background": {
-    "scripts": [
-      "chrome://resources/js/assert.js",
-      "piex/piex.js.wasm",
-      "background_scripts.js"
-    ],
+    "page": "background.html",
    "persistent": false
  },
  "natively_connectable": ["com.google.holding_space_thumbnail_loader"],