Backed out 2 changesets (bug 1602168, bug 1602123) for turning bug 1336075 into perma. CLOSED TREE

Backed out changeset b892c240d938 (bug 1602168)
Backed out changeset f47c59a4e3d3 (bug 1602123)

--HG--
extra : histedit_source : c3cddd5170a0d0e98753cd01f901964a92ad48bc

browser/base/content/browser-pageActions.js

@@ -2,12 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-ChromeUtils.defineModuleGetter(
-  this,
-  "SiteSpecificBrowserService",
-  "resource:///modules/SiteSpecificBrowserService.jsm"
-);
-
 var BrowserPageActions = {
   /**
    * The main page action button in the urlbar (DOM node)
@@ -1091,24 +1085,6 @@ BrowserPageActions.pinTab = {
   },
 };
 
-// SiteSpecificBrowser
-BrowserPageActions.launchSSB = {
-  updateState() {
-    let action = PageActions.actionForID("launchSSB");
-    let browser = gBrowser.selectedBrowser;
-    action.setDisabled(!browser.currentURI.schemeIs("https"), window);
-  },
-
-  onCommand(event, buttonNode) {
-    if (!gBrowser.currentURI.schemeIs("https")) {
-      return;
-    }
-
-    SiteSpecificBrowserService.launchFromURI(gBrowser.currentURI);
-    gBrowser.removeTab(gBrowser.selectedTab, { closeWindowWithLastTab: false });
-  },
-};
-
 // copy URL
 BrowserPageActions.copyURL = {
   onBeforePlacedInWindow(browserWindow) {

browser/base/content/tabbrowser.js

@@ -3156,10 +3156,7 @@
       this.removeTab(this.selectedTab, aParams);
     },
 
-    removeTab(
-      aTab,
-      { animate, byMouse, skipPermitUnload, closeWindowWithLastTab } = {}
-    ) {
+    removeTab(aTab, { animate, byMouse, skipPermitUnload } = {}) {
       // Telemetry stopwatches may already be running if removeTab gets
       // called again for an already closing tab.
       if (
@@ -3191,7 +3188,6 @@
         !this._beginRemoveTab(aTab, {
           closeWindowFastpath: true,
           skipPermitUnload,
-          closeWindowWithLastTab,
         })
       ) {
         TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_ANIM_MS", aTab);

browser/components/moz.build

@@ -52,7 +52,6 @@ DIRS += [
     'search',
     'sessionstore',
     'shell',
-    'ssb',
     'syncedtabs',
     'uitour',
     'urlbar',

browser/components/ssb/SiteSpecificBrowserService.jsm

-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-var EXPORTED_SYMBOLS = ["SiteSpecificBrowserService", "SSBCommandLineHandler"];
-
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const { XPCOMUtils } = ChromeUtils.import(
-  "resource://gre/modules/XPCOMUtils.jsm"
-);
-
-const SiteSpecificBrowserService = {
-  /**
-   * Given a URI launches the SSB UI to display it.
-   *
-   * @param {nsIURI} uri the URI to display.
-   */
-  launchFromURI(uri) {
-    if (!this.isEnabled) {
-      throw new Error("Site specific browsing is disabled.");
-    }
-
-    if (!uri.schemeIs("https")) {
-      throw new Error(
-        "Site specific browsers can only be opened for secure sites."
-      );
-    }
-
-    let sa = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
-    let uristr = Cc["@mozilla.org/supports-string;1"].createInstance(
-      Ci.nsISupportsString
-    );
-    uristr.data = uri.spec;
-    sa.appendElement(uristr);
-    Services.ww.openWindow(
-      null,
-      "chrome://browser/content/ssb/ssb.html",
-      "_blank",
-      "chrome,dialog=no,all",
-      sa
-    );
-  },
-};
-
-XPCOMUtils.defineLazyPreferenceGetter(
-  SiteSpecificBrowserService,
-  "isEnabled",
-  "browser.ssb.enabled",
-  false
-);
-
-class SSBCommandLineHandler {
-  /* nsICommandLineHandler */
-  handle(cmdLine) {
-    if (!SiteSpecificBrowserService.isEnabled) {
-      return;
-    }
-
-    let site = cmdLine.handleFlagWithParam("ssb", false);
-    if (site) {
-      cmdLine.preventDefault = true;
-
-      try {
-        let fixupInfo = Services.uriFixup.getFixupURIInfo(
-          site,
-          Services.uriFixup.FIXUP_FLAG_FIX_SCHEME_TYPOS
-        );
-
-        let uri = fixupInfo.preferredURI;
-        if (!uri) {
-          dump(`Unable to parse '${site}' as a URI.\n`);
-          return;
-        }
-
-        if (fixupInfo.fixupChangedProtocol && uri.schemeIs("http")) {
-          uri = uri
-            .mutate()
-            .setScheme("https")
-            .finalize();
-        }
-        SiteSpecificBrowserService.launchFromURI(uri);
-      } catch (e) {
-        dump(`Unable to parse '${site}' as a URI: ${e}\n`);
-      }
-    }
-  }
-
-  get helpInfo() {
-    return "  --ssb <uri>        Open a site specific browser for <uri>.\n";
-  }
-}
-
-SSBCommandLineHandler.prototype.QueryInterface = ChromeUtils.generateQI([
-  Ci.nsICommandLineHandler,
-]);

