Bug 835907 - DNT preferences "Learn more" link shouldn't open in new window. r=dolske

browser/components/preferences/in-content/privacy.js

@@ -123,20 +123,6 @@ var gPrivacyPane = {
     document.getElementById("historyPane").selectedIndex = selectedIndex;
   },
 
-  /**
-   * Open up the DNT "learn more" link.
-   */
-  openTrackingInfoSite: function PPP_openTrackingInfoSite()
-  {
-    let thisDocEl = document.documentElement,
-        openerDocEl = window.opener && window.opener.document.documentElement,
-        url = "https://www.mozilla.org/dnt";
-    if (thisDocEl.id == "BrowserPreferences" && !thisDocEl.instantApply)
-      openUILinkIn(url, "window");
-    else
-      openUILinkIn(url, "tab");
-  },
-
   /**
    * Update the Tracking preferences based on controls.
    */

browser/components/preferences/in-content/privacy.xul

@@ -86,8 +86,8 @@
             accesskey="&dntTrackingNopref.accesskey;" />
   </radiogroup>
   <label class="text-link" id="doNotTrackInfo"
-          onclick="event.stopPropagation();gPrivacyPane.openTrackingInfoSite();"
-          value="&doNotTrackInfo.label;"/>
+         href="https://www.mozilla.org/dnt"
+         value="&doNotTrackInfo.label;"/>
 </groupbox>
 
 <!-- History -->

browser/components/preferences/privacy.js

@@ -126,20 +126,6 @@ var gPrivacyPane = {
     document.getElementById("historyPane").selectedIndex = selectedIndex;
   },
 
-  /**
-   * Open up the DNT "learn more" link.
-   */
-  openTrackingInfoSite: function PPP_openTrackingInfoSite()
-  {
-    let thisDocEl = document.documentElement,
-        openerDocEl = window.opener && window.opener.document.documentElement,
-        url = "https://www.mozilla.org/dnt";
-    if (thisDocEl.id == "BrowserPreferences" && !thisDocEl.instantApply)
-      openUILinkIn(url, "window");
-    else
-      openUILinkIn(url, "tab");
-  },
-
   /**
    * Update the Tracking preferences based on controls.
    */

browser/components/preferences/privacy.xul

@@ -97,7 +97,7 @@
                 accesskey="&dntTrackingNopref.accesskey;" />
       </radiogroup>
       <label class="text-link" id="doNotTrackInfo"
-             onclick="event.stopPropagation();gPrivacyPane.openTrackingInfoSite();"
+             href="https://www.mozilla.org/dnt"
              value="&doNotTrackInfo.label;"/>
 
     </groupbox>