[tbb-commits] [tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 28822: Convert onboarding to webextension

[gk at torproject.org]

commit b4e8db514df16856b567be1e13cb9af11a7de6e5
Author: Alex Catarineu <acat at torproject.org>
Date:   Mon Sep 2 12:06:24 2019 +0200

    fixup! Bug 28822: Convert onboarding to webextension
---
 browser/extensions/onboarding/content/Onboarding.jsm | 2 +-
 extensions/permissions/nsPermissionManager.cpp       | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/browser/extensions/onboarding/content/Onboarding.jsm b/browser/extensions/onboarding/content/Onboarding.jsm
index 33777dd27d6e..059701f78960 100644
--- a/browser/extensions/onboarding/content/Onboarding.jsm
+++ b/browser/extensions/onboarding/content/Onboarding.jsm
@@ -8,7 +8,7 @@
 
 var EXPORTED_SYMBOLS = ["Onboarding"];
 
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 const ONBOARDING_CSS_URL = "resource://onboarding/onboarding.css";
 const TORBUTTON_BUNDLE_URI = "chrome://torbutton/locale/browserOnboarding.properties";
diff --git a/extensions/permissions/nsPermissionManager.cpp b/extensions/permissions/nsPermissionManager.cpp
index 1a652bef4222..2e23d48623e8 100644
--- a/extensions/permissions/nsPermissionManager.cpp
+++ b/extensions/permissions/nsPermissionManager.cpp
@@ -125,6 +125,9 @@ static const nsLiteralCString kPreloadPermissions[] = {
     NS_LITERAL_CSTRING("cookie"), NS_LITERAL_CSTRING("trackingprotection"),
     NS_LITERAL_CSTRING("trackingprotection-pb"),
 
+    // Bug 28822: Make sure uitour permissions are preloaded in content processes.
+    NS_LITERAL_CSTRING("uitour"),
+
     USER_INTERACTION_PERM};
 
 // NOTE: nullptr can be passed as aType - if it is this function will return