browser/components/ssb/components.conf

-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-Classes = [
-    {
-        'cid': '{6344f783-c893-4db8-91ec-7d43a46bd6f4}',
-        'contract_ids': [
-            '@mozilla.org/browser/ssb/clh;1',
-        ],
-        'jsm': 'resource:///modules/SiteSpecificBrowserService.jsm',
-        'constructor': 'SSBCommandLineHandler',
-        'categories': {
-            'command-line-handler': 'e-ssb',
-        },
-    },
-]

browser/components/ssb/content/jar.mn

-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-browser.jar:
-    content/browser/ssb/ssb.html
-    content/browser/ssb/ssb.js
-    content/browser/ssb/ssb.css

browser/components/ssb/content/ssb.css

-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-html,
-body,
-#browser-container,
-#browser {
-  width: 100%;
-  height: 100%;
-  margin: 0;
-  padding: 0;
-  overflow: hidden;
-}

browser/components/ssb/content/ssb.html

-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!DOCTYPE html>
-
-<html width="800" height="600">
-<head>
-<link rel="stylesheet" href="chrome://global/skin/">
-<link rel="stylesheet" href="ssb.css">
-</head>
-<body>
-  <div id="browser-container"></div>
-  <script type="text/javascript" src="ssb.js"></script>
-</body>
-</html>

browser/components/ssb/content/ssb.js

-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-let gSSBBrowser = null;
-
-function init() {
-  gSSBBrowser = document.createXULElement("browser");
-  gSSBBrowser.setAttribute("id", "browser");
-  gSSBBrowser.setAttribute("type", "content");
-  gSSBBrowser.setAttribute("remote", "true");
-  document.getElementById("browser-container").appendChild(gSSBBrowser);
-  gSSBBrowser.src = window.arguments[0];
-}
-
-window.addEventListener("load", init, true);

browser/components/ssb/moz.build

-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-JAR_MANIFESTS += ['content/jar.mn']
-BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
-
-XPCOM_MANIFESTS += [
-    'components.conf',
-]
-
-EXTRA_JS_MODULES += [
-    'SiteSpecificBrowserService.jsm',
-]

browser/components/ssb/tests/browser/browser.ini

-[DEFAULT]
-support-files =
-  head.js
-  test_page.html
-prefs =
-  browser.ssb.enabled=true
-
-[browser_ssb_lasttab.js]
-[browser_ssb_menu.js]
-[browser_ssb_open.js]

browser/components/ssb/tests/browser/browser_ssb_lasttab.js

-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Opening from the last browser tab should not close the window.
-add_task(async () => {
-  let win = await BrowserTestUtils.openNewBrowserWindow();
-
-  let windowClosed = false;
-  BrowserTestUtils.windowClosed(win).then(() => {
-    windowClosed = true;
-  });
-
-  Assert.equal(win.gBrowser.tabs.length, 1, "Should be only one tab.");
-  let tab = win.gBrowser.selectedTab;
-
-  let loaded = BrowserTestUtils.browserLoaded(
-    win.gBrowser.selectedBrowser,
-    false,
-    gHttpsTestRoot + "test_page.html"
-  );
-  BrowserTestUtils.loadURI(
-    win.gBrowser.selectedBrowser,
-    gHttpsTestRoot + "test_page.html"
-  );
-  await loaded;
-
-  let ssb = await openSSBFromBrowserWindow(win);
-  Assert.equal(win.gBrowser.tabs.length, 1, "Should still be only one tab.");
-  Assert.notEqual(tab, win.gBrowser.selectedTab, "Should be a new tab.");
-
-  Assert.ok(!windowClosed, "Should not have seen the window close.");
-  await BrowserTestUtils.closeWindow(ssb);
-  await BrowserTestUtils.closeWindow(win);
-});

browser/components/ssb/tests/browser/browser_ssb_menu.js

