Skip to content

Commit ecba558

Browse files
mkaplymkaply
committed
Bug 1831601 - Switch view chrome URLS to have a firefoxview specific path. r=kcochrane,fxview-reviewers
Differential Revision: https://phabricator.services.mozilla.com/D177283
1 parent 3e1c0ad commit ecba558

File tree

7 files changed

+29
-28
lines changed

7 files changed

+29
-28
lines changed

‎browser/base/content/test/static/browser_all_files_referenced.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,9 +314,9 @@ var whitelist = [
314314

315315
// Should be removed in bug 1824826 when moz-tab-list is used in Firefox View
316316
{ file: "resource://app/localization/en-US/browser/mozTabList.ftl" },
317-
{ file: "chrome://browser/content/moz-tab-list.css" },
318-
{ file: "chrome://browser/content/moz-tab-list.mjs" },
319-
{ file: "chrome://browser/content/moz-tab-row.css" },
317+
{ file: "chrome://browser/content/firefoxview/moz-tab-list.css" },
318+
{ file: "chrome://browser/content/firefoxview/moz-tab-list.mjs" },
319+
{ file: "chrome://browser/content/firefoxview/moz-tab-row.css" },
320320
];
321321

322322
if (AppConstants.NIGHTLY_BUILD && AppConstants.platform != "win") {

‎browser/components/about/AboutRedirector.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,11 @@ static const RedirEntry kRedirMap[] = {
7070
nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |
7171
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
7272
nsIAboutModule::IS_SECURE_CHROME_UI},
73-
{"firefoxview", "chrome://browser/content/firefoxview.html",
73+
{"firefoxview", "chrome://browser/content/firefoxview/firefoxview.html",
7474
nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI |
7575
nsIAboutModule::HIDE_FROM_ABOUTABOUT},
76-
{"firefoxview-next", "chrome://browser/content/firefoxview-next.html",
76+
{"firefoxview-next",
77+
"chrome://browser/content/firefoxview/firefoxview-next.html",
7778
nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI |
7879
nsIAboutModule::HIDE_FROM_ABOUTABOUT},
7980
{"policies", "chrome://browser/content/policies/aboutPolicies.html",

‎browser/components/firefoxview/firefoxview.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<link rel="localization" href="toolkit/branding/accounts.ftl"/>
1616
<link rel="localization" href="toolkit/branding/brandings.ftl"/>
1717
<link rel="stylesheet" href="chrome://global/skin/in-content/common.css">
18-
<link rel="stylesheet" href="chrome://browser/content/firefoxview.css">
19-
<script type="module" src="chrome://browser/content/tab-pickup-container.mjs"></script>
20-
<script type="module" src="chrome://browser/content/firefoxview.mjs"></script>
21-
<script type="module" src="chrome://browser/content/recently-closed-tabs.mjs"></script>
22-
<script type="module" src="chrome://browser/content/tab-pickup-list.mjs"></script>
18+
<link rel="stylesheet" href="chrome://browser/content/firefoxview/firefoxview.css">
19+
<script type="module" src="chrome://browser/content/firefoxview/tab-pickup-container.mjs"></script>
20+
<script type="module" src="chrome://browser/content/firefoxview/firefoxview.mjs"></script>
21+
<script type="module" src="chrome://browser/content/firefoxview/recently-closed-tabs.mjs"></script>
22+
<script type="module" src="chrome://browser/content/firefoxview/tab-pickup-list.mjs"></script>
2323
<script src="chrome://browser/content/contentTheme.js"></script>
2424
</head>
2525

@@ -113,7 +113,7 @@ <h2 id="tabpickup-steps-view3-header" data-l10n-id="firefoxview-tabpickup-syncta
113113
<ol hidden="true" class="synced-tabs-list"></ol>
114114
</tab-pickup-list>
115115
<div hidden id="synced-tabs-placeholder" class="placeholder-content">
116-
<img id="tab-pickup-empty-image" src="chrome://browser/content/tab-pickup-empty.svg" role="presentation" alt=""/>
116+
<img id="tab-pickup-empty-image" src="chrome://browser/content/firefoxview/tab-pickup-empty.svg" role="presentation" alt=""/>
117117
<div class="placeholder-text">
118118
<h4 data-l10n-id="firefoxview-synced-tabs-placeholder-header" class="placeholder-header"></h4>
119119
<p data-l10n-id="firefoxview-synced-tabs-placeholder-body" class="placeholder-body"></p>

‎browser/components/firefoxview/jar.mn

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
44

55
browser.jar:
6-
content/browser/firefoxview.html
7-
content/browser/firefoxview-next.html
8-
content/browser/firefoxview.mjs
9-
content/browser/firefoxview.css
10-
content/browser/helpers.mjs
11-
content/browser/moz-tab-list.css
12-
content/browser/moz-tab-list.mjs
13-
content/browser/moz-tab-row.css
14-
content/browser/tab-pickup-container.mjs
15-
content/browser/tab-pickup-list.mjs
16-
content/browser/recently-closed-tabs.mjs
6+
content/browser/firefoxview/firefoxview.html
7+
content/browser/firefoxview/firefoxview-next.html
8+
content/browser/firefoxview/firefoxview.mjs
9+
content/browser/firefoxview/firefoxview.css
10+
content/browser/firefoxview/helpers.mjs
11+
content/browser/firefoxview/moz-tab-list.css
12+
content/browser/firefoxview/moz-tab-list.mjs
13+
content/browser/firefoxview/moz-tab-row.css
14+
content/browser/firefoxview/tab-pickup-container.mjs
15+
content/browser/firefoxview/tab-pickup-list.mjs
16+
content/browser/firefoxview/recently-closed-tabs.mjs
17+
content/browser/firefoxview/recently-closed-empty.svg (content/recently-closed-empty.svg)
18+
content/browser/firefoxview/tab-pickup-empty.svg (content/tab-pickup-empty.svg)
1719
content/browser/callout-tab-pickup.svg (content/callout-tab-pickup.svg)
1820
content/browser/callout-tab-pickup-dark.svg (content/callout-tab-pickup-dark.svg)
1921
content/browser/cfr-lightning.svg (content/cfr-lightning.svg)
2022
content/browser/cfr-lightning-dark.svg (content/cfr-lightning-dark.svg)
21-
content/browser/recently-closed-empty.svg (content/recently-closed-empty.svg)
22-
content/browser/tab-pickup-empty.svg (content/tab-pickup-empty.svg)

‎browser/components/firefoxview/moz-tab-list.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ export default class MozTabList extends MozLitElement {
186186
// Use a relative URL in storybook to get faster reloads on style changes.
187187
static stylesheetUrl = window.IS_STORYBOOK
188188
? "./moz-tab-list.css"
189-
: "chrome://browser/content/moz-tab-list.css";
189+
: "chrome://browser/content/firefoxview/moz-tab-list.css";
190190

191191
render() {
192192
this.tabItems = this.tabItems.slice(0, this.maxTabsLength);
@@ -311,7 +311,7 @@ export class MozTabRow extends MozLitElement {
311311
// Use a relative URL in storybook to get faster reloads on style changes.
312312
static stylesheetUrl = window.IS_STORYBOOK
313313
? "./moz-tab-row.css"
314-
: "chrome://browser/content/moz-tab-row.css";
314+
: "chrome://browser/content/firefoxview/moz-tab-row.css";
315315

316316
dateFluentArgs(timestamp, dateTimeFormat) {
317317
if (dateTimeFormat === "date" || dateTimeFormat === "dateTime") {

‎browser/components/firefoxview/recently-closed-tabs.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ class RecentlyClosedTabsList extends MozLitElement {
237237
>
238238
<img
239239
id="recently-closed-empty-image"
240-
src="chrome://browser/content/recently-closed-empty.svg"
240+
src="chrome://browser/content/firefoxview/recently-closed-empty.svg"
241241
role="presentation"
242242
alt=""
243243
/>

‎browser/components/firefoxview/tests/chrome/test_moz_tab_list.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<link rel="localization" href="browser/places.ftl">
99
<link rel="stylesheet" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
1010
<link rel="stylesheet" href="chrome://global/skin/in-content/common.css">
11-
<script type="module" src="chrome://browser/content/moz-tab-list.mjs"></script>
11+
<script type="module" src="chrome://browser/content/firefoxview/moz-tab-list.mjs"></script>
1212
</head>
1313
<body>
1414
<style>

0 commit comments

Comments
 (0)