commit ea65909a1c1060e544ea56a110f948994e2a3df9 Author: Kathy Brade brade@pearlcrescent.com Date: Tue Mar 12 17:03:10 2019 -0400

squash! Bug 26961: New user onboarding.

Also fix bug 28628: Change onboarding Security panel to open new Security Level panel. --- browser/components/uitour/UITour-lib.js | 6 +++--- browser/components/uitour/UITour.jsm | 11 ++++++----- .../extensions/onboarding/content/onboarding-tour-agent.js | 2 +- browser/extensions/onboarding/content/onboarding.js | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/browser/components/uitour/UITour-lib.js b/browser/components/uitour/UITour-lib.js index 279b2e48bc85..31a43e39bbff 100644 --- a/browser/components/uitour/UITour-lib.js +++ b/browser/components/uitour/UITour-lib.js @@ -791,10 +791,10 @@ if (typeof Mozilla == "undefined") { };

/** - * @summary Opens Torbutton's Security Settings (aka the Security Slider). + * @summary Opens the Security Level Panel. */ - Mozilla.UITour.torBrowserOpenSecuritySettings = function() { - _sendEvent("torBrowserOpenSecuritySettings"); + Mozilla.UITour.torBrowserOpenSecurityLevelPanel = function() { + _sendEvent("torBrowserOpenSecurityLevelPanel"); }; })();

diff --git a/browser/components/uitour/UITour.jsm b/browser/components/uitour/UITour.jsm index ce3e20fda662..fd8491eae839 100644 --- a/browser/components/uitour/UITour.jsm +++ b/browser/components/uitour/UITour.jsm @@ -46,7 +46,7 @@ const TOR_BROWSER_PAGE_ACTIONS_ALLOWED = new Set([ "showMenu", // restricted to TOR_BROWSER_MENUS_ALLOWED "hideMenu", // restricted to TOR_BROWSER_MENUS_ALLOWED "closeTab", - "torBrowserOpenSecuritySettings", + "torBrowserOpenSecurityLevelPanel", ]);

const TOR_BROWSER_TARGETS_ALLOWED = new Set([ @@ -717,10 +717,11 @@ var UITour = { break; }

- case "torBrowserOpenSecuritySettings": - // Ask Torbutton to open the Tor Browser Security Settings. - Services.obs.notifyObservers(undefined, "TorOpenSecuritySettings", - undefined); + case "torBrowserOpenSecurityLevelPanel": + let securityLevelButton = + window.document.getElementById("security-level-button"); + if (securityLevelButton) + securityLevelButton.doCommand(); break; }

diff --git a/browser/extensions/onboarding/content/onboarding-tour-agent.js b/browser/extensions/onboarding/content/onboarding-tour-agent.js index b373c5e0ef01..a08320d0535a 100644 --- a/browser/extensions/onboarding/content/onboarding-tour-agent.js +++ b/browser/extensions/onboarding/content/onboarding-tour-agent.js @@ -19,7 +19,7 @@ let onCanSetDefaultBrowserInBackground = () => { let onClick = evt => { switch (evt.target.id) { case "onboarding-tour-tor-security-button": - Mozilla.UITour.torBrowserOpenSecuritySettings(); + Mozilla.UITour.torBrowserOpenSecurityLevelPanel(); break; #if 0 // Firefox onboarding actions. To reduce conflicts when rebasing against diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js index 5cb81852bb73..8f62e4f3b9d8 100644 --- a/browser/extensions/onboarding/content/onboarding.js +++ b/browser/extensions/onboarding/content/onboarding.js @@ -181,7 +181,7 @@ var onboardingTourset = { "onboarding.tour-tor-security.title", "onboarding.tour-tor-security.description"); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-security.png"); createOnboardingTourButton(div, - "onboarding-tour-tor-security-button", "onboarding.tour-tor-security.button"); + "onboarding-tour-tor-security-button", "onboarding.tour-tor-security-level.button");

return div; },