gistfile1.txt

diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
index 12e4b25ea66e1..5e1176d0806b8 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -17,6 +17,13 @@ const { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );
 
+XPCOMUtils.defineLazyGetter(this, "log", () => {
+  const { Logger } = ChromeUtils.import(
+    "resource://messaging-system/lib/Logger.jsm"
+  );
+  return new Logger("BrowserGlue");
+});
+
 XPCOMUtils.defineLazyModuleGetters(this, {
   AboutNewTab: "resource:///modules/AboutNewTab.jsm",
   ActorManagerParent: "resource://gre/modules/ActorManagerParent.jsm",
@@ -85,6 +92,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   ShellService: "resource:///modules/ShellService.jsm",
   ShortcutUtils: "resource://gre/modules/ShortcutUtils.jsm",
   SnapshotMonitor: "resource:///modules/SnapshotMonitor.jsm",
+  Spotlight: "resources://activity-stream/lib/Spotlight.jsm",
   TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm",
   TabUnloader: "resource:///modules/TabUnloader.jsm",
   TelemetryUtils: "resource://gre/modules/TelemetryUtils.jsm",
@@ -4158,17 +4166,31 @@ BrowserGlue.prototype = {
   },
 
   _showUpgradeDialog() {
-    BrowserWindowTracker.getTopWindow().gDialogBox.open(
-      "chrome://browser/content/upgradeDialog.html"
-    );
+    log.debug("In _showUpgradeDialog");
+
+    // BrowserWindowTracker.getTopWindow().gDialogBox.open(
+    //   "chrome://browser/content/upgradeDialog.html"
+    // );
+    let win = BrowserWindowTracker.getTopWindow();
+
+    try {
+      log.debug("win: ", win.toString());
+    } catch (ex) {
+      log.debug("ex", ex);
+    }
+    log.debug("stuff");
+
+    Spotlight.showSpotlightDialog({ ownerGlobal: win }, "", () => {});
   },
 
   async _maybeShowDefaultBrowserPrompt() {
     // Highest priority is the upgrade dialog, which can include a "primary
     // browser" request and is limited in various ways, e.g., major upgrades.
-    const dialogVersion = 94;
+    const dialogVersion = 100;
     const dialogVersionPref = "browser.startup.upgradeDialog.version";
     const dialogReason = await (async () => {
+      return "";
+
       if (!BrowserHandler.majorUpgrade) {
         return "not-major";
       }
@@ -4200,6 +4222,8 @@ BrowserGlue.prototype = {
       return NimbusFeatures.upgradeDialog.isEnabled() ? "" : "disabled";
     })();
 
+    log.debug("dialogReason: ", dialogReason);
+
     // Record why the dialog is showing or not.
     Services.telemetry.setEventRecordingEnabled("upgrade_dialog", true);
     Services.telemetry.recordEvent(