Revert "Bug 1948415 - Create a moz-page-header component r=fluent-reviewers,desktop-theme-reviewers,mstriemer,bolsson,dao" for causing mochitest failures @ test_moz_page_header.html This reverts commit cac284b.

Author: amarc-mozilla

browser/components/preferences/preferences.js

@@ -168,7 +168,7 @@ function srdSectionEnabled(section) {
 const CONFIG_PANES = {
   containers2: {
     parent: "general",
-    l10nId: "containers-section-header",
+    l10nId: "containers-header",
     groupIds: ["containers"],
   },
 };

browser/components/preferences/widgets/setting-pane/setting-pane.mjs

@@ -20,6 +20,18 @@ export class SettingPane extends MozLitElement {
     window.gotoPref(this.config.parent);
   }
 
+  backButtonTemplate() {
+    if (!this.isSubPane) {
+      return "";
+    }
+    return html`<moz-button
+      type="icon"
+      title="Go back"
+      iconsrc="chrome://global/skin/icons/arrow-left.svg"
+      @click=${this.goBack}
+    ></moz-button>`;
+  }
+
   connectedCallback() {
     super.connectedCallback();
     this.setAttribute("data-category", this.name);
@@ -56,11 +68,10 @@ export class SettingPane extends MozLitElement {
 
   render() {
     return html`
-      <moz-page-header
-        data-l10n-id=${this.config.l10nId}
-        .backButton=${this.isSubPane}
-        @navigate-back=${this.goBack}
-      ></moz-page-header>
+      <div class="page-header">
+        ${this.backButtonTemplate()}
+        <h2 data-l10n-id=${this.config.l10nId}></h2>
+      </div>
       ${this.config.groupIds.map(groupId => this.groupTemplate(groupId))}
     `;
   }

browser/locales/en-US/browser/preferences/preferences.ftl

@@ -896,8 +896,6 @@ remove-addon-engine-alert = To remove this search engine, remove the associated
 containers-back-button2 =
     .aria-label = Back to Settings
 containers-header = Container Tabs
-containers-section-header =
-    .heading = Container Tabs
 containers-add-button =
     .label = Add New Container
     .accesskey = A

browser/themes/shared/preferences/preferences.css

@@ -1479,3 +1479,22 @@ richlistitem .text-link:hover {
     font-size: var(--font-size-small);
   }
 }
+
+/* START SRD temp page header styles (bug 1948415) */
+.page-header {
+  gap: var(--space-small);
+  align-items: center;
+
+  &:not([hidden]) {
+    display: flex;
+  }
+
+  > h2 {
+    margin: 0;
+  }
+
+  > moz-button:first-of-type:dir(rtl) {
+    scale: -1 1;
+  }
+}
+/* END SRD temp page header styles (bug 1948415) */

python/l10n/fluent_migrations/bug_1948415_containers_header_migration.py

@@ -851,13 +851,9 @@
         "moz-message-bar",
         "chrome://global/content/elements/moz-message-bar.mjs",
       ],
+      ["moz-promo", "chrome://global/content/elements/moz-promo.mjs"],
       ["moz-option", "chrome://global/content/elements/moz-select.mjs"],
-      [
-        "moz-page-header",
-        "chrome://global/content/elements/moz-page-header.mjs",
-      ],
       ["moz-page-nav", "chrome://global/content/elements/moz-page-nav.mjs"],
-      ["moz-promo", "chrome://global/content/elements/moz-promo.mjs"],
       ["moz-radio", "chrome://global/content/elements/moz-radio-group.mjs"],
       [
         "moz-radio-group",

toolkit/content/customElements.js

@@ -129,8 +129,6 @@ toolkit.jar:
    content/global/elements/moz-input-search.mjs    (widgets/moz-input-search/moz-input-search.mjs)
    content/global/elements/moz-input-text.css    (widgets/moz-input-text/moz-input-text.css)
    content/global/elements/moz-input-text.mjs    (widgets/moz-input-text/moz-input-text.mjs)
-   content/global/elements/moz-page-header.css    (widgets/moz-page-header/moz-page-header.css)
-   content/global/elements/moz-page-header.mjs    (widgets/moz-page-header/moz-page-header.mjs)
    content/global/elements/moz-page-nav.css    (widgets/moz-page-nav/moz-page-nav.css)
    content/global/elements/moz-page-nav-button.css    (widgets/moz-page-nav/moz-page-nav-button.css)
    content/global/elements/moz-page-nav.mjs    (widgets/moz-page-nav/moz-page-nav.mjs)

toolkit/content/jar.mn

@@ -64,8 +64,6 @@ skip-if = ["os == 'mac' && os_version == '14.70' && processor == 'x86_64'"] # Bu
 
 ["test_moz_message_bar.html"]
 
-["test_moz_page_header.html"]
-
 ["test_moz_page_nav.html"]
 
 ["test_moz_promo.html"]

toolkit/content/tests/widgets/chrome.toml

@@ -21,7 +21,7 @@ moz-breadcrumb-third =
   },
 };
 
-const Template = ({ l10nId, width, slot }) => {
+const Template = ({ l10nId, width }) => {
   return html`
     <style>
       ${width
@@ -31,7 +31,7 @@ const Template = ({ l10nId, width, slot }) => {
           }`
         : ""}
     </style>
-    <moz-breadcrumb-group slot=${ifDefined(slot)}>
+    <moz-breadcrumb-group>
       <moz-breadcrumb
         href="about#firstpage"
         data-l10n-id=${ifDefined(l10nId + "-first")}