Bug 1878036 - Fix review checker callout trigger timing. r=jhirsch

Differential Revision: https://phabricator.services.mozilla.com/D200371

Author: aminomancer

browser/components/BrowserGlue.sys.mjs

@@ -761,6 +761,7 @@ let JSWINDOWACTORS = {
         ReportProductAvailable: { wantUntrusted: true },
         AdClicked: { wantUntrusted: true },
         AdImpression: { wantUntrusted: true },
+        DisableShopping: { wantUntrusted: true },
       },
     },
     matches: ["about:shoppingsidebar"],

browser/components/shopping/ShoppingSidebarChild.sys.mjs

@@ -165,6 +165,9 @@ export class ShoppingSidebarChild extends RemotePageChild {
         ShoppingProduct.sendAttributionEvent("impression", aid);
         Glean.shopping.surfaceAdsImpression.record();
         break;
+      case "DisableShopping":
+        this.sendAsyncMessage("DisableShopping");
+        break;
     }
   }
 

browser/components/shopping/ShoppingSidebarParent.sys.mjs

@@ -51,6 +51,16 @@ export class ShoppingSidebarParent extends JSWindowActorParent {
           "browser[messagemanagergroup=browsers]"
         );
         return associatedTabbedBrowser.currentURI?.spec ?? null;
+      case "DisableShopping":
+        Services.prefs.setBoolPref(
+          ShoppingSidebarParent.SHOPPING_ACTIVE_PREF,
+          false
+        );
+        Services.prefs.setIntPref(
+          ShoppingSidebarParent.SHOPPING_OPTED_IN_PREF,
+          2
+        );
+        break;
     }
     return null;
   }
@@ -310,7 +320,7 @@ class ShoppingSidebarManagerClass {
         lazy.ShoppingUtils.sendTrigger({
           browser: aBrowser,
           id: "shoppingProductPageWithSidebarClosed",
-          context: { isSidebarClosing: !!sidebar },
+          context: { isSidebarClosing: !aIsNavigation && !!sidebar },
         });
       }
     }

browser/components/shopping/content/settings.mjs

@@ -58,11 +58,9 @@ class ShoppingSettings extends MozLitElement {
   }
 
   onDisableShopping() {
-    // Unfortunately, order matters here. As soon as we set the optedIn pref
-    // to the opted out state, the sidebar gets torn down, and the active pref
-    // is never flipped, leaving the toolbar button in the active state.
-    RPMSetPref("browser.shopping.experience2023.active", false);
-    RPMSetPref("browser.shopping.experience2023.optedIn", 2);
+    window.dispatchEvent(
+      new CustomEvent("DisableShopping", { bubbles: true, composed: true })
+    );
     Glean.shopping.surfaceOptOutButtonClicked.record();
   }