Backed out changeset cfa8d4331629 (bug 1809347) for causing mochitest…

… failures on test_migration_wizard.html CLOSED TREE
dothq · Mar 3, 2023 · d8f4674 · d8f4674
1 parent 20e0d71
commit d8f4674
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 39 deletions.
diff --git a/browser/components/migration/content/migration-wizard-constants.mjs b/browser/components/migration/content/migration-wizard-constants.mjs
@@ -14,7 +14,6 @@ export const MigrationWizardConstants = Object.freeze({
     SELECTION: "selection",
     PROGRESS: "progress",
     SAFARI_PERMISSION: "safari-permission",
-    NO_BROWSERS_FOUND: "no-browsers-found",
   }),
 
   /**

diff --git a/browser/components/migration/content/migration-wizard.mjs b/browser/components/migration/content/migration-wizard.mjs
@@ -94,21 +94,10 @@ export class MigrationWizard extends HTMLElement {
               <button class="primary" id="done-button" data-l10n-id="migration-done-button-label"></button>
             </moz-button-group>
           </div>
+
           <div name="page-safari-permission">
             <h3>TODO: Safari permission page</h3>
           </div>
-
-          <div name="page-no-browsers-found">
-            <h3 data-l10n-id="migration-wizard-selection-header"></h3>
-            <div class="no-browsers-found">
-              <span class="error-icon" role="img"></span>
-              <div class="no-browsers-found-message" data-l10n-id="migration-wizard-import-browser-no-browsers"></div>
-            </div>
-            <moz-button-group class="buttons">
-              <button class="cancel-close" data-l10n-id="migration-cancel-button-label"></button>
-            </moz-button-group>
-          </div>
-          
         </named-deck>
       </template>
     `;
@@ -138,7 +127,6 @@ export class MigrationWizard extends HTMLElement {
     const shadow = this.attachShadow({ mode: "closed" });
 
     if (window.MozXULElement) {
-      window.MozXULElement.insertFTLIfNeeded("branding/brand.ftl");
       window.MozXULElement.insertFTLIfNeeded(
         "locales-preview/migrationWizard.ftl"
       );

diff --git a/browser/components/storybook/stories/migration-wizard.stories.mjs b/browser/components/storybook/stories/migration-wizard.stories.mjs
@@ -188,11 +188,3 @@ SafariPermissions.args = {
     page: MigrationWizardConstants.PAGES.SAFARI_PERMISSION,
   },
 };
-
-export const NoBrowsersFound = Template.bind({});
-NoBrowsersFound.args = {
-  dialogMode: true,
-  state: {
-    page: MigrationWizardConstants.PAGES.NO_BROWSERS_FOUND,
-  },
-};
diff --git a/browser/locales-preview/migrationWizard.ftl b/browser/locales-preview/migrationWizard.ftl
@@ -53,7 +53,6 @@ migration-import-button-label = Import
 migration-cancel-button-label = Cancel
 migration-done-button-label = Done
 
-migration-wizard-import-browser-no-browsers = { -brand-short-name } couldn’t find any programs that contain bookmark, history or password data.
 migration-wizard-progress-header = Importing Data
 migration-wizard-progress-done-header = Data Imported Successfully
 migration-wizard-progress-icon-in-progress =

diff --git a/browser/themes/shared/migration/migration-wizard.css b/browser/themes/shared/migration/migration-wizard.css
@@ -98,22 +98,6 @@ details:not([open]) summary {
   fill: var(--in-content-success-icon-color);
 }
 
-.error-icon {
-  content: url("chrome://global/skin/icons/error.svg");
-  -moz-context-properties: fill;
-  fill: var(--in-content-danger-button-background);
-  margin-inline-end: 8px;
-}
-
-.no-browsers-found-message {
-  display: flex;
-}
-
-.no-browsers-found {
-  display: flex;
-  align-items: start;
-}
-
 /**
  * Workaround for bug 1671784, which shows a slight outline around the
  * rotating masked element.