Bug 1485743 - Don't show the Content Blocking tour in private windows. r=francois

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

--HG--
extra : moz-landing-system : lando

browser/base/content/browser-contentblocking.js

@@ -445,10 +445,10 @@ var ContentBlocking = {
       blocker.categoryItem.hidden = !blocker.visible;
     }
 
+    let isBrowserPrivate = PrivateBrowsingUtils.isBrowserPrivate(gBrowser.selectedBrowser);
+
     // Check whether the user has added an exception for this site.
-    let type = PrivateBrowsingUtils.isBrowserPrivate(gBrowser.selectedBrowser) ?
-                 "trackingprotection-pb" :
-                 "trackingprotection";
+    let type =  isBrowserPrivate ? "trackingprotection-pb" : "trackingprotection";
     let hasException = Services.perms.testExactPermission(baseURI, type) ==
       Services.perms.ALLOW_ACTION;
 
@@ -463,11 +463,13 @@ var ContentBlocking = {
     } else if (active && webProgress.isTopLevel) {
       this.iconBox.setAttribute("animate", "true");
 
-      let introCount = Services.prefs.getIntPref(this.prefIntroCount);
-      if (introCount < this.MAX_INTROS) {
-        Services.prefs.setIntPref(this.prefIntroCount, ++introCount);
-        Services.prefs.savePrefFile(null);
-        this.showIntroPanel();
+      if (!isBrowserPrivate) {
+        let introCount = Services.prefs.getIntPref(this.prefIntroCount);
+        if (introCount < this.MAX_INTROS) {
+          Services.prefs.setIntPref(this.prefIntroCount, ++introCount);
+          Services.prefs.savePrefFile(null);
+          this.showIntroPanel();
+        }
       }
     }