Commit 3225b46d authored by Dão Gottwald's avatar Dão Gottwald
Browse files

Bug 1607170 - Remove openNewTabWith, openNewWindowWith. r=Gijs 

Differential Revision: https://phabricator.services.mozilla.com/D58754

--HG--
extra : moz-landing-system : lando
parent cb9142c6

browser/base/content/browser.js

+7 −9
Original line number Diff line number Diff line
@@ -4042,11 +4042,7 @@ var newTabButtonObserver = { 
  },

  onDragExit(aEvent) {},

  async onDrop(aEvent) {

    let shiftKey = aEvent.shiftKey;

    let links = browserDragAndDrop.dropLinks(aEvent);

    let triggeringPrincipal = browserDragAndDrop.getTriggeringPrincipal(aEvent);

    let csp = browserDragAndDrop.getCSP(aEvent);



    if (

      links.length >=

      Services.prefs.getIntPref("browser.tabs.maxOpenBeforeWarn")
@@ -4061,11 +4057,14 @@ var newTabButtonObserver = { 
      }

    }



    let where = aEvent.shiftKey ? "tabshifted" : "tab";

    let triggeringPrincipal = browserDragAndDrop.getTriggeringPrincipal(aEvent);

    let csp = browserDragAndDrop.getCSP(aEvent);

    for (let link of links) {

      if (link.url) {

        let data = await UrlbarUtils.getShortcutOrURIAndPostData(link.url);

        // Allow third-party services to fixup this URL.

        openNewTabWith(data.url, shiftKey, {

        openLinkIn(data.url, where, {

          postData: data.postData,

          allowThirdPartyFixup: true,

          triggeringPrincipal,
@@ -4083,9 +4082,6 @@ var newWindowButtonObserver = { 
  onDragExit(aEvent) {},

  async onDrop(aEvent) {

    let links = browserDragAndDrop.dropLinks(aEvent);

    let triggeringPrincipal = browserDragAndDrop.getTriggeringPrincipal(aEvent);

    let csp = browserDragAndDrop.getCSP(aEvent);



    if (

      links.length >=

      Services.prefs.getIntPref("browser.tabs.maxOpenBeforeWarn")
@@ -4100,11 +4096,13 @@ var newWindowButtonObserver = { 
      }

    }



    let triggeringPrincipal = browserDragAndDrop.getTriggeringPrincipal(aEvent);

    let csp = browserDragAndDrop.getCSP(aEvent);

    for (let link of links) {

      if (link.url) {

        let data = await UrlbarUtils.getShortcutOrURIAndPostData(link.url);

        // Allow third-party services to fixup this URL.

        openNewWindowWith(data.url, {

        openLinkIn(data.url, "window", {

          // TODO fix allowInheritPrincipal

          // (this is required by javascript: drop to the new window) Bug 1475201

          allowInheritPrincipal: true,

browser/base/content/test/contextMenu/browser_utilityOverlay.js

+0 −11
Original line number Diff line number Diff line
@@ -55,17 +55,6 @@ add_task(async function test_getTopWin() { 
  is(getTopWin(), window, "got top window");

});



add_task(async function test_openNewTabWith() {

  const kURL = "http://example.com/";

  let tabLoadPromise = BrowserTestUtils.waitForNewTab(gBrowser, kURL, true);

  openNewTabWith("http://example.com/", null, {

    triggeringPrincipal: Services.scriptSecurityManager.createNullPrincipal({}),

  });

  let tab = await tabLoadPromise;

  is(tab.linkedBrowser.currentURI.spec, kURL, "example.com loaded");

  gBrowser.removeCurrentTab();

});



add_task(async function test_openUILink() {

  const kURL = "http://example.org/";

  let tab = await BrowserTestUtils.openNewForegroundTab(

browser/base/content/utilityOverlay.js

+0 −39
Original line number Diff line number Diff line
@@ -1128,45 +1128,6 @@ function makeURLAbsolute(aBase, aUrl) { 
  return makeURI(aUrl, null, makeURI(aBase)).spec;

}



/**

 * openNewTabWith: opens a new tab with the given URL.

 *

 * @param aURL

 *        The URL to open (as a string).

 * @param aShiftKey

 *        True if shift key is held.  This value is used for the purpose of

 *        determining whether to open in the background.

 * @param aParams

 *        parameters passed to openLinkIn

 */

function openNewTabWith(aURL, aShiftKey, aParams = {}) {

  // As in openNewWindowWith(), we want to pass the charset of the

  // current document over to a new tab.

  if (

    document.documentElement.getAttribute("windowtype") == "navigator:browser"

  ) {

    aParams.charset = gBrowser.selectedBrowser.characterSet;

  }



  openLinkIn(aURL, aShiftKey ? "tabshifted" : "tab", aParams);

}



/**

 * openNewWindowWith: opens a new window with the given URL.

 * See openNewTabWith for parameters.

 */

function openNewWindowWith(aURL, aParams = {}) {

  // Extract the current charset menu setting from the current document and

  // use it to initialize the new browser window...

  if (

    document.documentElement.getAttribute("windowtype") == "navigator:browser"

  ) {

    aParams.charset = gBrowser.selectedBrowser.characterSet;

  }



  openLinkIn(aURL, "window", aParams);

}



function getHelpLinkURL(aHelpTopic) {

  var url = Services.urlFormatter.formatURLPref("app.support.baseURL");

  return url + aHelpTopic;