Bug 1384402 - Fix broken about:preferences link after reorg v2 r=jaws
authorRicky Chien <ricky060709@gmail.com>
Thu, 27 Jul 2017 11:30:05 +0800
changeset 420235 4e072fd859ee7db42ebf5a26cf93c35d2697c6f9
parent 420234 8331e94d228a4a2f91190cbcf7c3be1278d6d2f8
child 420236 113b17f0f95d002c73be1ae29356d157afc1772d
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws
bugs1384402
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1384402 - Fix broken about:preferences link after reorg v2 r=jaws MozReview-Commit-ID: LnQsKHhrDWI
browser/base/content/browser-media.js
browser/components/newtab/NewTabSearchProvider.jsm
browser/components/preferences/in-content-new/main.xul
browser/modules/ContentSearch.jsm
--- a/browser/base/content/browser-media.js
+++ b/browser/base/content/browser-media.js
@@ -167,17 +167,17 @@ var gEMEHandler = {
 
     let mainAction = {
       label: gNavigatorBundle.getString(btnLabelId),
       accessKey: gNavigatorBundle.getString(btnAccessKeyId),
       callback() {
         if (Services.prefs.getBoolPref("browser.preferences.useOldOrganization")) {
           openPreferences("paneContent", {origin: "browserMedia"});
         } else {
-          openPreferences("panePrivacy", {origin: "browserMedia"});
+          openPreferences("general-drm", {origin: "browserMedia"});
         }
       },
       dismiss: true
     };
     let options = {
       dismissed: true,
       eventCallback: aTopic => aTopic == "swapping",
       learnMoreURL: Services.urlFormatter.formatURLPref("app.support.baseURL") + "drm-content",
--- a/browser/components/newtab/NewTabSearchProvider.jsm
+++ b/browser/components/newtab/NewTabSearchProvider.jsm
@@ -63,21 +63,17 @@ SearchProvider.prototype = {
   },
 
   removeFormHistory({browser}, suggestion) {
     ContentSearch.removeFormHistoryEntry({target: browser}, suggestion);
   },
 
   manageEngines(browser) {
     const browserWin = browser.ownerGlobal;
-    if (Services.prefs.getBoolPref("browser.preferences.useOldOrganization")) {
-      browserWin.openPreferences("paneSearch", { origin: "contentSearch" });
-    } else {
-      browserWin.openPreferences("paneGeneral", { origin: "contentSearch" });
-    }
+    browserWin.openPreferences("paneSearch", { origin: "contentSearch" });
   },
 
   async asyncGetState() {
     let state = await ContentSearch.currentStateObj(true);
     return state;
   },
 
   async asyncPerformSearch({browser}, searchData) {
--- a/browser/components/preferences/in-content-new/main.xul
+++ b/browser/components/preferences/in-content-new/main.xul
@@ -692,17 +692,17 @@
                  accesskey="&actionColumn2.accesskey;" persist="sortDirection"
                  flex="1"/>
     </listheader>
   </richlistbox>
 </groupbox>
 
 
 <!-- DRM Content -->
-<groupbox id="drmGroup" data-category="paneGeneral" hidden="true">
+<groupbox id="drmGroup" data-category="paneGeneral" data-subcategory="drm" hidden="true">
   <caption><label>&drmContent2.label;</label></caption>
   <grid id="contentGrid2">
     <columns>
       <column flex="1"/>
       <column/>
     </columns>
     <rows id="contentRows-2">
       <row id="playDRMContentRow">
--- a/browser/modules/ContentSearch.jsm
+++ b/browser/modules/ContentSearch.jsm
@@ -408,24 +408,18 @@ this.ContentSearch = {
   _onMessageSearch(msg, data) {
     this.performSearch(msg, data);
   },
 
   _onMessageSetCurrentEngine(msg, data) {
     Services.search.currentEngine = Services.search.getEngineByName(data);
   },
 
-  _onMessageManageEngines(msg, data) {
-    let browserWin = msg.target.ownerGlobal;
-    let pref = Services.prefs.getBoolPref("browser.preferences.useOldOrganization");
-    if (pref) {
-      browserWin.openPreferences("paneSearch", {origin: "contentSearch"});
-    } else {
-      browserWin.openPreferences("general-search", {origin: "contentSearch"});
-    }
+  _onMessageManageEngines(msg) {
+    msg.target.ownerGlobal.openPreferences("paneSearch", { origin: "contentSearch" });
   },
 
   async _onMessageGetSuggestions(msg, data) {
     this._ensureDataHasProperties(data, [
       "engineName",
       "searchString",
     ]);
     let {engineName, searchString} = data;