[PM-12352] Incorporate the minimum amount of changes to ensure OverlayBackground instantiates on init of the extension

apps/browser/src/autofill/background/tabs.background.ts

@@ -1,5 +1,3 @@
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-
 import MainBackground from "../../background/main.background";
 
 import { OverlayBackground } from "./abstractions/overlay.background";
@@ -88,14 +86,6 @@ export default class TabsBackground {
     changeInfo: chrome.tabs.TabChangeInfo,
     tab: chrome.tabs.Tab,
   ) => {
-    const overlayImprovementsFlag = await this.main.configService.getFeatureFlag(
-      FeatureFlag.InlineMenuPositioningImprovements,
-    );
-    const removePageDetailsStatus = new Set(["loading", "unloaded"]);
-    if (!!overlayImprovementsFlag && removePageDetailsStatus.has(changeInfo.status)) {
-      this.overlayBackground.removePageDetails(tabId);
-    }
-
     if (this.focusedWindowId > 0 && tab.windowId !== this.focusedWindowId) {
       return;
     }

apps/browser/src/autofill/services/autofill.service.ts

@@ -230,13 +230,6 @@ export default class AutofillService implements AutofillServiceInterface {
       inlineMenuVisibility = await this.getInlineMenuVisibility();
     }
 
-    const inlineMenuPositioningImprovements = await this.configService.getFeatureFlag(
-      FeatureFlag.InlineMenuPositioningImprovements,
-    );
-    if (!inlineMenuPositioningImprovements) {
-      return "bootstrap-legacy-autofill-overlay.js";
-    }
-
     const enableChangedPasswordPrompt = await firstValueFrom(
       this.userNotificationSettingsService.enableChangedPasswordPrompt$,
     );

apps/browser/src/background/main.background.ts

@@ -218,7 +218,6 @@
 import { CipherContextMenuHandler } from "../autofill/browser/cipher-context-menu-handler";
 import { ContextMenuClickedHandler } from "../autofill/browser/context-menu-clicked-handler";
 import { MainContextMenuHandler } from "../autofill/browser/main-context-menu-handler";
-import LegacyOverlayBackground from "../autofill/deprecated/background/overlay.background.deprecated";
 import { Fido2Background as Fido2BackgroundAbstraction } from "../autofill/fido2/background/abstractions/fido2.background";
 import { Fido2Background } from "../autofill/fido2/background/fido2.background";
 import { BrowserFido2UserInterfaceService } from "../autofill/fido2/services/browser-fido2-user-interface.service";
@@ -1133,6 +1132,27 @@
         this.notificationBackground,
       );
 
+      this.overlayBackground = new OverlayBackground(
+        this.logService,
+        this.cipherService,
+        this.autofillService,
+        this.authService,
+        this.environmentService,
+        this.domainSettingsService,
+        this.autofillSettingsService,
+        this.i18nService,
+        this.platformUtilsService,
+        this.vaultSettingsService,
+        this.fido2ActiveRequestManager,
+        this.themeStateService,
+      );
+
+      this.tabsBackground = new TabsBackground(
+        this,
+        this.notificationBackground,
+        this.overlayBackground,
+      );
+
       this.filelessImporterBackground = new FilelessImporterBackground(
         this.configService,
         this.authService,
@@ -1268,6 +1288,8 @@
     await this.runtimeBackground.init();
     await this.notificationBackground.init();
     this.overlayNotificationsBackground.init();
+    await this.overlayBackground.init();
+    await this.tabsBackground.init();
     this.filelessImporterBackground.init();
     this.commandsBackground.init();
     this.contextMenusBackground?.init();
@@ -1297,8 +1319,6 @@
       }
     }
 
-    await this.initOverlayAndTabsBackground();
-
     return new Promise<void>((resolve) => {
       setTimeout(async () => {
         await this.refreshBadge();
@@ -1578,62 +1598,4 @@
       await this.syncService.fullSync(override);
     }
   }
-
-  /**
-   * Temporary solution to handle initialization of the overlay background behind a feature flag.
-   * Will be reverted to instantiation within the constructor once the feature flag is removed.
-   */
-  async initOverlayAndTabsBackground() {
-    if (
-      this.popupOnlyContext ||
-      this.overlayBackground ||
-      this.tabsBackground ||
-      (await firstValueFrom(this.authService.activeAccountStatus$)) ===
-        AuthenticationStatus.LoggedOut
-    ) {
-      return;
-    }
-
-    const inlineMenuPositioningImprovementsEnabled = await this.configService.getFeatureFlag(
-      FeatureFlag.InlineMenuPositioningImprovements,
-    );
-
-    if (!inlineMenuPositioningImprovementsEnabled) {
-      this.overlayBackground = new LegacyOverlayBackground(
-        this.cipherService,
-        this.autofillService,
-        this.authService,
-        this.environmentService,
-        this.domainSettingsService,
-        this.autofillSettingsService,
-        this.i18nService,
-        this.platformUtilsService,
-        this.themeStateService,
-      );
-    } else {
-      this.overlayBackground = new OverlayBackground(
-        this.logService,
-        this.cipherService,
-        this.autofillService,
-        this.authService,
-        this.environmentService,
-        this.domainSettingsService,
-        this.autofillSettingsService,
-        this.i18nService,
-        this.platformUtilsService,
-        this.vaultSettingsService,
-        this.fido2ActiveRequestManager,
-        this.themeStateService,
-      );
-    }
-
-    this.tabsBackground = new TabsBackground(
-      this,
-      this.notificationBackground,
-      this.overlayBackground,
-    );
-
-    await this.overlayBackground.init();
-    await this.tabsBackground.init();
-  }
 }

apps/browser/src/background/runtime.background.ts

@@ -207,7 +207,6 @@ export default class RuntimeBackground {
         let item: LockedVaultPendingNotificationsData;
 
         if (msg.command === "loggedIn") {
-          await this.main.initOverlayAndTabsBackground();
           await this.sendBwInstalledMessageToVault();
           await this.autofillService.reloadAutofillScripts();
         }