[tbb-commits] [tor-browser] 23/311: Bug 1745026 - Part 4: Hook into the upgrade- and default-browser-dialog logic when determining whether to show the Firefox Suggest opt-in modal. r=nanj, a=dsmith

[gitolite role]

This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch geckoview-99.0.1-11.0-1
in repository tor-browser.

commit c91e878a3b82363722b8f0018a8300f6fec8ad4b
Author: Drew Willcoxon <adw at mozilla.com>
AuthorDate: Fri Jan 7 21:33:04 2022 +0000

    Bug 1745026 - Part 4: Hook into the upgrade- and default-browser-dialog logic when determining whether to show the Firefox Suggest opt-in modal. r=nanj,a=dsmith
    
    Currently we check in a startup idle task whether we should show the Firefox
    Suggest online modal, which means the modal competes with the upgrade dialog and
    default-browser prompt. This revision moves the check to the same site where we
    check for the other two dialogs. So now the sequence is:
    
    1. Show the upgrade dialog? If yes, show it and stop. If no, continue.
    2. Show the default-browser prompt? If yes, show it and stop. If no, continue.
    3. Show the Suggest modal if necessary.
    
    Only one of these dialogs will be shown per Firefox session.
    
    Differential Revision: https://phabricator.services.mozilla.com/D135308
---
 browser/components/BrowserGlue.jsm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
index 468db3dc27641..8932488e6eba2 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -2525,12 +2525,6 @@ BrowserGlue.prototype = {
         },
       },
 
-      {
-        task: () => {
-          UrlbarQuickSuggest.maybeShowOnboardingDialog();
-        },
-      },
-
       {
         task: () => {
           let { setTimeout } = ChromeUtils.import(
@@ -4109,7 +4103,10 @@ BrowserGlue.prototype = {
     if (willPrompt) {
       let win = BrowserWindowTracker.getTopWindow();
       DefaultBrowserCheck.prompt(win);
+    } else if (await UrlbarQuickSuggest.maybeShowOnboardingDialog()) {
+      return;
     }
+
     await ASRouter.waitForInitialized;
     ASRouter.sendTriggerMessage({
       browser: BrowserWindowTracker.getTopWindow()?.gBrowser.selectedBrowser,

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.