Backed out changeset 9e894095a614 (bug 1831601) for causing failures …

…in browser_all_files_referenced.js CLOSED TREE
iaxat · May 8, 2023 · 488de20 · 488de20
1 parent 427029f
commit 488de20
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 26 deletions.
diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp
@@ -70,11 +70,10 @@ static const RedirEntry kRedirMap[] = {
          nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |
          nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
          nsIAboutModule::IS_SECURE_CHROME_UI},
-    {"firefoxview", "chrome://browser/content/firefoxview/firefoxview.html",
+    {"firefoxview", "chrome://browser/content/firefoxview.html",
      nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI |
          nsIAboutModule::HIDE_FROM_ABOUTABOUT},
-    {"firefoxview-next",
-     "chrome://browser/content/firefoxview/firefoxview-next.html",
+    {"firefoxview-next", "chrome://browser/content/firefoxview-next.html",
      nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI |
          nsIAboutModule::HIDE_FROM_ABOUTABOUT},
     {"policies", "chrome://browser/content/policies/aboutPolicies.html",

diff --git a/browser/components/firefoxview/firefoxview.html b/browser/components/firefoxview/firefoxview.html
@@ -15,11 +15,11 @@
     <link rel="localization" href="toolkit/branding/accounts.ftl"/>
     <link rel="localization" href="toolkit/branding/brandings.ftl"/>
     <link rel="stylesheet" href="chrome://global/skin/in-content/common.css">
-    <link rel="stylesheet" href="chrome://browser/content/firefoxview/firefoxview.css">
-    <script type="module" src="chrome://browser/content/firefoxview/tab-pickup-container.mjs"></script>
-    <script type="module" src="chrome://browser/content/firefoxview/firefoxview.mjs"></script>
-    <script type="module" src="chrome://browser/content/firefoxview/recently-closed-tabs.mjs"></script>
-    <script type="module" src="chrome://browser/content/firefoxview/tab-pickup-list.mjs"></script>
+    <link rel="stylesheet" href="chrome://browser/content/firefoxview.css">
+    <script type="module" src="chrome://browser/content/tab-pickup-container.mjs"></script>
+    <script type="module" src="chrome://browser/content/firefoxview.mjs"></script>
+    <script type="module" src="chrome://browser/content/recently-closed-tabs.mjs"></script>
+    <script type="module" src="chrome://browser/content/tab-pickup-list.mjs"></script>
     <script src="chrome://browser/content/contentTheme.js"></script>
   </head>
 
@@ -113,7 +113,7 @@ <h2 id="tabpickup-steps-view3-header" data-l10n-id="firefoxview-tabpickup-syncta
             <ol hidden="true" class="synced-tabs-list"></ol>
           </tab-pickup-list>
           <div hidden id="synced-tabs-placeholder" class="placeholder-content">
-            <img id="tab-pickup-empty-image" src="chrome://browser/content/firefoxview/tab-pickup-empty.svg" role="presentation" alt=""/>
+            <img id="tab-pickup-empty-image" src="chrome://browser/content/tab-pickup-empty.svg" role="presentation" alt=""/>
             <div class="placeholder-text">
               <h4 data-l10n-id="firefoxview-synced-tabs-placeholder-header" class="placeholder-header"></h4>
               <p data-l10n-id="firefoxview-synced-tabs-placeholder-body" class="placeholder-body"></p>

diff --git a/browser/components/firefoxview/jar.mn b/browser/components/firefoxview/jar.mn
@@ -3,20 +3,20 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 browser.jar:
-    content/browser/firefoxview/firefoxview.html (firefoxview.html)
-    content/browser/firefoxview/firefoxview-next.html (firefoxview-next.html)
-    content/browser/firefoxview/firefoxview.mjs (firefoxview.mjs)
-    content/browser/firefoxview/firefoxview.css (firefoxview.css)
-    content/browser/firefoxview/helpers.mjs (helpers.mjs)
-    content/browser/firefoxview/moz-tab-list.css (moz-tab-list.css)
-    content/browser/firefoxview/moz-tab-list.mjs (moz-tab-list.mjs)
-    content/browser/firefoxview/moz-tab-row.css (moz-tab-row.css)
-    content/browser/firefoxview/tab-pickup-container.mjs (tab-pickup-container.mjs)
-    content/browser/firefoxview/tab-pickup-list.mjs (tab-pickup-list.mjs)
-    content/browser/firefoxview/recently-closed-tabs.mjs (recently-closed-tabs.mjs)
-    content/browser/firefoxview/recently-closed-empty.svg (content/recently-closed-empty.svg)
-    content/browser/firefoxview/tab-pickup-empty.svg (content/tab-pickup-empty.svg)
+    content/browser/firefoxview.html
+    content/browser/firefoxview-next.html
+    content/browser/firefoxview.mjs
+    content/browser/firefoxview.css
+    content/browser/helpers.mjs
+    content/browser/moz-tab-list.css
+    content/browser/moz-tab-list.mjs
+    content/browser/moz-tab-row.css
+    content/browser/tab-pickup-container.mjs
+    content/browser/tab-pickup-list.mjs
+    content/browser/recently-closed-tabs.mjs
     content/browser/callout-tab-pickup.svg (content/callout-tab-pickup.svg)
     content/browser/callout-tab-pickup-dark.svg (content/callout-tab-pickup-dark.svg)
     content/browser/cfr-lightning.svg (content/cfr-lightning.svg)
     content/browser/cfr-lightning-dark.svg (content/cfr-lightning-dark.svg)
+    content/browser/recently-closed-empty.svg (content/recently-closed-empty.svg)
+    content/browser/tab-pickup-empty.svg (content/tab-pickup-empty.svg)
diff --git a/browser/components/firefoxview/moz-tab-list.mjs b/browser/components/firefoxview/moz-tab-list.mjs
@@ -186,7 +186,7 @@ export default class MozTabList extends MozLitElement {
   // Use a relative URL in storybook to get faster reloads on style changes.
   static stylesheetUrl = window.IS_STORYBOOK
     ? "./moz-tab-list.css"
-    : "chrome://browser/content/firefoxview/moz-tab-list.css";
+    : "chrome://browser/content/moz-tab-list.css";
 
   render() {
     this.tabItems = this.tabItems.slice(0, this.maxTabsLength);
@@ -311,7 +311,7 @@ export class MozTabRow extends MozLitElement {
   // Use a relative URL in storybook to get faster reloads on style changes.
   static stylesheetUrl = window.IS_STORYBOOK
     ? "./moz-tab-row.css"
-    : "chrome://browser/content/firefoxview/moz-tab-row.css";
+    : "chrome://browser/content/moz-tab-row.css";
 
   dateFluentArgs(timestamp, dateTimeFormat) {
     if (dateTimeFormat === "date" || dateTimeFormat === "dateTime") {

diff --git a/browser/components/firefoxview/recently-closed-tabs.mjs b/browser/components/firefoxview/recently-closed-tabs.mjs
@@ -237,7 +237,7 @@ class RecentlyClosedTabsList extends MozLitElement {
       >
         <img
           id="recently-closed-empty-image"
-          src="chrome://browser/content/firefoxview/recently-closed-empty.svg"
+          src="chrome://browser/content/recently-closed-empty.svg"
           role="presentation"
           alt=""
         />

diff --git a/browser/components/firefoxview/tests/chrome/test_moz_tab_list.html b/browser/components/firefoxview/tests/chrome/test_moz_tab_list.html
@@ -8,7 +8,7 @@
   <link rel="localization" href="browser/places.ftl">
   <link rel="stylesheet" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
   <link rel="stylesheet" href="chrome://global/skin/in-content/common.css">
-  <script type="module" src="chrome://browser/content/firefoxview/moz-tab-list.mjs"></script>
+  <script type="module" src="chrome://browser/content/moz-tab-list.mjs"></script>
 </head>
 <body>
   <style>