-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Check that it is correctly enabled/disabled based on the displaying page.
-add_task(async () => {
-  let tab = await BrowserTestUtils.openNewForegroundTab({
-    gBrowser,
-    url: gHttpTestRoot + "test_page.html",
-  });
-
-  // Must open the panel before the item gets added.
-  let pageActionButton = document.getElementById("pageActionButton");
-  let panel = document.getElementById("pageActionPanel");
-  let popupShown = BrowserTestUtils.waitForEvent(panel, "popupshown");
-
-  EventUtils.synthesizeMouseAtCenter(pageActionButton, {}, window);
-  await popupShown;
-
-  let popupHidden = BrowserTestUtils.waitForEvent(panel, "popuphidden");
-  panel.hidePopup();
-  await popupHidden;
-
-  Assert.ok(
-    document.getElementById("pageAction-panel-launchSSB").disabled,
-    "Menu should be disabled for a http: page."
-  );
-
-  let uri = gHttpsTestRoot + "test_page.html";
-  BrowserTestUtils.loadURI(tab.linkedBrowser, uri);
-  await BrowserTestUtils.browserLoaded(tab.linkedBrowser, true, uri);
-
-  Assert.ok(
-    !document.getElementById("pageAction-panel-launchSSB").disabled,
-    "Menu should not be disabled for a https: page."
-  );
-
-  BrowserTestUtils.removeTab(tab);
-});

browser/components/ssb/tests/browser/browser_ssb_open.js

-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Verify that clicking the menu button opens an ssb.
-add_task(async () => {
-  let tab = await BrowserTestUtils.openNewForegroundTab({
-    gBrowser,
-    url: gHttpsTestRoot + "test_page.html",
-  });
-
-  let ssb = await openSSBFromBrowserWindow();
-  Assert.equal(
-    getBrowser(ssb).currentURI.spec,
-    gHttpsTestRoot + "test_page.html"
-  );
-
-  Assert.equal(tab.parentNode, null, "The tab should have been closed");
-  await BrowserTestUtils.closeWindow(ssb);
-});

browser/components/ssb/tests/browser/empty_page.html

-<!DOCTYPE html>
-
-<html>
-<head>
-<meta charset="utf-8">
-</head>
-<body>
-</body>
-</html>

browser/components/ssb/tests/browser/head.js

-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// An insecure site to use. SSBs cannot be insecure.
-const gHttpTestRoot = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content/",
-  "http://example.com/"
-);
-
-// A secure site to use.
-const gHttpsTestRoot = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content/",
-  "https://example.com/"
-);
-
-// The chrome url for the SSB UI.
-const SSB_WINDOW = "chrome://browser/content/ssb/ssb.html";
-
-// Simulates opening a SSB from the main browser window. Resolves to the SSB
-// DOM window after the SSB content has loaded.
-async function openSSBFromBrowserWindow(win = window) {
-  let doc = win.document;
-  let pageActionButton = doc.getElementById("pageActionButton");
-  let panel = doc.getElementById("pageActionPanel");
-  let popupShown = BrowserTestUtils.waitForEvent(panel, "popupshown");
-
-  EventUtils.synthesizeMouseAtCenter(pageActionButton, {}, win);
-  await popupShown;
-
-  let openItem = doc.getElementById("pageAction-panel-launchSSB");
-  Assert.ok(!openItem.disabled, "Open menu item should not be disabled");
-  Assert.ok(!openItem.hidden, "Open menu item should not be hidden");
-
-  let openPromise = BrowserTestUtils.domWindowOpened(null, async domwin => {
-    await BrowserTestUtils.waitForEvent(domwin, "load");
-    return domwin.location.toString() == SSB_WINDOW;
-  });
-
-  EventUtils.synthesizeMouseAtCenter(openItem, {}, win);
-  let ssbwin = await openPromise;
-  let browser = ssbwin.document.getElementById("browser");
-  await BrowserTestUtils.browserLoaded(browser, true);
-  return ssbwin;
-}
-
-// Given the SSB UI DOM window gets the browser element showing the content.
-function getBrowser(ssbwin) {
-  return ssbwin.document.getElementById("browser");
-}

browser/components/ssb/tests/browser/test_page.html

-<!DOCTYPE html>
-
-<html>
-<body>
-</body>
-</html>

browser/modules/PageActions.jsm

@@ -36,11 +36,6 @@ ChromeUtils.defineModuleGetter(
   "PrivateBrowsingUtils",
   "resource://gre/modules/PrivateBrowsingUtils.jsm"
 );
-ChromeUtils.defineModuleGetter(
-  this,
-  "SiteSpecificBrowserService",
-  "resource:///modules/SiteSpecificBrowserService.jsm"
-);
 
 const ACTION_ID_BOOKMARK = "bookmark";
 const ACTION_ID_PIN_TAB = "pinTab";
@@ -1285,20 +1280,6 @@ if (Services.prefs.getBoolPref("identity.fxaccounts.enabled")) {
   });
 }
 
-if (SiteSpecificBrowserService.isEnabled) {
-  gBuiltInActions.push({
-    id: "launchSSB",
-    // Hardcoded for now. Localization tracked in bug 1602528.
-    title: "Launch Site Specific Browser",
-    onLocationChange(browserWindow) {
-      browserPageActions(browserWindow).launchSSB.updateState();
-    },
-    onCommand(event, buttonNode) {
-      browserPageActions(buttonNode).launchSSB.onCommand(event, buttonNode);
-    },
-  });
-}
-
 // share URL
 if (AppConstants.platform == "macosx") {
   gBuiltInActions.push({