Bug 1229763 - Update a11y + e10s support url. r?mconley draft
authorJim Mathies <jmathies@mozilla.com>
Wed, 27 Jan 2016 14:27:15 -0600
changeset 326368 b61a8c783172f18c941a4e53c8759e99cab898fe
parent 325488 bd8bb6298d90770f97843e9d7dc711cc0f87d02f
child 513587 ff997972ab91cde00cb848c689dc44ddd38237db
push id10134
push userjmathies@mozilla.com
push dateWed, 27 Jan 2016 20:27:18 +0000
reviewersmconley
bugs1229763
milestone47.0a1
Bug 1229763 - Update a11y + e10s support url. r?mconley
browser/app/profile/firefox.js
browser/components/nsBrowserGlue.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1114,16 +1114,19 @@ pref("breakpad.reportURL", "https://cras
 
 // URL for "Learn More" for Crash Reporter
 pref("toolkit.crashreporter.infoURL",
      "https://www.mozilla.org/legal/privacy/firefox.html#crash-reporter");
 
 // base URL for web-based support pages
 pref("app.support.baseURL", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/");
 
+// a11y conflicts with e10s support page
+pref("app.support.e10sAccessibilityUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/accessibility-ppt");
+
 // base url for web-based feedback pages
 #ifdef MOZ_DEV_EDITION
 pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
 #else
 pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/%APP%/%VERSION%/");
 #endif
 
 
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -3205,17 +3205,17 @@ var E10SAccessibilityCheck = {
     // accessibility having been loaded in the previous session.
     let secondaryActions = [{
       label: win.gNavigatorBundle.getString("e10s.accessibilityNotice.enableAndRestart.label"),
       accessKey: win.gNavigatorBundle.getString("e10s.accessibilityNotice.enableAndRestart.accesskey"),
       callback: restartCallback,
     }];
     let options = {
       popupIconURL: "chrome://browser/skin/e10s-64@2x.png",
-      learnMoreURL: "https://support.mozilla.org/kb/accessibility-and-ppt",
+      learnMoreURL: Services.urlFormatter.formatURLPref("app.support.e10sAccessibilityUrl"),
       persistWhileVisible: true,
       hideNotNow: true,
     };
 
     notification =
       win.PopupNotifications.show(browser, "a11y_enabled_with_e10s",
                                   promptMessage, null, mainAction,
                                   secondaryActions, options);