Bug 1220531 - Link to the Push notifications article on SUMO. r=MattN, a=ritu
authorKit Cambridge <kcambridge@mozilla.com>
Tue, 10 Nov 2015 09:29:47 -0800
changeset 305489 dd19fd9498a2bc8081113e400548cc3eeda69432
parent 305488 0a67e975146984be6d0788d03d02471da9bf4b67
child 305490 d4159c66b1835d2c8e33c53b545bc33228608c3f
push id1001
push userraliiev@mozilla.com
push dateMon, 18 Jan 2016 19:06:03 +0000
treeherdermozilla-release@8b89261f3ac4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMattN, ritu
bugs1220531
milestone44.0a2
Bug 1220531 - Link to the Push notifications article on SUMO. r=MattN, a=ritu
browser/app/profile/firefox.js
browser/base/content/test/alerts/browser_notification_permission_migration.js
browser/components/nsBrowserGlue.js
browser/components/preferences/in-content/content.js
testing/profiles/prefs_general.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -990,18 +990,16 @@ pref("urlclassifier.downloadBlockTable",
 // Only download the whitelist on Windows, since the whitelist is
 // only useful for suppressing remote lookups for signed binaries which we can
 // only verify on Windows (Bug 974579). Other platforms always do remote lookups.
 pref("urlclassifier.downloadAllowTable", "goog-downloadwhite-digest256");
 #endif
 #endif
 
 pref("browser.geolocation.warning.infoURL", "https://www.mozilla.org/%LOCALE%/firefox/geolocation/");
-pref("browser.push.warning.infoURL", "https://www.mozilla.org/%LOCALE%/firefox/push/");
-pref("browser.push.warning.migrationURL", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/push#w_upgraded-notifications");
 
 pref("browser.EULA.version", 3);
 pref("browser.rights.version", 3);
 pref("browser.rights.3.shown", false);
 
 #ifdef DEBUG
 // Don't show the about:rights notification in debug builds.
 pref("browser.rights.override", true);
--- a/browser/base/content/test/alerts/browser_notification_permission_migration.js
+++ b/browser/base/content/test/alerts/browser_notification_permission_migration.js
@@ -19,17 +19,19 @@ add_task(function* test_permissionMigrat
   }
 
   info("Waiting for migration notification");
   let alertWindowPromise = promiseAlertWindow();
   gBrowserGlue.observe(null, "browser-glue-test", "force-ui-migration");
   let alertWindow = yield alertWindowPromise;
 
   info("Clicking on notification");
-  let url = Services.urlFormatter.formatURLPref("browser.push.warning.migrationURL");
+  let url =
+    Services.urlFormatter.formatURLPref("app.support.baseURL") +
+    "push#w_upgraded-notifications";
   let closePromise = promiseWindowClosed(alertWindow);
   let tabPromise = BrowserTestUtils.waitForNewTab(gBrowser, url);
   EventUtils.synthesizeMouseAtCenter(alertWindow.document.getElementById("alertTitleLabel"), {}, alertWindow);
 
   info("Waiting for migration info tab");
   let tab = yield tabPromise;
   ok(tab, "The migration info tab opened");
 
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -2282,17 +2282,18 @@ BrowserGlue.prototype = {
       win.openUILinkIn(data, "tab");
     }
     // Show the application icon for XUL notifications. We assume system-level
     // notifications will include their own icon.
     let imageURL = this._hasSystemAlertsService() ? "" :
                    "chrome://branding/content/about-logo.png";
     let title = gBrowserBundle.GetStringFromName("webNotifications.upgradeTitle");
     let text = gBrowserBundle.GetStringFromName("webNotifications.upgradeBody");
-    let url = Services.urlFormatter.formatURLPref("browser.push.warning.migrationURL");
+    let url = Services.urlFormatter.formatURLPref("app.support.baseURL") +
+      "push#w_upgraded-notifications";
 
     AlertsService.showAlertNotification(imageURL, title, text,
                                         true, url, clickCallback);
   }),
 
   _hasSystemAlertsService: function() {
     try {
       return !!Cc["@mozilla.org/system-alerts-service;1"].getService(
@@ -2760,17 +2761,18 @@ ContentPermissionPrompt.prototype = {
           action: Ci.nsIPermissionManager.DENY_ACTION,
           expireType: null,
           callback: function() {},
         },
       ];
     }
 
     var options = {
-      learnMoreURL: Services.urlFormatter.formatURLPref("browser.push.warning.infoURL"),
+      learnMoreURL:
+        Services.urlFormatter.formatURLPref("app.support.baseURL") + "push",
     };
 
     this._showPrompt(aRequest, message, "desktop-notification", actions,
                      "web-notifications",
                      "web-notifications-notification-icon", options);
   },
 
   _promptPointerLock: function CPP_promtPointerLock(aRequest, autoAllow) {
--- a/browser/components/preferences/in-content/content.js
+++ b/browser/components/preferences/in-content/content.js
@@ -69,17 +69,18 @@ var gContentPane = {
       gContentPane.showLanguages);
     setEventListener("translationAttributionImage", "click",
       gContentPane.openTranslationProviderAttribution);
     setEventListener("translateButton", "command",
       gContentPane.showTranslationExceptions);
     setEventListener("notificationsDoNotDisturb", "command",
       gContentPane.toggleDoNotDisturbNotifications);
 
-    let notificationInfoURL = Services.urlFormatter.formatURLPref("browser.push.warning.infoURL");
+    let notificationInfoURL =
+      Services.urlFormatter.formatURLPref("app.support.baseURL") + "push";
     document.getElementById("notificationsPolicyLearnMore").setAttribute("href",
                                                                          notificationInfoURL);
 
     let drmInfoURL =
       Services.urlFormatter.formatURLPref("app.support.baseURL") + "drm-content";
     document.getElementById("playDRMContentLink").setAttribute("href", drmInfoURL);
     let emeUIEnabled = Services.prefs.getBoolPref("browser.eme.ui.enabled");
     // Force-disable/hide on WinXP:
--- a/testing/profiles/prefs_general.js
+++ b/testing/profiles/prefs_general.js
@@ -111,18 +111,17 @@ user_pref("plugins.update.url", "http://
 // Make sure SNTP requests don't hit the network
 user_pref("network.sntp.pools", "%(server)s");
 // We know the SNTP request will fail, since localhost isn't listening on
 // port 135. The default number of retries (10) is excessive, but retrying
 // at least once will mean that codepath is still tested in automation.
 user_pref("network.sntp.maxRetryCount", 1);
 
 // Make sure the notification permission migration test doesn't hit the network.
-user_pref("browser.push.warning.infoURL", "http://%(server)s/alerts-dummy/infoURL");
-user_pref("browser.push.warning.migrationURL", "http://%(server)s/alerts-dummy/migrationURL");
+user_pref("app.support.baseURL", "http://%(server)s/support-dummy/");
 
 // Existing tests don't wait for the notification button security delay
 user_pref("security.notification_enable_delay", 0);
 
 // Make enablePrivilege continue to work for test code. :-(
 user_pref("security.turn_off_all_security_so_that_viruses_can_take_over_this_computer", true);
 
 // In the default configuration, we bypass XBL scopes (a security feature) for