Merge pull request #18651 from Rob--W/crx-mv3-prep-drop-manifest

[CRX] Remove obsolete manifest features
mozilla · Aug 29, 2024 · ce65623 · ce65623
2 parents ea090fe + 1d54538
commit ce65623
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 286 deletions.
diff --git a/extensions/chromium/extension-router.js b/extensions/chromium/extension-router.js
@@ -23,7 +23,6 @@ limitations under the License.
   var schemes = [
     "http",
     "https",
-    "ftp",
     "file",
     "chrome-extension",
     "blob",

diff --git a/extensions/chromium/icon19.png b/extensions/chromium/icon19.png
diff --git a/extensions/chromium/icon38.png b/extensions/chromium/icon38.png
diff --git a/extensions/chromium/manifest.json b/extensions/chromium/manifest.json
@@ -10,7 +10,6 @@
     "16": "icon16.png"
   },
   "permissions": [
-    "fileBrowserHandler",
     "webRequest",
     "webRequestBlocking",
     "<all_urls>",
@@ -20,21 +19,13 @@
   ],
   "content_scripts": [
     {
-      "matches": ["http://*/*", "https://*/*", "ftp://*/*", "file://*/*"],
+      "matches": ["http://*/*", "https://*/*", "file://*/*"],
       "run_at": "document_start",
       "all_frames": true,
       "css": ["contentstyle.css"],
       "js": ["contentscript.js"]
     }
   ],
-  "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",
-  "file_browser_handlers": [
-    {
-      "id": "open-as-pdf",
-      "default_title": "Open with PDF Viewer",
-      "file_filters": ["filesystem:*.pdf"]
-    }
-  ],
   "storage": {
     "managed_schema": "preferences_schema.json"
   },
@@ -46,20 +37,11 @@
   "background": {
     "page": "pdfHandler.html"
   },
-  "page_action": {
-    "default_icon": {
-      "19": "icon19.png",
-      "38": "icon38.png"
-    },
-    "default_title": "Show PDF URL",
-    "default_popup": "pageActionPopup.html"
-  },
   "incognito": "split",
   "web_accessible_resources": [
     "content/web/viewer.html",
     "http:/*",
     "https:/*",
-    "ftp:/*",
     "file:/*",
     "chrome-extension:/*",
     "blob:*",

diff --git a/extensions/chromium/pageAction/background.js b/extensions/chromium/pageAction/background.js
diff --git a/extensions/chromium/pageAction/popup.html b/extensions/chromium/pageAction/popup.html
diff --git a/extensions/chromium/pageAction/popup.js b/extensions/chromium/pageAction/popup.js
diff --git a/extensions/chromium/pdfHandler-vcros.js b/extensions/chromium/pdfHandler-vcros.js
diff --git a/extensions/chromium/pdfHandler.html b/extensions/chromium/pdfHandler.html
@@ -18,7 +18,5 @@
 <script src="preserve-referer.js"></script>
 <script src="pdfHandler.js"></script>
 <script src="extension-router.js"></script>
-<script src="pdfHandler-vcros.js"></script>
-<script src="pageAction/background.js"></script>
 <script src="suppress-update.js"></script>
 <script src="telemetry.js"></script>
diff --git a/extensions/chromium/preserve-referer.js b/extensions/chromium/preserve-referer.js
@@ -87,11 +87,6 @@ chrome.runtime.onConnect.addListener(function onReceivePort(port) {
   if (port.name !== "chromecom-referrer") {
     return;
   }
-  // Note: sender.frameId is only set in Chrome 41+.
-  if (!("frameId" in port.sender)) {
-    port.disconnect();
-    return;
-  }
   var tabId = port.sender.tab.id;
   var frameId = port.sender.frameId;
 
@@ -127,21 +122,8 @@ chrome.runtime.onConnect.addListener(function onReceivePort(port) {
       delete g_referrers[tabId][frameId];
     }
     chrome.webRequest.onBeforeSendHeaders.removeListener(onBeforeSendHeaders);
-    chrome.webRequest.onHeadersReceived.removeListener(exposeOnHeadersReceived);
   });
 
-  // Expose some response headers for fetch API calls from PDF.js;
-  // This is a work-around for https://crbug.com/784528
-  chrome.webRequest.onHeadersReceived.addListener(
-    exposeOnHeadersReceived,
-    {
-      urls: ["https://*/*"],
-      types: ["xmlhttprequest"],
-      tabId,
-    },
-    ["blocking", "responseHeaders"]
-  );
-
   function onBeforeSendHeaders(details) {
     if (details.frameId !== frameId) {
       return undefined;
@@ -162,22 +144,4 @@ chrome.runtime.onConnect.addListener(function onReceivePort(port) {
     refererHeader.value = referer;
     return { requestHeaders: headers };
   }
-
-  function exposeOnHeadersReceived(details) {
-    if (details.frameId !== frameId) {
-      return undefined;
-    }
-    var headers = details.responseHeaders;
-    var aceh = getHeaderFromHeaders(headers, "access-control-expose-headers");
-    // List of headers that PDF.js uses in src/display/network_utils.js
-    var acehValue =
-      "accept-ranges,content-encoding,content-length,content-disposition";
-    if (aceh) {
-      aceh.value += "," + acehValue;
-    } else {
-      aceh = { name: "Access-Control-Expose-Headers", value: acehValue };
-      headers.push(aceh);
-    }
-    return { responseHeaders: headers };
-  }
 });
diff --git a/web/chromecom.js b/web/chromecom.js
@@ -36,9 +36,6 @@ if (typeof PDFJSDev === "undefined" || !PDFJSDev.test("CHROME")) {
   // Example: chrome-extension://.../http://example.com/file.pdf
   const humanReadableUrl = "/" + defaultUrl + location.hash;
   history.replaceState(history.state, "", humanReadableUrl);
-  if (top === window) {
-    chrome.runtime.sendMessage("showPageAction");
-  }
 
   AppOptions.set("defaultUrl", defaultUrl);
 })();

diff --git a/web/pdf_history.js b/web/pdf_history.js
@@ -394,15 +394,6 @@ class PDFHistory {
     } else {
       window.history.pushState(newState, "", newUrl);
     }
-
-    if (
-      typeof PDFJSDev !== "undefined" &&
-      PDFJSDev.test("CHROME") &&
-      top === window
-    ) {
-      // eslint-disable-next-line no-undef
-      chrome.runtime.sendMessage("showPageAction");
-    }
   }
 
   #tryPushCurrentPosition(temporary = false) {