Commit e2c8f80c authored by Dianna Smith's avatar Dianna Smith
Browse files

Backed out 1 changesets (bug 1746459), a=backout 

Backed out changeset 44dfb9503777 (bug 1746459)
parent 5cd90940

browser/components/urlbar/UrlbarPrefs.jsm

+0 −23
Original line number Diff line number Diff line
@@ -488,12 +488,6 @@ class Preferences { 
      "suggest.searches",

    ];



    // This is resolved when the first update to the Firefox Suggest scenario

    // (on startup) finishes.

    this._firefoxSuggestScenarioStartupPromise = new Promise(

      resolve => (this._resolveFirefoxSuggestScenarioStartupPromise = resolve)

    );



    // This is set to true when we update the Firefox Suggest scenario to

    // prevent re-entry due to pref observers.

    this._updatingFirefoxSuggestScenario = false;
@@ -629,13 +623,6 @@ class Preferences { 
    } finally {

      this._updatingFirefoxSuggestScenario = false;

    }



    // Null check `_resolveFirefoxSuggestScenarioStartupPromise` since some

    // tests force `isStartup` after actual startup and it's been set to null.

    if (isStartup && this._resolveFirefoxSuggestScenarioStartupPromise) {

      this._resolveFirefoxSuggestScenarioStartupPromise();

      this._resolveFirefoxSuggestScenarioStartupPromise = null;

    }

  }



  _updateFirefoxSuggestScenarioHelper(isStartup, testOverrides) {
@@ -1044,16 +1031,6 @@ class Preferences { 
    }

  }



  /**

   * @returns {Promise}

   *   This can be used to wait until the initial Firefox Suggest scenario has

   *   been set on startup. It's resolved when the first call to

   *   `updateFirefoxSuggestScenario()` finishes.

   */

  get firefoxSuggestScenarioStartupPromise() {

    return this._firefoxSuggestScenarioStartupPromise;

  }



  /**

   * @returns {boolean}

   *   Whether the Firefox Suggest scenario is being updated. While true,

browser/components/urlbar/UrlbarQuickSuggest.jsm

+0 −5
Original line number Diff line number Diff line
@@ -202,11 +202,6 @@ class Suggestions { 
   *   True if the dialog was shown and false if not.

   */

  async maybeShowOnboardingDialog() {

    // The call to this method races scenario initialization on startup, and the

    // Nimbus variables we rely on below depend on the scenario, so wait for it

    // to be initialized.

    await UrlbarPrefs.firefoxSuggestScenarioStartupPromise;



    // If quicksuggest is not available, the onboarding dialog is configured to

    // be skipped, the user has already seen the dialog, or has otherwise opted

    // in already, then we won't show the quicksuggest onboarding.