From 906511d94ecaf30dad6d55e3d25980935c0da334 Mon Sep 17 00:00:00 2001
From: Blair McBride <bmcbride@mozilla.com>
Date: Thu, 19 Feb 2015 20:35:07 +1300
Subject: [PATCH 01/18] Bug 1123517 - Refactor sidebar code. r=florian

--HG--
extra : transplant_source : %9C%85%BA%A1%F1%88%FCx%BD%0F%C3%87W%26pf%F2U%0A7
---
 browser/base/content/browser-sets.inc         |   6 +-
 browser/base/content/browser-sidebar.js       | 309 ++++++++++++++++++
 browser/base/content/browser.js               | 262 +++------------
 browser/base/content/browser.xul              |   4 +-
 .../content/test/general/browser_bug409481.js |   4 +-
 .../customizableui/content/panelUI.inc.xul    |   4 +-
 .../test/browser_988072_sidebar_events.js     |   2 +-
 .../places/tests/browser/browser_555547.js    |   6 +-
 .../browser/browser_bookmarksProperties.js    |  14 +-
 .../browser/browser_history_sidebar_search.js |   4 +-
 .../browser/browser_sidebarpanels_click.js    |   6 +-
 .../tests/browser/browser_views_liveupdate.js |   4 +-
 .../browser_privatebrowsing_sidebar.js        |   2 +-
 .../components/sessionstore/SessionStore.jsm  |   2 +-
 14 files changed, 380 insertions(+), 249 deletions(-)
 create mode 100644 browser/base/content/browser-sidebar.js

diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index ec3f227c2fdf..3e293dc4c0d4 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -138,7 +138,7 @@
     <broadcaster id="Social:PageShareOrMark" disabled="true"/>
     <broadcaster id="viewBookmarksSidebar" autoCheck="false" label="&bookmarksButton.label;"
                  type="checkbox" group="sidebar" sidebarurl="chrome://browser/content/bookmarks/bookmarksPanel.xul"
-                 oncommand="toggleSidebar('viewBookmarksSidebar');"/>
+                 oncommand="SidebarUI.toggle('viewBookmarksSidebar');"/>
 
     <!-- for both places and non-places, the sidebar lives at
          chrome://browser/content/history/history-panel.xul so there are no
@@ -146,11 +146,11 @@
     <broadcaster id="viewHistorySidebar" autoCheck="false" sidebartitle="&historyButton.label;"
                  type="checkbox" group="sidebar"
                  sidebarurl="chrome://browser/content/history/history-panel.xul"
-                 oncommand="toggleSidebar('viewHistorySidebar');"/>
+                 oncommand="SidebarUI.toggle('viewHistorySidebar');"/>
 
     <broadcaster id="viewWebPanelsSidebar" autoCheck="false"
                  type="checkbox" group="sidebar" sidebarurl="chrome://browser/content/web-panels.xul"
-                 oncommand="toggleSidebar('viewWebPanelsSidebar');"/>
+                 oncommand="SidebarUI.toggle('viewWebPanelsSidebar');"/>
 
     <broadcaster id="bookmarkThisPageBroadcaster"
                  label="&bookmarkThisPageCmd.label;"
diff --git a/browser/base/content/browser-sidebar.js b/browser/base/content/browser-sidebar.js
new file mode 100644
index 000000000000..258205e7c1f6
--- /dev/null
+++ b/browser/base/content/browser-sidebar.js
@@ -0,0 +1,309 @@
+# 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/.
+
+/**
+ * SidebarUI controls showing and hiding the browser sidebar.
+ *
+ * @note
+ * Some of these methods take a commandID argument - we expect to find a
+ * xul:broadcaster element with the specified ID.
+ * The following attributes on that element may be used and/or modified:
+ *  - id           (required) the string to match commandID. The convention
+ *                 is to use this naming scheme: 'view<sidebar-name>Sidebar'.
+ *  - sidebarurl   (required) specifies the URL to load in this sidebar.
+ *  - sidebartitle or label (in that order) specify the title to
+ *                 display on the sidebar.
+ *  - checked      indicates whether the sidebar is currently displayed.
+ *                 Note that toggleSidebar updates this attribute when
+ *                 it changes the sidebar's visibility.
+ *  - group        this attribute must be set to "sidebar".
+ */
+let SidebarUI = {
+  browser: null,
+
+  _box: null,
+  _title: null,
+  _splitter: null,
+
+  init() {
+    this._box = document.getElementById("sidebar-box");
+    this.browser = document.getElementById("sidebar");
+    this._title = document.getElementById("sidebar-title");
+    this._splitter = document.getElementById("sidebar-splitter");
+
+    if (window.opener && !window.opener.closed &&
+        window.opener.document.documentURIObject.schemeIs("chrome") &&
+        PrivateBrowsingUtils.isWindowPrivate(window) == PrivateBrowsingUtils.isWindowPrivate(window.opener)) {
+      this.adoptFromWindow(window.opener);
+    } else {
+      let commandID = this._box.getAttribute("sidebarcommand");
+      if (commandID) {
+        let command = document.getElementById(commandID);
+        if (command) {
+          this._delayedLoad = true;
+          this._box.hidden = false;
+          this._splitter.hidden = false;
+          command.setAttribute("checked", "true");
+        } else {
+          // Remove the |sidebarcommand| attribute, because the element it
+          // refers to no longer exists, so we should assume this sidebar
+          // panel has been uninstalled. (249883)
+          this._box.removeAttribute("sidebarcommand");
+        }
+      }
+    }
+  },
+
+  uninit() {
+    let enumerator = Services.wm.getEnumerator(null);
+    enumerator.getNext();
+    if (!enumerator.hasMoreElements()) {
+      document.persist("sidebar-box", "sidebarcommand");
+      document.persist("sidebar-box", "width");
+      document.persist("sidebar-box", "src");
+      document.persist("sidebar-title", "value");
+    }
+  },
+
+  /**
+   * Adopt the status of the sidebar from another window.
+   * @param {Window} sourceWindow - Window to use as a source for sidebar status.
+   */
+  adoptFromWindow(sourceWindow) {
+    // If the opener had a sidebar, open the same sidebar in our window.
+    // The opener can be the hidden window too, if we're coming from the state
+    // where no windows are open, and the hidden window has no sidebar box.
+    let sourceUI = sourceWindow.SidebarUI;
+    if (!sourceUI || sourceUI._box.hidden) {
+      return;
+    }
+
+    let commandID = sourceUI._box.getAttribute("sidebarcommand");
+    let commandElem = document.getElementById(commandID);
+
+    // dynamically generated sidebars will fail this check.
+    if (!commandElem) {
+      return;
+    }
+
+    this._title.setAttribute("value",
+                             sourceUI._title.getAttribute("value"));
+    this._box.setAttribute("width", sourceUI._box.boxObject.width);
+
+    this._box.setAttribute("sidebarcommand", commandID);
+    // Note: we're setting 'src' on this._box, which is a <vbox>, not on
+    // the <browser id="sidebar">. This lets us delay the actual load until
+    // delayedStartup().
+    this._box.setAttribute("src", sourceUI.browser.getAttribute("src"));
+    this._delayedLoad = true;
+
+    this._box.hidden = false;
+    this._splitter.hidden = false;
+    commandElem.setAttribute("checked", "true");
+  },
+
+  /**
+   * If loading a sidebar was delayed on startup, start the load now.
+   */
+  startDelayedLoad() {
+    if (!this._delayedLoad) {
+      return;
+    }
+
+    this.browser.setAttribute("src", this._box.getAttribute("src"));
+  },
+
+  /**
+   * Fire a "SidebarFocused" event on the sidebar's |window| to give the sidebar
+   * a chance to adjust focus as needed. An additional event is needed, because
+   * we don't want to focus the sidebar when it's opened on startup or in a new
+   * window, only when the user opens the sidebar.
+   */
+  _fireFocusedEvent() {
+    let event = new CustomEvent("SidebarFocused", {bubbles: true});
+    this.browser.contentWindow.dispatchEvent(event);
+
+    // Run the original function for backwards compatibility.
+    fireSidebarFocusedEvent();
+  },
+
+  /**
+   * True if the sidebar is currently open.
+   */
+  get isOpen() {
+    return !this._box.hidden;
+  },
+
+  /**
+   * The ID of the current sidebar (ie, the ID of the broadcaster being used).
+   * This can be set even if the sidebar is hidden.
+   */
+  get currentID() {
+    return this._box.getAttribute("sidebarcommand");
+  },
+
+  get title() {
+    return this._title.value;
+  },
+
+  set title(value) {
+    this._title.value = value;
+  },
+
+  /**
+   * Toggle the visibility of the sidebar. If the sidebar is hidden or is open
+   * with a different commandID, then the sidebar will be opened using the
+   * specified commandID. Otherwise the sidebar will be hidden.
+   *
+   * @param {string} commandID ID of the xul:broadcaster element to use.
+   * @return {Promise}
+   */
+  toggle(commandID = this.currentID) {
+    if (this.isOpen && commandID == this.currentID) {
+      this.hide();
+      return Promise.resolve();
+    } else {
+      return this.show(commandID);
+    }
+  },
+
+  /**
+   * Show the sidebar, using the parameters from the specified broadcaster.
+   * @see SidebarUI note.
+   *
+   * @param {string} commandID ID of the xul:broadcaster element to use.
+   */
+  show(commandID) {
+    return new Promise((resolve, reject) => {
+      let sidebarBroadcaster = document.getElementById(commandID);
+      if (!sidebarBroadcaster || sidebarBroadcaster.localName != "broadcaster") {
+        reject(new Error("Invalid sidebar broadcaster specified"));
+        return;
+      }
+
+      let broadcasters = document.getElementsByAttribute("group", "sidebar");
+      for (let broadcaster of broadcasters) {
+        // skip elements that observe sidebar broadcasters and random
+        // other elements
+        if (broadcaster.localName != "broadcaster") {
+          continue;
+        }
+
+        if (broadcaster != sidebarBroadcaster) {
+          broadcaster.removeAttribute("checked");
+        } else {
+          sidebarBroadcaster.setAttribute("checked", "true");
+        }
+      }
+
+      this._box.hidden = false;
+      this._splitter.hidden = false;
+
+      this._box.setAttribute("sidebarcommand", sidebarBroadcaster.id);
+
+      let title = sidebarBroadcaster.getAttribute("sidebartitle");
+      if (!title) {
+        title = sidebarBroadcaster.getAttribute("label");
+      }
+      this._title.value = title;
+
+      let url = sidebarBroadcaster.getAttribute("sidebarurl");
+      this.browser.setAttribute("src", url); // kick off async load
+
+      // We set this attribute here in addition to setting it on the <browser>
+      // element itself, because the code in SidebarUI.uninit() persists this
+      // attribute, not the "src" of the <browser id="sidebar">. The reason it
+      // does that is that we want to delay sidebar load a bit when a browser
+      // window opens. See delayedStartup() and SidebarUI.startDelayedLoad().
+      this._box.setAttribute("src", url);
+
+      if (this.browser.contentDocument.location.href != url) {
+        let onLoad = event => {
+          this.browser.removeEventListener("load", onLoad, true);
+
+          // We're handling the 'load' event before it bubbles up to the usual
+          // (non-capturing) event handlers. Let it bubble up before firing the
+          // SidebarFocused event.
+          setTimeout(() => this._fireFocusedEvent(), 0);
+
+          // Run the original function for backwards compatibility.
+          sidebarOnLoad(event);
+
+          resolve();
+        };
+
+        this.browser.addEventListener("load", onLoad, true);
+      } else {
+        // Older code handled this case, so we do it too.
+        this._fireFocusedEvent();
+        resolve();
+      }
+    });
+  },
+
+  /**
+   * Hide the sidebar.
+   */
+  hide() {
+    if (!this.isOpen) {
+      return;
+    }
+
+    let commandID = this._box.getAttribute("sidebarcommand");
+    let sidebarBroadcaster = document.getElementById(commandID);
+
+    if (sidebarBroadcaster.getAttribute("checked") != "true") {
+      return;
+    }
+
+    // Replace the document currently displayed in the sidebar with about:blank
+    // so that we can free memory by unloading the page. We need to explicitly
+    // create a new content viewer because the old one doesn't get destroyed
+    // until about:blank has loaded (which does not happen as long as the
+    // element is hidden).
+    this.browser.setAttribute("src", "about:blank");
+    this.browser.docShell.createAboutBlankContentViewer(null);
+
+    sidebarBroadcaster.removeAttribute("checked");
+    this._box.setAttribute("sidebarcommand", "");
+    this._title.value = "";
+    this._box.hidden = true;
+    this._splitter.hidden = true;
+    gBrowser.selectedBrowser.focus();
+  },
+};
+
+/**
+ * This exists for backards compatibility - it will be called once a sidebar is
+ * ready, following any request to show it.
+ *
+ * @deprecated
+ */
+function fireSidebarFocusedEvent() {}
+
+/**
+ * This exists for backards compatibility - it gets called when a sidebar has
+ * been loaded.
+ *
+ * @deprecated
+ */
+function sidebarOnLoad(event) {}
+
+/**
+ * This exists for backards compatibility, and is equivilent to
+ * SidebarUI.toggle() without the forceOpen param. With forceOpen set to true,
+ * it is equalivent to SidebarUI.show().
+ *
+ * @deprecated
+ */
+function toggleSidebar(commandID, forceOpen = false) {
+  Deprecated.warning("toggleSidebar() is deprecated, please use SidebarUI.toggle() or SidebarUI.show() instead",
+                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/Sidebar");
+
+  if (forceOpen) {
+    SidebarUI.show(commandID);
+  } else {
+    SidebarUI.toggle(commandID);
+  }
+}
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 50f9de8cd578..e4b782ec4d96 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -12,6 +12,9 @@ Cu.import("resource://gre/modules/NotificationDB.jsm");
 Cu.import("resource:///modules/RecentWindow.jsm");
 Cu.import("resource://gre/modules/WindowsPrefSync.jsm");
 
+
+XPCOMUtils.defineLazyModuleGetter(this, "Deprecated",
+                                  "resource://gre/modules/Deprecated.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "BrowserUITelemetry",
                                   "resource:///modules/BrowserUITelemetry.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "E10SUtils",
@@ -223,6 +226,7 @@ let gInitialPages = [
 #include browser-places.js
 #include browser-plugins.js
 #include browser-safebrowsing.js
+#include browser-sidebar.js
 #include browser-social.js
 #include browser-tabview.js
 #include browser-thumbnails.js
@@ -899,8 +903,6 @@ var gBrowserInit = {
   delayedStartupFinished: false,
 
   onLoad: function() {
-    var mustLoadSidebar = false;
-
     gBrowser.addEventListener("DOMUpdatePageReport", gPopupBlockerObserver, false);
 
     Services.obs.addObserver(gPluginHandler.pluginCrashed, "plugin-crashed", false);
@@ -952,61 +954,7 @@ var gBrowserInit = {
     // setup history swipe animation
     gHistorySwipeAnimation.init();
 
-    if (window.opener && !window.opener.closed &&
-        window.opener.document.documentURIObject.schemeIs("chrome") &&
-        PrivateBrowsingUtils.isWindowPrivate(window) == PrivateBrowsingUtils.isWindowPrivate(window.opener)) {
-      let openerSidebarBox = window.opener.document.getElementById("sidebar-box");
-      // If the opener had a sidebar, open the same sidebar in our window.
-      // The opener can be the hidden window too, if we're coming from the state
-      // where no windows are open, and the hidden window has no sidebar box.
-      if (openerSidebarBox && !openerSidebarBox.hidden) {
-        let sidebarCmd = openerSidebarBox.getAttribute("sidebarcommand");
-        let sidebarCmdElem = document.getElementById(sidebarCmd);
-
-        // dynamically generated sidebars will fail this check.
-        if (sidebarCmdElem) {
-          let sidebarBox = document.getElementById("sidebar-box");
-          let sidebarTitle = document.getElementById("sidebar-title");
-
-          sidebarTitle.setAttribute(
-            "value", window.opener.document.getElementById("sidebar-title").getAttribute("value"));
-          sidebarBox.setAttribute("width", openerSidebarBox.boxObject.width);
-
-          sidebarBox.setAttribute("sidebarcommand", sidebarCmd);
-          // Note: we're setting 'src' on sidebarBox, which is a <vbox>, not on
-          // the <browser id="sidebar">. This lets us delay the actual load until
-          // delayedStartup().
-          sidebarBox.setAttribute(
-            "src", window.opener.document.getElementById("sidebar").getAttribute("src"));
-          mustLoadSidebar = true;
-
-          sidebarBox.hidden = false;
-          document.getElementById("sidebar-splitter").hidden = false;
-          sidebarCmdElem.setAttribute("checked", "true");
-        }
-      }
-    }
-    else {
-      let box = document.getElementById("sidebar-box");
-      if (box.hasAttribute("sidebarcommand")) {
-        let commandID = box.getAttribute("sidebarcommand");
-        if (commandID) {
-          let command = document.getElementById(commandID);
-          if (command) {
-            mustLoadSidebar = true;
-            box.hidden = false;
-            document.getElementById("sidebar-splitter").hidden = false;
-            command.setAttribute("checked", "true");
-          }
-          else {
-            // Remove the |sidebarcommand| attribute, because the element it
-            // refers to no longer exists, so we should assume this sidebar
-            // panel has been uninstalled. (249883)
-            box.removeAttribute("sidebarcommand");
-          }
-        }
-      }
-    }
+    SidebarUI.init();
 
     // Certain kinds of automigration rely on this notification to complete
     // their tasks BEFORE the browser window is shown. SessionStore uses it to
@@ -1095,7 +1043,7 @@ var gBrowserInit = {
     ToolbarIconColor.init();
 
     // Wait until chrome is painted before executing code not critical to making the window visible
-    this._boundDelayedStartup = this._delayedStartup.bind(this, mustLoadSidebar);
+    this._boundDelayedStartup = this._delayedStartup.bind(this);
     window.addEventListener("MozAfterPaint", this._boundDelayedStartup);
 
     this._loadHandled = true;
@@ -1106,7 +1054,7 @@ var gBrowserInit = {
     this._boundDelayedStartup = null;
   },
 
-  _delayedStartup: function(mustLoadSidebar) {
+  _delayedStartup: function() {
     let tmp = {};
     Cu.import("resource://gre/modules/TelemetryTimestamps.jsm", tmp);
     let TelemetryTimestamps = tmp.TelemetryTimestamps;
@@ -1269,11 +1217,7 @@ var gBrowserInit = {
 
     Services.telemetry.getHistogramById("E10S_WINDOW").add(gMultiProcessBrowser);
 
-    if (mustLoadSidebar) {
-      let sidebar = document.getElementById("sidebar");
-      let sidebarBox = document.getElementById("sidebar-box");
-      sidebar.setAttribute("src", sidebarBox.getAttribute("src"));
-    }
+    SidebarUI.startDelayedLoad();
 
     UpdateUrlbarSearchSplitterState();
 
@@ -1535,14 +1479,7 @@ var gBrowserInit = {
 
     gMenuButtonUpdateBadge.uninit();
 
-    var enumerator = Services.wm.getEnumerator(null);
-    enumerator.getNext();
-    if (!enumerator.hasMoreElements()) {
-      document.persist("sidebar-box", "sidebarcommand");
-      document.persist("sidebar-box", "width");
-      document.persist("sidebar-box", "src");
-      document.persist("sidebar-title", "value");
-    }
+    SidebarUI.uninit();
 
     // Now either cancel delayedStartup, or clean up the services initialized from
     // it.
@@ -1769,7 +1706,7 @@ function HandleAppCommandEvent(evt) {
     BrowserSearch.webSearch();
     break;
   case "Bookmarks":
-    toggleSidebar('viewBookmarksSidebar');
+    SidebarUI.toggle("viewBookmarksSidebar");
     break;
   case "Home":
     BrowserHome();
@@ -3139,23 +3076,19 @@ var PrintPreviewListener = {
     else
       this._showChrome();
 
-    if (this._chromeState.sidebarOpen)
-      toggleSidebar(this._sidebarCommand);
-
     TabsInTitlebar.allowedBy("print-preview", !gInPrintPreviewMode);
   },
   _hideChrome: function () {
     this._chromeState = {};
 
-    var sidebar = document.getElementById("sidebar-box");
-    this._chromeState.sidebarOpen = !sidebar.hidden;
-    this._sidebarCommand = sidebar.getAttribute("sidebarcommand");
+    this._chromeState.sidebarOpen = SidebarUI.isOpen;
+    this._sidebarCommand = SidebarUI.currentID;
+    SidebarUI.hide();
 
     var notificationBox = gBrowser.getNotificationBox();
     this._chromeState.notificationsOpen = !notificationBox.notificationsHidden;
     notificationBox.notificationsHidden = true;
 
-    document.getElementById("sidebar").setAttribute("src", "about:blank");
     gBrowser.updateWindowResizers();
 
     this._chromeState.findOpen = gFindBarInitialized && !gFindBar.hidden;
@@ -3185,6 +3118,9 @@ var PrintPreviewListener = {
 
     if (this._chromeState.syncNotificationsOpen)
       document.getElementById("sync-notifications").notificationsHidden = false;
+
+    if (this._chromeState.sidebarOpen)
+      SidebarUI.show(this._sidebarCommand);
   }
 }
 
@@ -5213,121 +5149,6 @@ function displaySecurityInfo()
   BrowserPageInfo(null, "securityTab");
 }
 
-/**
- * Opens or closes the sidebar identified by commandID.
- *
- * @param commandID a string identifying the sidebar to toggle; see the
- *                  note below. (Optional if a sidebar is already open.)
- * @param forceOpen boolean indicating whether the sidebar should be
- *                  opened regardless of its current state (optional).
- * @note
- * We expect to find a xul:broadcaster element with the specified ID.
- * The following attributes on that element may be used and/or modified:
- *  - id           (required) the string to match commandID. The convention
- *                 is to use this naming scheme: 'view<sidebar-name>Sidebar'.
- *  - sidebarurl   (required) specifies the URL to load in this sidebar.
- *  - sidebartitle or label (in that order) specify the title to
- *                 display on the sidebar.
- *  - checked      indicates whether the sidebar is currently displayed.
- *                 Note that toggleSidebar updates this attribute when
- *                 it changes the sidebar's visibility.
- *  - group        this attribute must be set to "sidebar".
- */
-function toggleSidebar(commandID, forceOpen) {
-
-  var sidebarBox = document.getElementById("sidebar-box");
-  if (!commandID)
-    commandID = sidebarBox.getAttribute("sidebarcommand");
-
-  var sidebarBroadcaster = document.getElementById(commandID);
-  var sidebar = document.getElementById("sidebar"); // xul:browser
-  var sidebarTitle = document.getElementById("sidebar-title");
-  var sidebarSplitter = document.getElementById("sidebar-splitter");
-
-  if (sidebarBroadcaster.getAttribute("checked") == "true") {
-    if (!forceOpen) {
-      // Replace the document currently displayed in the sidebar with about:blank
-      // so that we can free memory by unloading the page. We need to explicitly
-      // create a new content viewer because the old one doesn't get destroyed
-      // until about:blank has loaded (which does not happen as long as the
-      // element is hidden).
-      sidebar.setAttribute("src", "about:blank");
-      sidebar.docShell.createAboutBlankContentViewer(null);
-
-      sidebarBroadcaster.removeAttribute("checked");
-      sidebarBox.setAttribute("sidebarcommand", "");
-      sidebarTitle.value = "";
-      sidebarBox.hidden = true;
-      sidebarSplitter.hidden = true;
-      gBrowser.selectedBrowser.focus();
-    } else {
-      fireSidebarFocusedEvent();
-    }
-    return;
-  }
-
-  // now we need to show the specified sidebar
-
-  // ..but first update the 'checked' state of all sidebar broadcasters
-  var broadcasters = document.getElementsByAttribute("group", "sidebar");
-  for (let broadcaster of broadcasters) {
-    // skip elements that observe sidebar broadcasters and random
-    // other elements
-    if (broadcaster.localName != "broadcaster")
-      continue;
-
-    if (broadcaster != sidebarBroadcaster)
-      broadcaster.removeAttribute("checked");
-    else
-      sidebarBroadcaster.setAttribute("checked", "true");
-  }
-
-  sidebarBox.hidden = false;
-  sidebarSplitter.hidden = false;
-
-  var url = sidebarBroadcaster.getAttribute("sidebarurl");
-  var title = sidebarBroadcaster.getAttribute("sidebartitle");
-  if (!title)
-    title = sidebarBroadcaster.getAttribute("label");
-  sidebar.setAttribute("src", url); // kick off async load
-  sidebarBox.setAttribute("sidebarcommand", sidebarBroadcaster.id);
-  sidebarTitle.value = title;
-
-  // We set this attribute here in addition to setting it on the <browser>
-  // element itself, because the code in gBrowserInit.onUnload persists this
-  // attribute, not the "src" of the <browser id="sidebar">. The reason it
-  // does that is that we want to delay sidebar load a bit when a browser
-  // window opens. See delayedStartup().
-  sidebarBox.setAttribute("src", url);
-
-  if (sidebar.contentDocument.location.href != url)
-    sidebar.addEventListener("load", sidebarOnLoad, true);
-  else // older code handled this case, so we do it too
-    fireSidebarFocusedEvent();
-}
-
-function sidebarOnLoad(event) {
-  var sidebar = document.getElementById("sidebar");
-  sidebar.removeEventListener("load", sidebarOnLoad, true);
-  // We're handling the 'load' event before it bubbles up to the usual
-  // (non-capturing) event handlers. Let it bubble up before firing the
-  // SidebarFocused event.
-  setTimeout(fireSidebarFocusedEvent, 0);
-}
-
-/**
- * Fire a "SidebarFocused" event on the sidebar's |window| to give the sidebar
- * a chance to adjust focus as needed. An additional event is needed, because
- * we don't want to focus the sidebar when it's opened on startup or in a new
- * window, only when the user opens the sidebar.
- */
-function fireSidebarFocusedEvent() {
-  var sidebar = document.getElementById("sidebar");
-  var event = document.createEvent("Events");
-  event.initEvent("SidebarFocused", true, false);
-  sidebar.contentWindow.dispatchEvent(event);
-}
-
 
 var gHomeButton = {
   prefDomain: "browser.startup.homepage",
@@ -5474,38 +5295,37 @@ function getBrowserSelection(aCharLen) {
 }
 
 var gWebPanelURI;
-function openWebPanel(aTitle, aURI)
-{
-    // Ensure that the web panels sidebar is open.
-    toggleSidebar('viewWebPanelsSidebar', true);
+function openWebPanel(title, uri) {
+  // Ensure that the web panels sidebar is open.
+  SidebarUI.show("viewWebPanelsSidebar");
 
-    // Set the title of the panel.
-    document.getElementById("sidebar-title").value = aTitle;
+  // Set the title of the panel.
+  SidebarUI.title = title;
 
-    // Tell the Web Panels sidebar to load the bookmark.
-    var sidebar = document.getElementById("sidebar");
-    if (sidebar.docShell && sidebar.contentDocument && sidebar.contentDocument.getElementById('web-panels-browser')) {
-        sidebar.contentWindow.loadWebPanel(aURI);
-        if (gWebPanelURI) {
-            gWebPanelURI = "";
-            sidebar.removeEventListener("load", asyncOpenWebPanel, true);
-        }
+  // Tell the Web Panels sidebar to load the bookmark.
+  if (SidebarUI.browser.docShell && SidebarUI.browser.contentDocument &&
+      SidebarUI.browser.contentDocument.getElementById("web-panels-browser")) {
+    SidebarUI.browser.contentWindow.loadWebPanel(uri);
+    if (gWebPanelURI) {
+      gWebPanelURI = "";
+      SidebarUI.browser.removeEventListener("load", asyncOpenWebPanel, true);
     }
-    else {
-        // The panel is still being constructed.  Attach an onload handler.
-        if (!gWebPanelURI)
-            sidebar.addEventListener("load", asyncOpenWebPanel, true);
-        gWebPanelURI = aURI;
+  } else {
+    // The panel is still being constructed.  Attach an onload handler.
+    if (!gWebPanelURI) {
+      SidebarUI.browser.addEventListener("load", asyncOpenWebPanel, true);
     }
+    gWebPanelURI = uri;
+  }
 }
 
-function asyncOpenWebPanel(event)
-{
-    var sidebar = document.getElementById("sidebar");
-    if (gWebPanelURI && sidebar.contentDocument && sidebar.contentDocument.getElementById('web-panels-browser'))
-        sidebar.contentWindow.loadWebPanel(gWebPanelURI);
-    gWebPanelURI = "";
-    sidebar.removeEventListener("load", asyncOpenWebPanel, true);
+function asyncOpenWebPanel(event) {
+  if (gWebPanelURI && SidebarUI.browser.contentDocument &&
+      SidebarUI.browser.contentDocument.getElementById("web-panels-browser")) {
+    SidebarUI.browser.contentWindow.loadWebPanel(gWebPanelURI);
+  }
+  gWebPanelURI = "";
+  SidebarUI.browser.removeEventListener("load", asyncOpenWebPanel, true);
 }
 
 /*
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index fb2eaad40811..6f0beea807ff 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -874,7 +874,7 @@
                       class="subviewbutton"
                       label="&viewBookmarksSidebar2.label;"
                       type="checkbox"
-                      oncommand="toggleSidebar('viewBookmarksSidebar');">
+                      oncommand="SidebarUI.toggle('viewBookmarksSidebar');">
               <observes element="viewBookmarksSidebar" attribute="checked"/>
             </menuitem>
             <!-- NB: temporary solution for bug 985024, this should go away soon. -->
@@ -1127,7 +1127,7 @@
         <sidebarheader id="sidebar-header" align="center">
           <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
           <image id="sidebar-throbber"/>
-          <toolbarbutton class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/>
+          <toolbarbutton class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="SidebarUI.hide();"/>
         </sidebarheader>
         <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true"
                   style="min-width: 14em; width: 18em; max-width: 36em;"/>
diff --git a/browser/base/content/test/general/browser_bug409481.js b/browser/base/content/test/general/browser_bug409481.js
index ade9d209928d..395ad93d433e 100644
--- a/browser/base/content/test/general/browser_bug409481.js
+++ b/browser/base/content/test/general/browser_bug409481.js
@@ -4,7 +4,7 @@ function test() {
   // XXX This looks a bit odd, but is needed to avoid throwing when removing the
   // event listeners below. See bug 310955.
   document.getElementById("sidebar").addEventListener("load", delayedOpenUrl, true);
-  toggleSidebar("viewWebPanelsSidebar", true);
+  SidebarUI.show("viewWebPanelsSidebar");
 }
 
 function delayedOpenUrl() {
@@ -75,7 +75,7 @@ function contextMenuClosed()
   var sidebar = document.getElementById("sidebar");
   sidebar.contentDocument.removeEventListener("popuphidden", contextMenuClosed, false);
 
-  toggleSidebar("viewWebPanelsSidebar");
+  SidebarUI.hide();
 
   ok(document.getElementById("sidebar-box").hidden, "Sidebar successfully hidden");
 
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index 3e7d4fca4805..b96057246ae7 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -64,7 +64,7 @@
                        type="checkbox"
                        class="subviewbutton"
                        key="key_gotoHistory"
-                       oncommand="toggleSidebar('viewHistorySidebar'); PanelUI.hide();">
+                       oncommand="SidebarUI.toggle('viewHistorySidebar'); PanelUI.hide();">
           <observes element="viewHistorySidebar" attribute="checked"/>
         </toolbarbutton>
         <toolbarbutton id="appMenuClearRecentHistory"
@@ -108,7 +108,7 @@
                        label="&viewBookmarksSidebar2.label;"
                        class="subviewbutton"
                        key="viewBookmarksSidebarKb"
-                       oncommand="toggleSidebar('viewBookmarksSidebar'); PanelUI.hide();">
+                       oncommand="SidebarUI.toggle('viewBookmarksSidebar'); PanelUI.hide();">
           <observes element="viewBookmarksSidebar" attribute="checked"/>
         </toolbarbutton>
         <toolbarbutton id="panelMenu_viewBookmarksToolbar"
diff --git a/browser/components/customizableui/test/browser_988072_sidebar_events.js b/browser/components/customizableui/test/browser_988072_sidebar_events.js
index 332a2e23d44a..203ecae915b3 100644
--- a/browser/components/customizableui/test/browser_988072_sidebar_events.js
+++ b/browser/components/customizableui/test/browser_988072_sidebar_events.js
@@ -22,7 +22,7 @@ registerCleanupFunction(() => {
 
   // Ensure sidebar is hidden after each test:
   if (!document.getElementById("sidebar-box").hidden) {
-    toggleSidebar("", false);
+    SidebarUI.hide();
   }
 });
 
diff --git a/browser/components/places/tests/browser/browser_555547.js b/browser/components/places/tests/browser/browser_555547.js
index 04476c26e743..0654139cbac2 100644
--- a/browser/components/places/tests/browser/browser_555547.js
+++ b/browser/components/places/tests/browser/browser_555547.js
@@ -16,7 +16,9 @@ add_task(function* test() {
   }
 
   let sidebar = yield promiseLoadedSidebar("viewBookmarksSidebar");
-  registerCleanupFunction(toggleSidebar);
+  registerCleanupFunction(() => {
+    SidebarUI.hide();
+  });
 
   // Focus the tree and check if its controller is returned.
   let tree = sidebar.contentDocument.getElementById("bookmarks-view");
@@ -59,6 +61,6 @@ function promiseLoadedSidebar(cmd) {
       resolve(sidebar);
     }, true);
 
-    toggleSidebar(cmd, true);
+    SidebarUI.show(cmd);
   });
 }
diff --git a/browser/components/places/tests/browser/browser_bookmarksProperties.js b/browser/components/places/tests/browser/browser_bookmarksProperties.js
index 3b3f3b424cd8..ea1ca3a538d9 100644
--- a/browser/components/places/tests/browser/browser_bookmarksProperties.js
+++ b/browser/components/places/tests/browser/browser_bookmarksProperties.js
@@ -79,7 +79,7 @@ gTests.push({
   finish: function() {
     // Close window, toggle sidebar and goto next test.
     this.window.document.documentElement.cancelDialog();
-    toggleSidebar(this.sidebar, false);
+    SidebarUI.hide();
     runNextTest();
   },
 
@@ -138,7 +138,7 @@ gTests.push({
 
   finish: function() {
     this.window.document.documentElement.cancelDialog();
-    toggleSidebar(this.sidebar, false);
+    SidebarUI.hide();
     runNextTest();
   },
 
@@ -232,7 +232,7 @@ gTests.push({
   },
 
   finish: function() {
-    toggleSidebar(this.sidebar, false);
+    SidebarUI.hide();
     runNextTest();
   },
 
@@ -291,7 +291,7 @@ gTests.push({
 
   finish: function() {
     // Window is already closed.
-    toggleSidebar(this.sidebar, false);
+    SidebarUI.hide();
     runNextTest();
   },
 
@@ -390,7 +390,7 @@ gTests.push({
   },
 
   finish: function() {
-    toggleSidebar(this.sidebar, false);
+    SidebarUI.hide();
     runNextTest();
   },
 
@@ -468,7 +468,7 @@ gTests.push({
   },
 
   finish: function() {
-    toggleSidebar(this.sidebar, false);
+    SidebarUI.hide();
     runNextTest();
   },
 
@@ -529,7 +529,7 @@ function execute_test_in_sidebar() {
       // Need to executeSoon since the tree is initialized on sidebar load.
       executeSoon(open_properties_dialog);
     }, true);
-    toggleSidebar(gCurrentTest.sidebar, true);
+    SidebarUI.show(gCurrentTest.sidebar);
 }
 
 function open_properties_dialog() {
diff --git a/browser/components/places/tests/browser/browser_history_sidebar_search.js b/browser/components/places/tests/browser/browser_history_sidebar_search.js
index 906b9561e5ff..0ae57a4d9ed3 100644
--- a/browser/components/places/tests/browser/browser_history_sidebar_search.js
+++ b/browser/components/places/tests/browser/browser_history_sidebar_search.js
@@ -44,7 +44,7 @@ function continue_test() {
                  transition: hs.TRANSITION_TYPED});
   }
   PlacesTestUtils.addVisits(places).then(() => {
-    toggleSidebar("viewHistorySidebar", true);
+    SidebarUI.show("viewHistorySidebar");
   });
 
   sidebar.addEventListener("load", function() {
@@ -63,7 +63,7 @@ function continue_test() {
       check_sidebar_tree_order(pages.length);
 
       // Cleanup.
-      toggleSidebar("viewHistorySidebar", false);
+      SidebarUI.hide();
       PlacesTestUtils.clearHistory().then(finish);
     });
   }, true);
diff --git a/browser/components/places/tests/browser/browser_sidebarpanels_click.js b/browser/components/places/tests/browser/browser_sidebarpanels_click.js
index 662e0d30fc05..80ed2eb2bb0e 100644
--- a/browser/components/places/tests/browser/browser_sidebarpanels_click.js
+++ b/browser/components/places/tests/browser/browser_sidebarpanels_click.js
@@ -18,7 +18,7 @@ function test() {
   // If a sidebar is already open, close it.
   if (!document.getElementById("sidebar-box").hidden) {
     info("Unexpected sidebar found - a previous test failed to cleanup correctly");
-    toggleSidebar();
+    SidebarUI.hide();
   }
 
   let sidebar = document.getElementById("sidebar");
@@ -76,7 +76,7 @@ function test() {
 
   function testPlacesPanel(preFunc, postFunc) {
     currentTest.init(function() {
-      toggleSidebar(currentTest.sidebarName);
+      SidebarUI.show(currentTest.sidebarName);
     });
 
     sidebar.addEventListener("load", function() {
@@ -95,7 +95,7 @@ function test() {
           aSubject.Dialog.ui.button0.click();
 
           executeSoon(function () {
-              toggleSidebar(currentTest.sidebarName);
+              SidebarUI.hide();
               currentTest.cleanup(postFunc);
             });
         }
diff --git a/browser/components/places/tests/browser/browser_views_liveupdate.js b/browser/components/places/tests/browser/browser_views_liveupdate.js
index 41c61a1f6a20..994f20888991 100644
--- a/browser/components/places/tests/browser/browser_views_liveupdate.js
+++ b/browser/components/places/tests/browser/browser_views_liveupdate.js
@@ -37,7 +37,7 @@ function openBookmarksSidebar() {
     // Need to executeSoon since the tree is initialized on sidebar load.
     executeSoon(startTest);
   }, true);
-  toggleSidebar("viewBookmarksSidebar", true);
+  SidebarUI.show("viewBookmarksSidebar");
 }
 
 /**
@@ -171,7 +171,7 @@ function startTest() {
  */
 function finishTest() {
   // Close bookmarks sidebar.
-  toggleSidebar("viewBookmarksSidebar", false);
+  SidebarUI.hide();
 
   // Collapse the personal toolbar if needed.
   if (wasCollapsed) {
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_sidebar.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_sidebar.js
index 7883f5d55df3..2d89cdf3fc88 100644
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_sidebar.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_sidebar.js
@@ -33,7 +33,7 @@ function test() {
       resolve(win);
     }, true);
 
-    win.toggleSidebar(sidebarID, true);
+    win.SidebarUI.show(sidebarID);
 
     return promise;
   }
diff --git a/browser/components/sessionstore/SessionStore.jsm b/browser/components/sessionstore/SessionStore.jsm
index cc771af85e14..64017f7344bf 100644
--- a/browser/components/sessionstore/SessionStore.jsm
+++ b/browser/components/sessionstore/SessionStore.jsm
@@ -2865,7 +2865,7 @@ let SessionStoreInternal = {
     }
     var sidebar = aWindow.document.getElementById("sidebar-box");
     if (sidebar.getAttribute("sidebarcommand") != aSidebar) {
-      aWindow.toggleSidebar(aSidebar);
+      aWindow.SidebarUI.show(aSidebar);
     }
     // since resizing/moving a window brings it to the foreground,
     // we might want to re-focus the last focused window

From 7ed0c8993454cf4ed2000a848332b0d70bce3e92 Mon Sep 17 00:00:00 2001
From: Blair McBride <bmcbride@mozilla.com>
Date: Thu, 19 Feb 2015 20:35:10 +1300
Subject: [PATCH 02/18] Bug 1123517 - [ReadingList] Implement basic sidebar
 that lists unread ReadingList items. r=florian

--HG--
extra : transplant_source : %F2%D7%B5%98%0F%FAG%7C%2AnKel%F1%08l%FA%F8%25c
---
 browser/app/profile/firefox.js                |   3 +
 browser/base/content/browser-menubar.inc      |   5 +
 browser/base/content/browser-readinglist.js   |  68 +++
 browser/base/content/browser-sets.inc         |  10 +
 browser/base/content/browser.js               |   6 +
 browser/base/content/browser.xul              |   2 +-
 .../base/content/test/BrowserUITestUtils.jsm  |  70 +++
 browser/base/moz.build                        |   4 +
 .../test/browser_988072_sidebar_events.js     |  10 +-
 browser/components/moz.build                  |   1 +
 .../components/readinglist/ReadingList.jsm    | 356 ++++++++++++++++
 browser/components/readinglist/jar.mn         |   7 +
 browser/components/readinglist/moz.build      |  15 +
 browser/components/readinglist/sidebar.js     | 403 ++++++++++++++++++
 browser/components/readinglist/sidebar.xhtml  |  30 ++
 .../readinglist/test/ReadingListTestUtils.jsm | 159 +++++++
 .../readinglist/test/browser/browser.ini      |   7 +
 .../test/browser/browser_sidebar_list.js      |  53 +++
 .../test/browser/browser_sidebar_mouse_nav.js |  82 ++++
 .../test/browser/browser_ui_enable_disable.js |  49 +++
 .../readinglist/test/browser/head.js          |  15 +
 .../locales/en-US/chrome/browser/browser.dtd  |   2 +
 browser/themes/linux/jar.mn                   |   1 +
 browser/themes/osx/jar.mn                     |   1 +
 browser/themes/shared/readinglist/sidebar.css |  72 ++++
 browser/themes/windows/jar.mn                 |   2 +
 26 files changed, 1429 insertions(+), 4 deletions(-)
 create mode 100644 browser/base/content/browser-readinglist.js
 create mode 100644 browser/base/content/test/BrowserUITestUtils.jsm
 create mode 100644 browser/components/readinglist/ReadingList.jsm
 create mode 100644 browser/components/readinglist/jar.mn
 create mode 100644 browser/components/readinglist/moz.build
 create mode 100644 browser/components/readinglist/sidebar.js
 create mode 100644 browser/components/readinglist/sidebar.xhtml
 create mode 100644 browser/components/readinglist/test/ReadingListTestUtils.jsm
 create mode 100644 browser/components/readinglist/test/browser/browser.ini
 create mode 100644 browser/components/readinglist/test/browser/browser_sidebar_list.js
 create mode 100644 browser/components/readinglist/test/browser/browser_sidebar_mouse_nav.js
 create mode 100644 browser/components/readinglist/test/browser/browser_ui_enable_disable.js
 create mode 100644 browser/components/readinglist/test/browser/head.js
 create mode 100644 browser/themes/shared/readinglist/sidebar.css

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index e7786767fe99..de1682100839 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1856,3 +1856,6 @@ pref("dom.ipc.reportProcessHangs", true);
 
 // Disable reader mode by default.
 pref("reader.parse-on-load.enabled", false);
+
+// Disable ReadingList by default.
+pref("browser.readinglist.enabled", false);
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index 7967500fb282..02f1d8b49c03 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -223,6 +223,11 @@
                               key="key_gotoHistory"
                               observes="viewHistorySidebar"
                               label="&historyButton.label;"/>
+                    <menuitem id="menu_readingListSidebar"
+                              key="key_readingListSidebar"
+                              observes="readingListSidebar"
+                              label="&readingList.label;"/>
+
                     <!-- Service providers with sidebars are inserted between these two menuseperators -->
                     <menuseparator hidden="true"/>
                     <menuseparator class="social-provider-menu" hidden="true"/>
diff --git a/browser/base/content/browser-readinglist.js b/browser/base/content/browser-readinglist.js
new file mode 100644
index 000000000000..7cce09623828
--- /dev/null
+++ b/browser/base/content/browser-readinglist.js
@@ -0,0 +1,68 @@
+/*
+# 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 ReadingListUI = {
+  /**
+   * Initialize the ReadingList UI.
+   */
+  init() {
+    Preferences.observe("browser.readinglist.enabled", this.updateUI, this);
+    this.updateUI();
+  },
+
+  /**
+   * Un-initialize the ReadingList UI.
+   */
+  uninit() {
+    Preferences.ignore("browser.readinglist.enabled", this.updateUI, this);
+  },
+
+  /**
+   * Whether the ReadingList feature is enabled or not.
+   * @type {boolean}
+   */
+  get enabled() {
+    return Preferences.get("browser.readinglist.enabled", false);
+  },
+
+  /**
+   * Whether the ReadingList sidebar is currently open or not.
+   * @type {boolean}
+   */
+  get isSidebarOpen() {
+    return SidebarUI.isOpen && SidebarUI.currentID == "readingListSidebar";
+  },
+
+  /**
+   * Update the UI status, ensuring the UI is shown or hidden depending on
+   * whether the feature is enabled or not.
+   */
+  updateUI() {
+    let enabled = this.enabled;
+    if (!enabled) {
+      this.hideSidebar();
+    }
+
+    document.getElementById("readingListSidebar").setAttribute("hidden", !enabled);
+  },
+
+  /**
+   * Show the ReadingList sidebar.
+   * @return {Promise}
+   */
+  showSidebar() {
+    return SidebarUI.show("readingListSidebar");
+  },
+
+  /**
+   * Hide the ReadingList sidebar, if it is currently shown.
+   */
+  hideSidebar() {
+    if (this.isSidebarOpen) {
+      SidebarUI.hide();
+    }
+  },
+};
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 3e293dc4c0d4..681a7dfa1c1a 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -148,6 +148,11 @@
                  sidebarurl="chrome://browser/content/history/history-panel.xul"
                  oncommand="SidebarUI.toggle('viewHistorySidebar');"/>
 
+    <broadcaster id="readingListSidebar" hidden="true" autoCheck="false"
+                 sidebartitle="&readingList.label;" type="checkbox" group="sidebar"
+                 sidebarurl="chrome://browser/content/readinglist/sidebar.xhtml"
+                 oncommand="SidebarUI.toggle('readingListSidebar');"/>
+
     <broadcaster id="viewWebPanelsSidebar" autoCheck="false"
                  type="checkbox" group="sidebar" sidebarurl="chrome://browser/content/web-panels.xul"
                  oncommand="SidebarUI.toggle('viewWebPanelsSidebar');"/>
@@ -418,6 +423,11 @@
 #endif
          command="viewHistorySidebar"/>
 
+    <key id="key_readingListSidebar"
+         key="&readingList.sidebar.commandKey;"
+         modifiers="accel,alt"
+         command="readingListSidebar"/>
+
     <key id="key_fullZoomReduce"  key="&fullZoomReduceCmd.commandkey;"   command="cmd_fullZoomReduce"  modifiers="accel"/>
     <key                          key="&fullZoomReduceCmd.commandkey2;"  command="cmd_fullZoomReduce"  modifiers="accel"/>
     <key id="key_fullZoomEnlarge" key="&fullZoomEnlargeCmd.commandkey;"  command="cmd_fullZoomEnlarge" modifiers="accel"/>
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index e4b782ec4d96..8e18c4922d1e 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -13,6 +13,8 @@ Cu.import("resource:///modules/RecentWindow.jsm");
 Cu.import("resource://gre/modules/WindowsPrefSync.jsm");
 
 
+XPCOMUtils.defineLazyModuleGetter(this, "Preferences",
+                                  "resource://gre/modules/Preferences.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Deprecated",
                                   "resource://gre/modules/Deprecated.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "BrowserUITelemetry",
@@ -225,6 +227,7 @@ let gInitialPages = [
 #include browser-loop.js
 #include browser-places.js
 #include browser-plugins.js
+#include browser-readinglist.js
 #include browser-safebrowsing.js
 #include browser-sidebar.js
 #include browser-social.js
@@ -1371,6 +1374,7 @@ var gBrowserInit = {
 
       SocialUI.init();
       TabView.init();
+      ReadingListUI.init();
 
       // Telemetry for master-password - we do this after 5 seconds as it
       // can cause IO if NSS/PSM has not already initialized.
@@ -1479,6 +1483,8 @@ var gBrowserInit = {
 
     gMenuButtonUpdateBadge.uninit();
 
+    ReadingListUI.uninit();
+
     SidebarUI.uninit();
 
     // Now either cancel delayedStartup, or clean up the services initialized from
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 6f0beea807ff..dda4b94867a5 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1130,7 +1130,7 @@
           <toolbarbutton class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="SidebarUI.hide();"/>
         </sidebarheader>
         <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true"
-                  style="min-width: 14em; width: 18em; max-width: 36em;"/>
+                  style="min-width: 14em; width: 18em; max-width: 36em;" tooltip="aHTMLTooltip"/>
       </vbox>
 
       <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
diff --git a/browser/base/content/test/BrowserUITestUtils.jsm b/browser/base/content/test/BrowserUITestUtils.jsm
new file mode 100644
index 000000000000..162dfa771e1d
--- /dev/null
+++ b/browser/base/content/test/BrowserUITestUtils.jsm
@@ -0,0 +1,70 @@
+"use strict";
+
+this.EXPORTED_SYMBOLS = [
+  "BrowserUITestUtils",
+];
+
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+
+Cu.import("resource://gre/modules/Timer.jsm");
+
+
+/**
+ * Default wait period in millseconds, when waiting for the expected event to occur.
+ * @type {number}
+ */
+const DEFAULT_WAIT = 2000;
+
+
+/**
+ * Test utility functions for dealing with the browser UI DOM.
+ */
+this.BrowserUITestUtils = {
+
+  /**
+   * Waits a specified number of miliseconds for a specified event to be
+   * fired on a specified element.
+   *
+   * Usage:
+   *    let receivedEvent = BrowserUITestUtils.waitForEvent(element, "eventName");
+   *    // Do some processing here that will cause the event to be fired
+   *    // ...
+   *    // Now yield until the Promise is fulfilled
+   *    yield receivedEvent;
+   *    if (receivedEvent && !(receivedEvent instanceof Error)) {
+   *      receivedEvent.msg == "eventName";
+   *      // ...
+   *    }
+   *
+   * @param {Element} subject - The element that should receive the event.
+   * @param {string} eventName - The event to wait for.
+   * @param {number} timeoutMs - The number of miliseconds to wait before giving up.
+   * @param {Element} target - Expected target of the event.
+   * @returns {Promise} A Promise that resolves to the received event, or
+   *                    rejects with an Error.
+   */
+  waitForEvent(subject, eventName, timeoutMs, target) {
+    return new Promise((resolve, reject) => {
+      function listener(event) {
+        if (target && target !== event.target) {
+          return;
+        }
+
+        subject.removeEventListener(eventName, listener);
+        clearTimeout(timerID);
+        resolve(event);
+      }
+
+      timeoutMs = timeoutMs || DEFAULT_WAIT;
+      let stack = new Error().stack;
+
+      let timerID = setTimeout(() => {
+        subject.removeEventListener(eventName, listener);
+        reject(new Error(`${eventName} event timeout at ${stack}`));
+      }, timeoutMs);
+
+
+      subject.addEventListener(eventName, listener);
+    });
+  },
+};
diff --git a/browser/base/moz.build b/browser/base/moz.build
index 6eb110290157..1576c8d8f0fd 100644
--- a/browser/base/moz.build
+++ b/browser/base/moz.build
@@ -6,6 +6,10 @@
 
 SPHINX_TREES['sslerrorreport'] = 'content/docs/sslerrorreport'
 
+TESTING_JS_MODULES += [
+    'content/test/BrowserUITestUtils.jsm',
+]
+
 MOCHITEST_MANIFESTS += [
     'content/test/general/mochitest.ini',
 ]
diff --git a/browser/components/customizableui/test/browser_988072_sidebar_events.js b/browser/components/customizableui/test/browser_988072_sidebar_events.js
index 203ecae915b3..2619aff3f336 100644
--- a/browser/components/customizableui/test/browser_988072_sidebar_events.js
+++ b/browser/components/customizableui/test/browser_988072_sidebar_events.js
@@ -53,9 +53,13 @@ function removeWidget() {
 
 // Filters out the trailing menuseparators from the sidebar list
 function getSidebarList() {
-  let sidebars = [...gSidebarMenu.children];
-  while (sidebars[sidebars.length - 1].localName == "menuseparator")
-    sidebars.pop();
+  let sidebars = [...gSidebarMenu.children].filter(sidebar => {
+    if (sidebar.localName == "menuseparator")
+      return false;
+    if (sidebar.getAttribute("hidden") == "true")
+      return false;
+    return true;
+  });
   return sidebars;
 }
 
diff --git a/browser/components/moz.build b/browser/components/moz.build
index a36e145a19d6..9cc6bfe7ded4 100644
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -15,6 +15,7 @@ DIRS += [
     'places',
     'preferences',
     'privatebrowsing',
+    'readinglist',
     'search',
     'sessionstore',
     'shell',
diff --git a/browser/components/readinglist/ReadingList.jsm b/browser/components/readinglist/ReadingList.jsm
new file mode 100644
index 000000000000..dcd1cc808a55
--- /dev/null
+++ b/browser/components/readinglist/ReadingList.jsm
@@ -0,0 +1,356 @@
+/* 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/. */
+
+"use strict";
+
+this.EXPORTED_SYMBOLS = ["ReadingList"];
+
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+
+
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Preferences.jsm");
+Cu.import("resource://gre/modules/Log.jsm");
+
+
+(function() {
+  let parentLog = Log.repository.getLogger("readinglist");
+  parentLog.level = Preferences.get("browser.readinglist.logLevel", Log.Level.Warn);
+  Preferences.observe("browser.readinglist.logLevel", value => {
+    parentLog.level = value;
+  });
+  let formatter = new Log.BasicFormatter();
+  parentLog.addAppender(new Log.ConsoleAppender(formatter));
+  parentLog.addAppender(new Log.DumpAppender(formatter));
+})();
+
+let log = Log.repository.getLogger("readinglist.api");
+
+/**
+ * Represents an item in the Reading List.
+ * @constructor
+ * @see https://github.com/mozilla-services/readinglist/wiki/API-Design-proposal#data-model
+ */
+function Item(data) {
+  this._data = data;
+}
+
+Item.prototype = {
+  /**
+   * UUID
+   * @type {string}
+   */
+  get id() {
+    return this._data.id;
+  },
+
+  /**
+   * Server timestamp
+   * @type {string}
+   */
+  get lastModified() {
+    return this._data.last_modified;
+  },
+
+  /**
+   * @type {nsIURL}
+   */
+  get originalUrl() {
+    return Services.io.newURI(this._data.url, null, null);
+  },
+
+  /**
+   * @type {string}
+   */
+  get originalTitle() {
+    return this._data.title || "";
+  },
+
+  /**
+   * @type {nsIURL}
+   */
+  get resolvedUrl() {
+    return Services.io.newURI(this._data.resolved_url || this._data.url, null, null);
+  },
+
+  /**
+   * @type {string}
+   */
+  get resolvedTitle() {
+    return this._data.resolved_title || this.originalTitle;
+  },
+
+  /**
+   * @type {string}
+   */
+  get excerpt() {
+    return this._data.excerpt || "";
+  },
+
+  /**
+   * @type {ItemStates}
+   */
+  get state() {
+    return ReadingList.ItemStates[this._data.state] || ReadingList.ItemStates.OK;
+  },
+
+  /**
+   * @type {boolean}
+   */
+  get isFavorite() {
+    return !!this._data.favorite;
+  },
+
+  /**
+   * @type {boolean}
+   */
+  get isArticle() {
+    return !!this._data.is_article;
+  },
+
+  /**
+   * @type {number}
+   */
+  get wordCount() {
+    return this._data.word_count || 0;
+  },
+
+  /**
+   * @type {boolean}
+   */
+  get isUnread() {
+    return !!this._data.unread;
+  },
+
+  /**
+   * Device name
+   * @type {string}
+   */
+  get addedBy() {
+    return this._data.added_by;
+  },
+
+  /**
+   * @type {Date}
+   */
+  get addedOn() {
+    return new Date(this._data.added_on);
+  },
+
+  /**
+   * @type {Date}
+   */
+  get storedOn() {
+    return new Date(this._data.stored_on);
+  },
+
+  /**
+   * Device name
+   * @type {string}
+   */
+  get markedReadBy() {
+    return this._data.marked_read_by;
+  },
+
+  /**
+   * @type {Date}
+   */
+  get markedReadOn() {
+    return new date(this._data.marked_read_on);
+  },
+
+  /**
+   * @type {number}
+   */
+  get readPosition() {
+    return this._data.read_position;
+  },
+
+  // Data not specified by the current server API
+
+  /**
+   * Array of scraped or captured summary images for this page.
+   * TODO: Implement this.
+   * @type {[nsIURL]}
+   */
+  get images() {
+    return [];
+  },
+
+  /**
+   * Favicon for this site.
+   * @type {nsIURL}
+   * TODO: Generate moz-anno: URI for favicon.
+   */
+  get favicon() {
+    return null;
+  },
+
+  // Helpers
+
+  /**
+   * Alias for resolvedUrl.
+   * TODO: This url/resolvedUrl alias makes it feel like the server API hasn't got this right.
+   */
+  get url() {
+    return this.resolvedUrl;
+  },
+  /**
+   * Alias for resolvedTitle
+   */
+  get title() {
+    return this.resolvedTitle;
+  },
+
+  /**
+   * Domain portion of the URL, with prefixes stripped. For display purposes.
+   * @type {string}
+   */
+  get domain() {
+    let host = this.resolvedUrl.host;
+    if (host.startsWith("www.")) {
+      host = host.slice(4);
+    }
+    return host;
+  },
+
+  /**
+   * Convert this Item to a string representation.
+   */
+  toString() {
+    return `[Item url=${this.url.spec}]`;
+  },
+
+  /**
+   * Get the value that should be used for a JSON representation of this Item.
+   */
+  toJSON() {
+    return this._data;
+  },
+};
+
+
+let ItemStates = {
+  OK: Symbol("ok"),
+  ARCHIVED: Symbol("archived"),
+  DELETED: Symbol("deleted"),
+};
+
+
+this.ReadingList = {
+  Item: Item,
+  ItemStates: ItemStates,
+
+  _listeners: new Set(),
+  _items: [],
+
+  /**
+   * Initialize the ReadingList component.
+   */
+  _init() {
+    log.debug("Init");
+
+    // Initialize mock data
+    let mockData = JSON.parse(Preferences.get("browser.readinglist.mockData", "[]"));
+    for (let itemData of mockData) {
+      this._items.push(new Item(itemData));
+    }
+  },
+
+  /**
+   * Add an event listener.
+   * @param {object} listener - Listener object to start notifying.
+   */
+  addListener(listener) {
+    this._listeners.add(listener);
+  },
+
+  /**
+   * Remove a specified event listener.
+   * @param {object} listener - Listener object to stop notifying.
+   */
+  removeListener(listener) {
+    this._listeners.delete(listener);
+  },
+
+  /**
+   * Notify all registered event listeners of an event.
+   * @param {string} eventName - Event name, which will be used as a method name
+   *                             on listeners to call.
+   */
+  _notifyListeners(eventName, ...args) {
+    for (let listener of this._listeners) {
+      if (typeof listener[eventName] != "function") {
+        continue;
+      }
+
+      try {
+        listener[eventName](...args);
+      } catch (e) {
+        log.error(`Error calling listener.${eventName}`, e);
+      }
+    }
+  },
+
+  /**
+   * Fetch the number of items that match a set of given conditions.
+   * TODO: Implement filtering, sorting, etc. Needs backend storage work.
+   *
+   * @param {Object} conditions Object specifying a set of conditions for
+   *                            filtering items.
+   * @return {Promise}
+   * @resolves {number}
+   */
+  getNumItems(conditions = {unread: false}) {
+    return new Promise((resolve, reject) => {
+      resolve(this._items.length);
+    });
+  },
+
+  /**
+   * Fetch items matching a set of conditions, in a sorted list.
+   * TODO: Implement filtering, sorting, etc. Needs backend storage work.
+   *
+   * @return {Promise}
+   * @resolves {[Item]}
+   */
+  getItems(options = {sort: "addedOn", conditions: {unread: false}}) {
+    return new Promise((resolve, reject) => {
+      resolve([...this._items]);
+    });
+  },
+
+  /**
+   * Find an item based on its ID.
+   * TODO: Implement. Needs backend storage work.
+   *
+   * @return {Promise}
+   * @resolves {Item}
+   */
+  getItemByID(url) {
+    return new Promise((resolve, reject) => {
+      resolve(null);
+    });
+  },
+
+  /**
+   * Find an item based on its URL.
+   *
+   * TODO: Implement. Needs backend storage work.
+   * TODO: Does this match original or resolved URL, or both?
+   * TODO: Should this just be a generic findItem API?
+   *
+   * @return {Promise}
+   * @resolves {Item}
+   */
+  getItemByURL(url) {
+    return new Promise((resolve, reject) => {
+      resolve(null);
+    });
+  },
+};
+
+
+ReadingList._init();
diff --git a/browser/components/readinglist/jar.mn b/browser/components/readinglist/jar.mn
new file mode 100644
index 000000000000..d3be251a329e
--- /dev/null
+++ b/browser/components/readinglist/jar.mn
@@ -0,0 +1,7 @@
+# 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/readinglist/sidebar.xhtml
+  content/browser/readinglist/sidebar.js
diff --git a/browser/components/readinglist/moz.build b/browser/components/readinglist/moz.build
new file mode 100644
index 000000000000..0dfdf141706c
--- /dev/null
+++ b/browser/components/readinglist/moz.build
@@ -0,0 +1,15 @@
+# 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 += ['jar.mn']
+
+EXTRA_JS_MODULES.readinglist += [
+    'ReadingList.jsm',
+]
+
+TESTING_JS_MODULES += [
+    'test/ReadingListTestUtils.jsm',
+]
+
+BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
diff --git a/browser/components/readinglist/sidebar.js b/browser/components/readinglist/sidebar.js
new file mode 100644
index 000000000000..249a6707d3dd
--- /dev/null
+++ b/browser/components/readinglist/sidebar.js
@@ -0,0 +1,403 @@
+/* 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/. */
+
+"use strict";
+
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource:///modules/readinglist/ReadingList.jsm");
+
+let log = Cu.import("resource://gre/modules/Log.jsm", {})
+            .Log.repository.getLogger("readinglist.sidebar");
+
+
+let RLSidebar = {
+  /**
+   * Container element for all list item elements.
+   * @type {Element}
+   */
+  list: null,
+
+  /**
+   * <template> element used for constructing list item elements.
+   * @type {Element}
+   */
+  itemTemplate: null,
+
+  /**
+   * Map of ReadingList Item objects, keyed by their ID.
+   * @type {Map}
+   */
+  itemsById: new Map(),
+  /**
+   * Map of list item elements, keyed by their corresponding Item's ID.
+   * @type {Map}
+   */
+  itemNodesById: new Map(),
+
+  /**
+   * Initialize the sidebar UI.
+   */
+  init() {
+    log.debug("Initializing");
+
+    addEventListener("unload", () => this.uninit());
+
+    this.list = document.getElementById("list");
+    this.itemTemplate = document.getElementById("item-template");
+
+    this.list.addEventListener("click", event => this.onListClick(event));
+    this.list.addEventListener("mousemove", event => this.onListMouseMove(event));
+    this.list.addEventListener("keydown", event => this.onListKeyDown(event), true);
+
+    this.ensureListItems();
+    ReadingList.addListener(this);
+
+    let initEvent = new CustomEvent("Initialized", {bubbles: true});
+    document.documentElement.dispatchEvent(initEvent);
+  },
+
+  /**
+   * Un-initialize the sidebar UI.
+   */
+  uninit() {
+    log.debug("Shutting down");
+
+    ReadingList.removeListener(this);
+  },
+
+  /**
+   * Handle an item being added to the ReadingList.
+   * TODO: We may not want to show this new item right now.
+   * TODO: We should guard against the list growing here.
+   *
+   * @param {Readinglist.Item} item - Item that was added.
+   */
+  onItemAdded(item) {
+    log.trace(`onItemAdded: ${item}`);
+
+    let itemNode = document.importNode(this.itemTemplate.content, true).firstElementChild;
+    this.updateItem(item, itemNode);
+    this.list.appendChild(itemNode);
+    this.itemNodesById.set(item.id, itemNode);
+    this.itemsById.set(item.id, item);
+  },
+
+  /**
+   * Handle an item being deleted from the ReadingList.
+   * @param {ReadingList.Item} item - Item that was deleted.
+   */
+  onItemDeleted(item) {
+    log.trace(`onItemDeleted: ${item}`);
+
+    let itemNode = this.itemNodesById.get(item.id);
+    itemNode.remove();
+    this.itemNodesById.delete(item.id);
+    this.itemsById.delete(item.id);
+    // TODO: ensureListItems doesn't yet cope with needing to add one item.
+    //this.ensureListItems();
+  },
+
+  /**
+   * Handle an item in the ReadingList having any of its properties changed.
+   * @param {ReadingList.Item} item - Item that was updated.
+   */
+  onItemUpdated(item) {
+    log.trace(`onItemUpdated: ${item}`);
+
+    let itemNode = this.itemNodesById.get(item.id);
+    if (!itemNode)
+      return;
+
+    this.updateItem(item, itemNode);
+  },
+
+  /**
+   * Update the element representing an item, ensuring it's in sync with the
+   * underlying data.
+   * @param {ReadingList.Item} item - Item to use as a source.
+   * @param {Element} itemNode - Element to update.
+   */
+  updateItem(item, itemNode) {
+    itemNode.setAttribute("id", "item-" + item.id);
+    itemNode.setAttribute("title", `${item.title}\n${item.url.spec}`);
+
+    itemNode.querySelector(".item-title").textContent = item.title;
+    itemNode.querySelector(".item-domain").textContent = item.domain;
+  },
+
+  /**
+   * Ensure that the list is populated with the correct items.
+   */
+  ensureListItems() {
+    ReadingList.getItems().then(items => {
+      for (let item of items) {
+        // TODO: Should be batch inserting via DocumentFragment
+        try {
+          this.onItemAdded(item);
+        } catch (e) {
+          log.warn("Error adding item", e);
+        }
+      }
+    });
+  },
+
+  /**
+   * Get the number of items currently displayed in the list.
+   * @type {number}
+   */
+  get numItems() {
+    return this.list.childElementCount;
+  },
+
+  /**
+   * The currently active element in the list.
+   * @type {Element}
+   */
+  get activeItem() {
+    return document.querySelector("#list > .item.active");
+  },
+
+  set activeItem(node) {
+    if (node && node.parentNode != this.list) {
+      log.error(`Unable to set activeItem to invalid node ${node}`);
+      return;
+    }
+
+    log.debug(`Setting activeItem: ${node ? node.id : null}`);
+
+    if (node) {
+      if (!node.classList.contains("selected")) {
+        this.selectedItem = node;
+      }
+
+      if (node.classList.contains("active")) {
+        return;
+      }
+    }
+
+    let prevItem = document.querySelector("#list > .item.active");
+    if (prevItem) {
+      prevItem.classList.remove("active");
+    }
+
+    if (node) {
+      node.classList.add("active");
+    }
+
+    let event = new CustomEvent("ActiveItemChanged", {bubbles: true});
+    this.list.dispatchEvent(event);
+  },
+
+  /**
+   * The currently selected item in the list.
+   * @type {Element}
+   */
+  get selectedItem() {
+    return document.querySelector("#list > .item.selected");
+  },
+
+  set selectedItem(node) {
+    if (node && node.parentNode != this.list) {
+      log.error(`Unable to set selectedItem to invalid node ${node}`);
+      return;
+    }
+
+    log.debug(`Setting activeItem: ${node ? node.id : null}`);
+
+    let prevItem = document.querySelector("#list > .item.selected");
+    if (prevItem) {
+      prevItem.classList.remove("selected");
+    }
+
+    if (node) {
+      node.classList.add("selected");
+      let itemId = this.getItemIdFromNode(node);
+      this.list.setAttribute("aria-activedescendant", "item-" + itemId);
+    } else {
+      this.list.removeAttribute("aria-activedescendant");
+    }
+
+    let event = new CustomEvent("SelectedItemChanged", {bubbles: true});
+    this.list.dispatchEvent(event);
+  },
+
+  /**
+   * The index of the currently selected item in the list.
+   * @type {number}
+   */
+  get selectedIndex() {
+    for (let i = 0; i < this.numItems; i++) {
+      let item = this.list.children.item(i);
+      if (!item) {
+        break;
+      }
+      if (item.classList.contains("selected")) {
+        return i;
+      }
+    }
+    return -1;
+  },
+
+  set selectedIndex(index) {
+    log.debug(`Setting selectedIndex: ${index}`);
+
+    if (index == -1) {
+      this.selectedItem = null;
+      return;
+    }
+
+    let item = this.list.children.item(index);
+    if (!item) {
+      log.warn(`Unable to set selectedIndex to invalid index ${index}`);
+      return;
+    }
+    this.selectedItem = item;
+  },
+
+  /**
+   * Open a given URL. The event is used to determine where it should be opened
+   * (current tab, new tab, new window).
+   * @param {string} url - URL to open.
+   * @param {Event} event - KeyEvent or MouseEvent that triggered this action.
+   */
+  openURL(url, event) {
+    // TODO: Disabled while working on the listbox mechanics.
+    log.debug(`Opening page ${url}`);
+    return;
+
+    let mainWindow = window.QueryInterface(Ci.nsIInterfaceRequestor)
+                           .getInterface(Ci.nsIWebNavigation)
+                           .QueryInterface(Ci.nsIDocShellTreeItem)
+                           .rootTreeItem
+                           .QueryInterface(Ci.nsIInterfaceRequestor)
+                           .getInterface(Ci.nsIDOMWindow);
+    mainWindow.openUILink(url, event);
+  },
+
+  /**
+   * Get the ID of the Item associated with a given list item element.
+   * @param {element} node - List item element to get an ID for.
+   * @return {string} Assocated Item ID.
+   */
+  getItemIdFromNode(node) {
+    let id = node.getAttribute("id");
+    if (id && id.startsWith("item-")) {
+      return id.slice(5);
+    }
+
+    return null;
+  },
+
+  /**
+   * Get the Item associated with a given list item element.
+   * @param {element} node - List item element to get an Item for.
+   * @return {string} Associated Item.
+   */
+  getItemFromNode(node) {
+    let itemId = this.getItemIdFromNode(node);
+    if (!itemId) {
+      return null;
+    }
+
+    return this.itemsById.get(itemId);
+  },
+
+  /**
+   * Open the active item in the list.
+   * @param {Event} event - Event triggering this.
+   */
+  openActiveItem(event) {
+    let itemNode = this.activeItem;
+    if (!itemNode) {
+      return;
+    }
+
+    let item = this.getItemFromNode(itemNode);
+    this.openURL(item.url.spec, event);
+  },
+
+  /**
+   * Find the parent item element, from a given child element.
+   * @param {Element} node - Child element.
+   * @return {Element} Element for the item, or null if not found.
+   */
+  findParentItemNode(node) {
+    while (node && node != this.list && node != document.documentElement &&
+           !node.classList.contains("item")) {
+      node = node.parentNode;
+    }
+
+    if (node != this.list && node != document.documentElement) {
+      return node;
+    }
+
+    return null;
+  },
+
+  /**
+   * Handle a click event on the list box.
+   * @param {Event} event - Triggering event.
+   */
+  onListClick(event) {
+    let itemNode = this.findParentItemNode(event.target);
+    if (!itemNode)
+      return;
+
+    this.activeItem = itemNode;
+    this.openActiveItem(event);
+  },
+
+  /**
+   * Handle a mousemove event over the list box.
+   * @param {Event} event - Triggering event.
+   */
+  onListMouseMove(event) {
+    let itemNode = this.findParentItemNode(event.target);
+    if (!itemNode)
+      return;
+
+    this.selectedItem = itemNode;
+  },
+
+  /**
+   * Handle a keydown event on the list box.
+   * @param {Event} event - Triggering event.
+   */
+  onListKeyDown(event) {
+    if (event.keyCode == KeyEvent.DOM_VK_DOWN) {
+      // TODO: Refactor this so we pass a direction to a generic method.
+      // See autocomplete.xml's getNextIndex
+      event.preventDefault();
+      let index = this.selectedIndex + 1;
+      if (index >= this.numItems) {
+        index = 0;
+      }
+
+      this.selectedIndex = index;
+      this.selectedItem.focus();
+    } else if (event.keyCode == KeyEvent.DOM_VK_UP) {
+      event.preventDefault();
+
+      let index = this.selectedIndex - 1;
+      if (index < 0) {
+        index = this.numItems - 1;
+      }
+
+      this.selectedIndex = index;
+      this.selectedItem.focus();
+    } else if (event.keyCode == KeyEvent.DOM_VK_RETURN) {
+      let selectedItem = this.selectedItem;
+      if (selectedItem) {
+        this.activeItem = this.selectedItem;
+        this.openActiveItem(event);
+      }
+    }
+  },
+};
+
+
+addEventListener("DOMContentLoaded", () => RLSidebar.init());
diff --git a/browser/components/readinglist/sidebar.xhtml b/browser/components/readinglist/sidebar.xhtml
new file mode 100644
index 000000000000..12f0342eaff7
--- /dev/null
+++ b/browser/components/readinglist/sidebar.xhtml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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 [
+  <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
+  %browserDTD;
+]>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <script src="chrome://browser/content/readinglist/sidebar.js" type="application/javascript;version=1.8"></script>
+    <link rel="stylesheet" type="text/css" media="all" href="chrome://browser/skin/readinglist/sidebar.css"/>
+    <!-- <title>&readingList.label;</title> -->
+  </head>
+
+  <body role="application">
+    <template id="item-template">
+      <div class="item" role="option" tabindex="-1">
+        <div class="item-thumb-container"></div>
+        <div class="item-summary-container">
+          <div class="item-title"></div>
+          <div class="item-domain"></div>
+        </div>
+      </div>
+    </template>
+
+    <div id="list" role="listbox" tabindex="1"></div>
+  </body>
+</html>
diff --git a/browser/components/readinglist/test/ReadingListTestUtils.jsm b/browser/components/readinglist/test/ReadingListTestUtils.jsm
new file mode 100644
index 000000000000..775b6e80fe8a
--- /dev/null
+++ b/browser/components/readinglist/test/ReadingListTestUtils.jsm
@@ -0,0 +1,159 @@
+"use strict";
+
+this.EXPORTED_SYMBOLS = [
+  "ReadingListTestUtils",
+];
+
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/Preferences.jsm");
+Cu.import("resource:///modules/readinglist/ReadingList.jsm");
+
+
+/** Preference name controlling whether the ReadingList feature is enabled/disabled. */
+const PREF_RL_ENABLED = "browser.readinglist.enabled";
+
+
+/**
+ * Utilities for testing the ReadingList sidebar.
+ */
+function SidebarUtils(window, assert) {
+  this.window = window;
+  this.Assert = assert;
+}
+
+SidebarUtils.prototype = {
+  /**
+   * Reference to the RLSidebar object controlling the ReadingList sidebar UI.
+   * @type {object}
+   */
+  get RLSidebar() {
+    return this.window.SidebarUI.browser.contentWindow.RLSidebar;
+  },
+
+  /**
+   * Reference to the list container element in the sidebar.
+   * @type {Element}
+   */
+  get list() {
+    return this.RLSidebar.list;
+  },
+
+  /**
+   * Check that the number of elements in the list matches the expected count.
+   * @param {number} count - Expected number of items.
+   */
+  expectNumItems(count) {
+    this.Assert.equal(this.list.childElementCount, count,
+                      "Should have expected number of items in the sidebar list");
+  },
+
+  /**
+   * Check all items in the sidebar list, ensuring the DOM matches the data.
+   */
+  checkAllItems() {
+    for (let itemNode of this.list.children) {
+      this.checkSidebarItem(itemNode);
+    }
+  },
+
+  /**
+   * Run a series of sanity checks for an element in the list associated with
+   * an Item, ensuring the DOM matches the data.
+   */
+  checkItem(node) {
+    let item = this.RLSidebar.getItemFromNode(node);
+
+    this.Assert.ok(node.classList.contains("item"),
+                   "Node should have .item class");
+    this.Assert.equal(node.id, "item-" + item.id,
+                      "Node should have correct ID");
+    this.Assert.equal(node.getAttribute("title"), item.title + "\n" + item.url.spec,
+                      "Node should have correct title attribute");
+    this.Assert.equal(node.querySelector(".item-title").textContent, item.title,
+                      "Node's title element's text should match item title");
+    this.Assert.equal(node.querySelector(".item-domain").textContent, item.domain,
+                      "Node's domain element's text should match item title");
+  },
+
+  expectSelectedId(itemId) {
+    let selectedItem = this.RLSidebar.selectedItem;
+    if (itemId == null) {
+      this.Assert.equal(selectedItem, null, "Should have no selected item");
+    } else {
+      this.Assert.notEqual(selectedItem, null, "selectedItem should not be null");
+      let selectedId = this.RLSidebar.getItemIdFromNode(selectedItem);
+      this.Assert.equal(itemId, selectedId, "Should have currect item selected");
+    }
+  },
+
+  expectActiveId(itemId) {
+    let activeItem = this.RLSidebar.activeItem;
+    if (itemId == null) {
+      this.Assert.equal(activeItem, null, "Should have no active item");
+    } else {
+      this.Assert.notEqual(activeItem, null, "activeItem should not be null");
+      let activeId = this.RLSidebar.getItemIdFromNode(activeItem);
+      this.Assert.equal(itemId, activeId, "Should have correct item active");
+    }
+  },
+};
+
+
+/**
+ * Utilities for testing the ReadingList.
+ */
+this.ReadingListTestUtils = {
+  /**
+   * Whether the ReadingList feature is enabled or not.
+   * @type {boolean}
+   */
+  get enabled() {
+    return Preferences.get(PREF_RL_ENABLED, false);
+  },
+  set enabled(value) {
+    Preferences.set(PREF_RL_ENABLED, !!value);
+  },
+
+  /**
+   * Utilities for testing the ReadingList sidebar.
+   */
+  SidebarUtils: SidebarUtils,
+
+  /**
+   * Synthetically add an item to the ReadingList.
+   * @param {object|[object]} data - Object or array of objects to pass to the
+   *                                 Item constructor.
+   * @return {Promise} Promise that gets fulfilled with the item or items added.
+   */
+  addItem(data) {
+    if (Array.isArray(data)) {
+      let promises = [];
+      for (let itemData of data) {
+        promises.push(this.addItem(itemData));
+      }
+      return Promise.all(promises);
+    }
+
+    return new Promise(resolve => {
+      let item = new ReadingList.Item(data);
+      ReadingList._items.push(item);
+      ReadingList._notifyListeners("onItemAdded", item);
+      resolve(item);
+    });
+  },
+
+  /**
+   * Cleanup all data, resetting to a blank state.
+   */
+  cleanup() {
+    return new Promise(resolve => {
+      ReadingList._items = [];
+      ReadingList._listeners.clear();
+      Preferences.reset(PREF_RL_ENABLED);
+      resolve();
+    });
+  },
+};
diff --git a/browser/components/readinglist/test/browser/browser.ini b/browser/components/readinglist/test/browser/browser.ini
new file mode 100644
index 000000000000..ffaab5619b1a
--- /dev/null
+++ b/browser/components/readinglist/test/browser/browser.ini
@@ -0,0 +1,7 @@
+[DEFAULT]
+support-files =
+  head.js
+
+[browser_ui_enable_disable.js]
+[browser_sidebar_list.js]
+[browser_sidebar_mouse_nav.js]
diff --git a/browser/components/readinglist/test/browser/browser_sidebar_list.js b/browser/components/readinglist/test/browser/browser_sidebar_list.js
new file mode 100644
index 000000000000..8826b7c9b6d4
--- /dev/null
+++ b/browser/components/readinglist/test/browser/browser_sidebar_list.js
@@ -0,0 +1,53 @@
+/**
+ * This tests the basic functionality of the sidebar to list items.
+ */
+
+add_task(function*() {
+  registerCleanupFunction(function*() {
+    ReadingListUI.hideSidebar();
+    yield RLUtils.cleanup();
+  });
+
+  RLUtils.enabled = true;
+
+  yield ReadingListUI.showSidebar();
+  let RLSidebar = RLSidebarUtils.RLSidebar;
+  let sidebarDoc = SidebarUI.browser.contentDocument;
+  Assert.equal(RLSidebar.numItems, 0, "Should start with no items");
+  Assert.equal(RLSidebar.activeItem, null, "Should start with no active item");
+  Assert.equal(RLSidebar.activeItem, null, "Should start with no selected item");
+
+  info("Adding first item");
+  yield RLUtils.addItem({
+    id: "c3502a49-bcef-4a94-b222-d4834463de33",
+    url: "http://example.com/article1",
+    title: "Article 1",
+  });
+  RLSidebarUtils.expectNumItems(1);
+
+  info("Adding more items");
+  yield RLUtils.addItem([{
+    id: "e054f5b7-1f4f-463f-bb96-d64c02448c31",
+    url: "http://example.com/article2",
+    title: "Article 2",
+  }, {
+    id: "4207230b-2364-4e97-9587-01312b0ce4e6",
+    url: "http://example.com/article3",
+    title: "Article 3",
+  }]);
+  RLSidebarUtils.expectNumItems(3);
+
+  info("Closing sidebar");
+  ReadingListUI.hideSidebar();
+
+  info("Adding another item");
+  yield RLUtils.addItem({
+    id: "dae0e855-607e-4df3-b27f-73a5e35c94fe",
+    url: "http://example.com/article4",
+    title: "Article 4",
+  });
+
+  info("Re-eopning sidebar");
+  yield ReadingListUI.showSidebar();
+  RLSidebarUtils.expectNumItems(4);
+});
diff --git a/browser/components/readinglist/test/browser/browser_sidebar_mouse_nav.js b/browser/components/readinglist/test/browser/browser_sidebar_mouse_nav.js
new file mode 100644
index 000000000000..aef3173b3c22
--- /dev/null
+++ b/browser/components/readinglist/test/browser/browser_sidebar_mouse_nav.js
@@ -0,0 +1,82 @@
+/**
+ * Test mouse navigation for selecting items in the sidebar.
+ */
+
+
+function mouseInteraction(mouseEvent, responseEvent, itemNode) {
+  let eventPromise = BrowserUITestUtils.waitForEvent(RLSidebarUtils.list, responseEvent);
+  let details = {};
+  if (mouseEvent != "click") {
+    details.type = mouseEvent;
+  }
+
+  EventUtils.synthesizeMouseAtCenter(itemNode, details, itemNode.ownerDocument.defaultView);
+  return eventPromise;
+}
+
+add_task(function*() {
+  registerCleanupFunction(function*() {
+    ReadingListUI.hideSidebar();
+    yield RLUtils.cleanup();
+  });
+
+  RLUtils.enabled = true;
+
+  let itemData = [{
+    id: "00bd24c7-3629-40b0-acde-37aa81768735",
+    url: "http://example.com/article1",
+    title: "Article 1",
+  }, {
+    id: "28bf7f19-cf94-4ceb-876a-ac1878342e0d",
+    url: "http://example.com/article2",
+    title: "Article 2",
+  }, {
+    id: "7e5064ea-f45d-4fc7-8d8c-c067b7781e78",
+    url: "http://example.com/article3",
+    title: "Article 3",
+  }, {
+    id: "8e72a472-8db8-4904-ba39-9672f029e2d0",
+    url: "http://example.com/article4",
+    title: "Article 4",
+  }, {
+    id: "8d332744-37bc-4a1a-a26b-e9953b9f7d91",
+    url: "http://example.com/article5",
+    title: "Article 5",
+  }];
+  yield RLUtils.addItem(itemData);
+
+  yield ReadingListUI.showSidebar();
+  RLSidebarUtils.expectNumItems(5);
+  RLSidebarUtils.expectSelectedId(null);
+  RLSidebarUtils.expectActiveId(null);
+
+  info("Mouse move over item 1");
+  yield mouseInteraction("mousemove", "SelectedItemChanged", RLSidebarUtils.list.children[0]);
+  RLSidebarUtils.expectSelectedId(itemData[0].id);
+  RLSidebarUtils.expectActiveId(null);
+
+  info("Mouse move over item 2");
+  yield mouseInteraction("mousemove", "SelectedItemChanged", RLSidebarUtils.list.children[1]);
+  RLSidebarUtils.expectSelectedId(itemData[1].id);
+  RLSidebarUtils.expectActiveId(null);
+
+  info("Mouse move over item 5");
+  yield mouseInteraction("mousemove", "SelectedItemChanged", RLSidebarUtils.list.children[4]);
+  RLSidebarUtils.expectSelectedId(itemData[4].id);
+  RLSidebarUtils.expectActiveId(null);
+
+  info("Mouse move over item 1 again");
+  yield mouseInteraction("mousemove", "SelectedItemChanged", RLSidebarUtils.list.children[0]);
+  RLSidebarUtils.expectSelectedId(itemData[0].id);
+  RLSidebarUtils.expectActiveId(null);
+
+  info("Mouse click on item 1");
+  yield mouseInteraction("click", "ActiveItemChanged", RLSidebarUtils.list.children[0]);
+  RLSidebarUtils.expectSelectedId(itemData[0].id);
+  RLSidebarUtils.expectActiveId(itemData[0].id);
+
+  info("Mouse click on item 3");
+  yield mouseInteraction("click", "ActiveItemChanged", RLSidebarUtils.list.children[2]);
+  RLSidebarUtils.expectSelectedId(itemData[2].id);
+  RLSidebarUtils.expectActiveId(itemData[2].id);
+});
diff --git a/browser/components/readinglist/test/browser/browser_ui_enable_disable.js b/browser/components/readinglist/test/browser/browser_ui_enable_disable.js
new file mode 100644
index 000000000000..797286e8154f
--- /dev/null
+++ b/browser/components/readinglist/test/browser/browser_ui_enable_disable.js
@@ -0,0 +1,49 @@
+/**
+ * Test enabling/disabling the entire ReadingList feature via the
+ * browser.readinglist.enabled preference.
+ */
+
+function checkRLState() {
+  let enabled = RLUtils.enabled;
+  info("Checking ReadingList UI is " + (enabled ? "enabled" : "disabled"));
+
+  let sidebarBroadcaster = document.getElementById("readingListSidebar");
+  let sidebarMenuitem = document.getElementById("menu_readingListSidebar");
+
+  if (enabled) {
+    Assert.notEqual(sidebarBroadcaster.getAttribute("hidden"), "true",
+                    "Sidebar broadcaster should not be hidden");
+    Assert.notEqual(sidebarMenuitem.getAttribute("hidden"), "true",
+                    "Sidebar menuitem should be visible");
+  } else {
+    Assert.equal(sidebarBroadcaster.getAttribute("hidden"), "true",
+                 "Sidebar broadcaster should be hidden");
+    Assert.equal(sidebarMenuitem.getAttribute("hidden"), "true",
+                 "Sidebar menuitem should be hidden");
+    Assert.equal(ReadingListUI.isSidebarOpen, false,
+                 "ReadingListUI should not think sidebar is open");
+  }
+
+  if (!enabled) {
+    Assert.equal(SidebarUI.isOpen, false, "Sidebar should not be open");
+  }
+}
+
+add_task(function*() {
+  info("Start with ReadingList disabled");
+  RLUtils.enabled = false;
+  checkRLState();
+  info("Enabling ReadingList");
+  RLUtils.enabled = true;
+  checkRLState();
+
+  info("Opening ReadingList sidebar");
+  yield ReadingListUI.showSidebar();
+  Assert.ok(SidebarUI.isOpen, "Sidebar should be open");
+  Assert.equal(SidebarUI.currentID, "readingListSidebar", "Sidebar should have ReadingList loaded");
+
+  info("Disabling ReadingList");
+  RLUtils.enabled = false;
+  Assert.ok(!SidebarUI.isOpen, "Sidebar should be closed");
+  checkRLState();
+});
diff --git a/browser/components/readinglist/test/browser/head.js b/browser/components/readinglist/test/browser/head.js
new file mode 100644
index 000000000000..113622d82652
--- /dev/null
+++ b/browser/components/readinglist/test/browser/head.js
@@ -0,0 +1,15 @@
+XPCOMUtils.defineLazyModuleGetter(this, "ReadingList",
+                                  "resource:///modules/readinglist/ReadingList.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "ReadingListTestUtils",
+                                  "resource://testing-common/ReadingListTestUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "BrowserUITestUtils",
+                                  "resource://testing-common/BrowserUITestUtils.jsm");
+
+
+XPCOMUtils.defineLazyGetter(this, "RLUtils", () => {
+  return ReadingListTestUtils;
+});
+
+XPCOMUtils.defineLazyGetter(this, "RLSidebarUtils", () => {
+  return new RLUtils.SidebarUtils(window, Assert);
+});
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 237e23fe6fb4..5fbc45478a22 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -838,5 +838,7 @@ just addresses the organization to follow, e.g. "This site is run by " -->
 <!ENTITY processHang.terminateProcess.label       "Kill Web Process">
 <!ENTITY processHang.terminateProcess.accessKey   "K">
 
+<!ENTITY readingList.label                        "Reading List">
+<!ENTITY readingList.sidebar.commandKey           "R">
 <!ENTITY emeLearnMoreContextMenu.label            "Learn more about DRM…">
 <!ENTITY emeLearnMoreContextMenu.accesskey        "D">
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index 7720857eca88..e41f0a2ea401 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -91,6 +91,7 @@ browser.jar:
   skin/classic/browser/tab-crashed.svg                      (../shared/incontent-icons/tab-crashed.svg)
   skin/classic/browser/welcome-back.svg                     (../shared/incontent-icons/welcome-back.svg)
   skin/classic/browser/reader-mode-16.png             (../shared/reader/reader-mode-16.png)
+  skin/classic/browser/readinglist/sidebar.css        (../shared/readinglist/sidebar.css)
   skin/classic/browser/webRTC-shareDevice-16.png
   skin/classic/browser/webRTC-shareDevice-64.png
   skin/classic/browser/webRTC-sharingDevice-16.png    (../shared/webrtc/webRTC-sharingDevice-16.png)
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index ca58b7a9672a..d77f49deb8b3 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -142,6 +142,7 @@ browser.jar:
   skin/classic/browser/welcome-back.svg               (../shared/incontent-icons/welcome-back.svg)
   skin/classic/browser/reader-mode-16.png             (../shared/reader/reader-mode-16.png)
   skin/classic/browser/reader-mode-16@2x.png          (../shared/reader/reader-mode-16@2x.png)
+  skin/classic/browser/readinglist/sidebar.css        (../shared/readinglist/sidebar.css)
   skin/classic/browser/webRTC-shareDevice-16.png
   skin/classic/browser/webRTC-shareDevice-16@2x.png
   skin/classic/browser/webRTC-shareDevice-64.png
diff --git a/browser/themes/shared/readinglist/sidebar.css b/browser/themes/shared/readinglist/sidebar.css
new file mode 100644
index 000000000000..b8ce94d9396d
--- /dev/null
+++ b/browser/themes/shared/readinglist/sidebar.css
@@ -0,0 +1,72 @@
+/* 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/. */
+
+:root, body {
+  height: 100%;
+  overflow-x: hidden;
+}
+
+body {
+  margin: 0;
+  font: message-box;
+  background: #F8F7F8;
+  color: #333333;
+  -moz-user-select: none;
+  overflow: hidden;
+}
+
+#list {
+  height: 100%;
+  overflow-x: auto;
+}
+
+.item {
+  display: flex;
+  flex-flow: row;
+  cursor: pointer;
+  padding: 6px;
+}
+
+.item.active {
+  background: #FEFEFE;
+}
+
+.item.selected {
+  background: #FDFDFD;
+}
+
+.item-thumb-container {
+  min-width: 64px;
+  max-width: 64px;
+  min-height: 40px;
+  max-height: 40px;
+  background: #EBEBEB;
+  border: 1px solid white;
+  box-shadow: 0px 1px 2px rgba(0,0,0,.35);
+  margin: 5px;
+}
+
+.item-summary-container {
+  display: flex;
+  flex-flow: column;
+  -moz-padding-start: 4px;
+  overflow: hidden;
+}
+
+.item-title {
+  overflow: hidden;
+  height: 2.8em;
+}
+
+.item-domain {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  max-height: 1.4em;
+  color: #0095DD;
+}
+
+.item:hover .item-domain {
+  color: #008ACB;
+}
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index 307dfa4c0e6d..d98485765c4f 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -110,6 +110,7 @@ browser.jar:
         skin/classic/browser/tab-crashed.svg                         (../shared/incontent-icons/tab-crashed.svg)
         skin/classic/browser/welcome-back.svg                        (../shared/incontent-icons/welcome-back.svg)
         skin/classic/browser/reader-mode-16.png                      (../shared/reader/reader-mode-16.png)
+        skin/classic/browser/readinglist/sidebar.css                 (../shared/readinglist/sidebar.css)
         skin/classic/browser/notification-pluginNormal.png           (../shared/plugins/notification-pluginNormal.png)
         skin/classic/browser/notification-pluginAlert.png            (../shared/plugins/notification-pluginAlert.png)
         skin/classic/browser/notification-pluginBlocked.png          (../shared/plugins/notification-pluginBlocked.png)
@@ -575,6 +576,7 @@ browser.jar:
         skin/classic/aero/browser/tab-crashed.svg                   (../shared/incontent-icons/tab-crashed.svg)
         skin/classic/aero/browser/welcome-back.svg                  (../shared/incontent-icons/welcome-back.svg)
         skin/classic/aero/browser/reader-mode-16.png                (../shared/reader/reader-mode-16.png)
+        skin/classic/aero/browser/readinglist/sidebar.css           (../shared/readinglist/sidebar.css)
         skin/classic/aero/browser/notification-pluginNormal.png     (../shared/plugins/notification-pluginNormal.png)
         skin/classic/aero/browser/notification-pluginAlert.png      (../shared/plugins/notification-pluginAlert.png)
         skin/classic/aero/browser/notification-pluginBlocked.png    (../shared/plugins/notification-pluginBlocked.png)

From 178ece0b06fb0cf94ec383aff0bc361a963ac8b5 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Thu, 19 Feb 2015 11:09:24 +0100
Subject: [PATCH 03/18] Backed out changeset 9b07a29dcbdd (bug 1123517)

---
 browser/app/profile/firefox.js                |   3 -
 browser/base/content/browser-menubar.inc      |   5 -
 browser/base/content/browser-readinglist.js   |  68 ---
 browser/base/content/browser-sets.inc         |  10 -
 browser/base/content/browser.js               |   6 -
 browser/base/content/browser.xul              |   2 +-
 .../base/content/test/BrowserUITestUtils.jsm  |  70 ---
 browser/base/moz.build                        |   4 -
 .../test/browser_988072_sidebar_events.js     |  10 +-
 browser/components/moz.build                  |   1 -
 .../components/readinglist/ReadingList.jsm    | 356 ----------------
 browser/components/readinglist/jar.mn         |   7 -
 browser/components/readinglist/moz.build      |  15 -
 browser/components/readinglist/sidebar.js     | 403 ------------------
 browser/components/readinglist/sidebar.xhtml  |  30 --
 .../readinglist/test/ReadingListTestUtils.jsm | 159 -------
 .../readinglist/test/browser/browser.ini      |   7 -
 .../test/browser/browser_sidebar_list.js      |  53 ---
 .../test/browser/browser_sidebar_mouse_nav.js |  82 ----
 .../test/browser/browser_ui_enable_disable.js |  49 ---
 .../readinglist/test/browser/head.js          |  15 -
 .../locales/en-US/chrome/browser/browser.dtd  |   2 -
 browser/themes/linux/jar.mn                   |   1 -
 browser/themes/osx/jar.mn                     |   1 -
 browser/themes/shared/readinglist/sidebar.css |  72 ----
 browser/themes/windows/jar.mn                 |   2 -
 26 files changed, 4 insertions(+), 1429 deletions(-)
 delete mode 100644 browser/base/content/browser-readinglist.js
 delete mode 100644 browser/base/content/test/BrowserUITestUtils.jsm
 delete mode 100644 browser/components/readinglist/ReadingList.jsm
 delete mode 100644 browser/components/readinglist/jar.mn
 delete mode 100644 browser/components/readinglist/moz.build
 delete mode 100644 browser/components/readinglist/sidebar.js
 delete mode 100644 browser/components/readinglist/sidebar.xhtml
 delete mode 100644 browser/components/readinglist/test/ReadingListTestUtils.jsm
 delete mode 100644 browser/components/readinglist/test/browser/browser.ini
 delete mode 100644 browser/components/readinglist/test/browser/browser_sidebar_list.js
 delete mode 100644 browser/components/readinglist/test/browser/browser_sidebar_mouse_nav.js
 delete mode 100644 browser/components/readinglist/test/browser/browser_ui_enable_disable.js
 delete mode 100644 browser/components/readinglist/test/browser/head.js
 delete mode 100644 browser/themes/shared/readinglist/sidebar.css

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index de1682100839..e7786767fe99 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1856,6 +1856,3 @@ pref("dom.ipc.reportProcessHangs", true);
 
 // Disable reader mode by default.
 pref("reader.parse-on-load.enabled", false);
-
-// Disable ReadingList by default.
-pref("browser.readinglist.enabled", false);
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index 02f1d8b49c03..7967500fb282 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -223,11 +223,6 @@
                               key="key_gotoHistory"
                               observes="viewHistorySidebar"
                               label="&historyButton.label;"/>
-                    <menuitem id="menu_readingListSidebar"
-                              key="key_readingListSidebar"
-                              observes="readingListSidebar"
-                              label="&readingList.label;"/>
-
                     <!-- Service providers with sidebars are inserted between these two menuseperators -->
                     <menuseparator hidden="true"/>
                     <menuseparator class="social-provider-menu" hidden="true"/>
diff --git a/browser/base/content/browser-readinglist.js b/browser/base/content/browser-readinglist.js
deleted file mode 100644
index 7cce09623828..000000000000
--- a/browser/base/content/browser-readinglist.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-# 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 ReadingListUI = {
-  /**
-   * Initialize the ReadingList UI.
-   */
-  init() {
-    Preferences.observe("browser.readinglist.enabled", this.updateUI, this);
-    this.updateUI();
-  },
-
-  /**
-   * Un-initialize the ReadingList UI.
-   */
-  uninit() {
-    Preferences.ignore("browser.readinglist.enabled", this.updateUI, this);
-  },
-
-  /**
-   * Whether the ReadingList feature is enabled or not.
-   * @type {boolean}
-   */
-  get enabled() {
-    return Preferences.get("browser.readinglist.enabled", false);
-  },
-
-  /**
-   * Whether the ReadingList sidebar is currently open or not.
-   * @type {boolean}
-   */
-  get isSidebarOpen() {
-    return SidebarUI.isOpen && SidebarUI.currentID == "readingListSidebar";
-  },
-
-  /**
-   * Update the UI status, ensuring the UI is shown or hidden depending on
-   * whether the feature is enabled or not.
-   */
-  updateUI() {
-    let enabled = this.enabled;
-    if (!enabled) {
-      this.hideSidebar();
-    }
-
-    document.getElementById("readingListSidebar").setAttribute("hidden", !enabled);
-  },
-
-  /**
-   * Show the ReadingList sidebar.
-   * @return {Promise}
-   */
-  showSidebar() {
-    return SidebarUI.show("readingListSidebar");
-  },
-
-  /**
-   * Hide the ReadingList sidebar, if it is currently shown.
-   */
-  hideSidebar() {
-    if (this.isSidebarOpen) {
-      SidebarUI.hide();
-    }
-  },
-};
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 681a7dfa1c1a..3e293dc4c0d4 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -148,11 +148,6 @@
                  sidebarurl="chrome://browser/content/history/history-panel.xul"
                  oncommand="SidebarUI.toggle('viewHistorySidebar');"/>
 
-    <broadcaster id="readingListSidebar" hidden="true" autoCheck="false"
-                 sidebartitle="&readingList.label;" type="checkbox" group="sidebar"
-                 sidebarurl="chrome://browser/content/readinglist/sidebar.xhtml"
-                 oncommand="SidebarUI.toggle('readingListSidebar');"/>
-
     <broadcaster id="viewWebPanelsSidebar" autoCheck="false"
                  type="checkbox" group="sidebar" sidebarurl="chrome://browser/content/web-panels.xul"
                  oncommand="SidebarUI.toggle('viewWebPanelsSidebar');"/>
@@ -423,11 +418,6 @@
 #endif
          command="viewHistorySidebar"/>
 
-    <key id="key_readingListSidebar"
-         key="&readingList.sidebar.commandKey;"
-         modifiers="accel,alt"
-         command="readingListSidebar"/>
-
     <key id="key_fullZoomReduce"  key="&fullZoomReduceCmd.commandkey;"   command="cmd_fullZoomReduce"  modifiers="accel"/>
     <key                          key="&fullZoomReduceCmd.commandkey2;"  command="cmd_fullZoomReduce"  modifiers="accel"/>
     <key id="key_fullZoomEnlarge" key="&fullZoomEnlargeCmd.commandkey;"  command="cmd_fullZoomEnlarge" modifiers="accel"/>
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 8e18c4922d1e..e4b782ec4d96 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -13,8 +13,6 @@ Cu.import("resource:///modules/RecentWindow.jsm");
 Cu.import("resource://gre/modules/WindowsPrefSync.jsm");
 
 
-XPCOMUtils.defineLazyModuleGetter(this, "Preferences",
-                                  "resource://gre/modules/Preferences.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Deprecated",
                                   "resource://gre/modules/Deprecated.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "BrowserUITelemetry",
@@ -227,7 +225,6 @@ let gInitialPages = [
 #include browser-loop.js
 #include browser-places.js
 #include browser-plugins.js
-#include browser-readinglist.js
 #include browser-safebrowsing.js
 #include browser-sidebar.js
 #include browser-social.js
@@ -1374,7 +1371,6 @@ var gBrowserInit = {
 
       SocialUI.init();
       TabView.init();
-      ReadingListUI.init();
 
       // Telemetry for master-password - we do this after 5 seconds as it
       // can cause IO if NSS/PSM has not already initialized.
@@ -1483,8 +1479,6 @@ var gBrowserInit = {
 
     gMenuButtonUpdateBadge.uninit();
 
-    ReadingListUI.uninit();
-
     SidebarUI.uninit();
 
     // Now either cancel delayedStartup, or clean up the services initialized from
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index dda4b94867a5..6f0beea807ff 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1130,7 +1130,7 @@
           <toolbarbutton class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="SidebarUI.hide();"/>
         </sidebarheader>
         <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true"
-                  style="min-width: 14em; width: 18em; max-width: 36em;" tooltip="aHTMLTooltip"/>
+                  style="min-width: 14em; width: 18em; max-width: 36em;"/>
       </vbox>
 
       <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
diff --git a/browser/base/content/test/BrowserUITestUtils.jsm b/browser/base/content/test/BrowserUITestUtils.jsm
deleted file mode 100644
index 162dfa771e1d..000000000000
--- a/browser/base/content/test/BrowserUITestUtils.jsm
+++ /dev/null
@@ -1,70 +0,0 @@
-"use strict";
-
-this.EXPORTED_SYMBOLS = [
-  "BrowserUITestUtils",
-];
-
-const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
-
-Cu.import("resource://gre/modules/Timer.jsm");
-
-
-/**
- * Default wait period in millseconds, when waiting for the expected event to occur.
- * @type {number}
- */
-const DEFAULT_WAIT = 2000;
-
-
-/**
- * Test utility functions for dealing with the browser UI DOM.
- */
-this.BrowserUITestUtils = {
-
-  /**
-   * Waits a specified number of miliseconds for a specified event to be
-   * fired on a specified element.
-   *
-   * Usage:
-   *    let receivedEvent = BrowserUITestUtils.waitForEvent(element, "eventName");
-   *    // Do some processing here that will cause the event to be fired
-   *    // ...
-   *    // Now yield until the Promise is fulfilled
-   *    yield receivedEvent;
-   *    if (receivedEvent && !(receivedEvent instanceof Error)) {
-   *      receivedEvent.msg == "eventName";
-   *      // ...
-   *    }
-   *
-   * @param {Element} subject - The element that should receive the event.
-   * @param {string} eventName - The event to wait for.
-   * @param {number} timeoutMs - The number of miliseconds to wait before giving up.
-   * @param {Element} target - Expected target of the event.
-   * @returns {Promise} A Promise that resolves to the received event, or
-   *                    rejects with an Error.
-   */
-  waitForEvent(subject, eventName, timeoutMs, target) {
-    return new Promise((resolve, reject) => {
-      function listener(event) {
-        if (target && target !== event.target) {
-          return;
-        }
-
-        subject.removeEventListener(eventName, listener);
-        clearTimeout(timerID);
-        resolve(event);
-      }
-
-      timeoutMs = timeoutMs || DEFAULT_WAIT;
-      let stack = new Error().stack;
-
-      let timerID = setTimeout(() => {
-        subject.removeEventListener(eventName, listener);
-        reject(new Error(`${eventName} event timeout at ${stack}`));
-      }, timeoutMs);
-
-
-      subject.addEventListener(eventName, listener);
-    });
-  },
-};
diff --git a/browser/base/moz.build b/browser/base/moz.build
index 1576c8d8f0fd..6eb110290157 100644
--- a/browser/base/moz.build
+++ b/browser/base/moz.build
@@ -6,10 +6,6 @@
 
 SPHINX_TREES['sslerrorreport'] = 'content/docs/sslerrorreport'
 
-TESTING_JS_MODULES += [
-    'content/test/BrowserUITestUtils.jsm',
-]
-
 MOCHITEST_MANIFESTS += [
     'content/test/general/mochitest.ini',
 ]
diff --git a/browser/components/customizableui/test/browser_988072_sidebar_events.js b/browser/components/customizableui/test/browser_988072_sidebar_events.js
index 2619aff3f336..203ecae915b3 100644
--- a/browser/components/customizableui/test/browser_988072_sidebar_events.js
+++ b/browser/components/customizableui/test/browser_988072_sidebar_events.js
@@ -53,13 +53,9 @@ function removeWidget() {
 
 // Filters out the trailing menuseparators from the sidebar list
 function getSidebarList() {
-  let sidebars = [...gSidebarMenu.children].filter(sidebar => {
-    if (sidebar.localName == "menuseparator")
-      return false;
-    if (sidebar.getAttribute("hidden") == "true")
-      return false;
-    return true;
-  });
+  let sidebars = [...gSidebarMenu.children];
+  while (sidebars[sidebars.length - 1].localName == "menuseparator")
+    sidebars.pop();
   return sidebars;
 }
 
diff --git a/browser/components/moz.build b/browser/components/moz.build
index 9cc6bfe7ded4..a36e145a19d6 100644
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -15,7 +15,6 @@ DIRS += [
     'places',
     'preferences',
     'privatebrowsing',
-    'readinglist',
     'search',
     'sessionstore',
     'shell',
diff --git a/browser/components/readinglist/ReadingList.jsm b/browser/components/readinglist/ReadingList.jsm
deleted file mode 100644
index dcd1cc808a55..000000000000
--- a/browser/components/readinglist/ReadingList.jsm
+++ /dev/null
@@ -1,356 +0,0 @@
-/* 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/. */
-
-"use strict";
-
-this.EXPORTED_SYMBOLS = ["ReadingList"];
-
-const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
-
-
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Preferences.jsm");
-Cu.import("resource://gre/modules/Log.jsm");
-
-
-(function() {
-  let parentLog = Log.repository.getLogger("readinglist");
-  parentLog.level = Preferences.get("browser.readinglist.logLevel", Log.Level.Warn);
-  Preferences.observe("browser.readinglist.logLevel", value => {
-    parentLog.level = value;
-  });
-  let formatter = new Log.BasicFormatter();
-  parentLog.addAppender(new Log.ConsoleAppender(formatter));
-  parentLog.addAppender(new Log.DumpAppender(formatter));
-})();
-
-let log = Log.repository.getLogger("readinglist.api");
-
-/**
- * Represents an item in the Reading List.
- * @constructor
- * @see https://github.com/mozilla-services/readinglist/wiki/API-Design-proposal#data-model
- */
-function Item(data) {
-  this._data = data;
-}
-
-Item.prototype = {
-  /**
-   * UUID
-   * @type {string}
-   */
-  get id() {
-    return this._data.id;
-  },
-
-  /**
-   * Server timestamp
-   * @type {string}
-   */
-  get lastModified() {
-    return this._data.last_modified;
-  },
-
-  /**
-   * @type {nsIURL}
-   */
-  get originalUrl() {
-    return Services.io.newURI(this._data.url, null, null);
-  },
-
-  /**
-   * @type {string}
-   */
-  get originalTitle() {
-    return this._data.title || "";
-  },
-
-  /**
-   * @type {nsIURL}
-   */
-  get resolvedUrl() {
-    return Services.io.newURI(this._data.resolved_url || this._data.url, null, null);
-  },
-
-  /**
-   * @type {string}
-   */
-  get resolvedTitle() {
-    return this._data.resolved_title || this.originalTitle;
-  },
-
-  /**
-   * @type {string}
-   */
-  get excerpt() {
-    return this._data.excerpt || "";
-  },
-
-  /**
-   * @type {ItemStates}
-   */
-  get state() {
-    return ReadingList.ItemStates[this._data.state] || ReadingList.ItemStates.OK;
-  },
-
-  /**
-   * @type {boolean}
-   */
-  get isFavorite() {
-    return !!this._data.favorite;
-  },
-
-  /**
-   * @type {boolean}
-   */
-  get isArticle() {
-    return !!this._data.is_article;
-  },
-
-  /**
-   * @type {number}
-   */
-  get wordCount() {
-    return this._data.word_count || 0;
-  },
-
-  /**
-   * @type {boolean}
-   */
-  get isUnread() {
-    return !!this._data.unread;
-  },
-
-  /**
-   * Device name
-   * @type {string}
-   */
-  get addedBy() {
-    return this._data.added_by;
-  },
-
-  /**
-   * @type {Date}
-   */
-  get addedOn() {
-    return new Date(this._data.added_on);
-  },
-
-  /**
-   * @type {Date}
-   */
-  get storedOn() {
-    return new Date(this._data.stored_on);
-  },
-
-  /**
-   * Device name
-   * @type {string}
-   */
-  get markedReadBy() {
-    return this._data.marked_read_by;
-  },
-
-  /**
-   * @type {Date}
-   */
-  get markedReadOn() {
-    return new date(this._data.marked_read_on);
-  },
-
-  /**
-   * @type {number}
-   */
-  get readPosition() {
-    return this._data.read_position;
-  },
-
-  // Data not specified by the current server API
-
-  /**
-   * Array of scraped or captured summary images for this page.
-   * TODO: Implement this.
-   * @type {[nsIURL]}
-   */
-  get images() {
-    return [];
-  },
-
-  /**
-   * Favicon for this site.
-   * @type {nsIURL}
-   * TODO: Generate moz-anno: URI for favicon.
-   */
-  get favicon() {
-    return null;
-  },
-
-  // Helpers
-
-  /**
-   * Alias for resolvedUrl.
-   * TODO: This url/resolvedUrl alias makes it feel like the server API hasn't got this right.
-   */
-  get url() {
-    return this.resolvedUrl;
-  },
-  /**
-   * Alias for resolvedTitle
-   */
-  get title() {
-    return this.resolvedTitle;
-  },
-
-  /**
-   * Domain portion of the URL, with prefixes stripped. For display purposes.
-   * @type {string}
-   */
-  get domain() {
-    let host = this.resolvedUrl.host;
-    if (host.startsWith("www.")) {
-      host = host.slice(4);
-    }
-    return host;
-  },
-
-  /**
-   * Convert this Item to a string representation.
-   */
-  toString() {
-    return `[Item url=${this.url.spec}]`;
-  },
-
-  /**
-   * Get the value that should be used for a JSON representation of this Item.
-   */
-  toJSON() {
-    return this._data;
-  },
-};
-
-
-let ItemStates = {
-  OK: Symbol("ok"),
-  ARCHIVED: Symbol("archived"),
-  DELETED: Symbol("deleted"),
-};
-
-
-this.ReadingList = {
-  Item: Item,
-  ItemStates: ItemStates,
-
-  _listeners: new Set(),
-  _items: [],
-
-  /**
-   * Initialize the ReadingList component.
-   */
-  _init() {
-    log.debug("Init");
-
-    // Initialize mock data
-    let mockData = JSON.parse(Preferences.get("browser.readinglist.mockData", "[]"));
-    for (let itemData of mockData) {
-      this._items.push(new Item(itemData));
-    }
-  },
-
-  /**
-   * Add an event listener.
-   * @param {object} listener - Listener object to start notifying.
-   */
-  addListener(listener) {
-    this._listeners.add(listener);
-  },
-
-  /**
-   * Remove a specified event listener.
-   * @param {object} listener - Listener object to stop notifying.
-   */
-  removeListener(listener) {
-    this._listeners.delete(listener);
-  },
-
-  /**
-   * Notify all registered event listeners of an event.
-   * @param {string} eventName - Event name, which will be used as a method name
-   *                             on listeners to call.
-   */
-  _notifyListeners(eventName, ...args) {
-    for (let listener of this._listeners) {
-      if (typeof listener[eventName] != "function") {
-        continue;
-      }
-
-      try {
-        listener[eventName](...args);
-      } catch (e) {
-        log.error(`Error calling listener.${eventName}`, e);
-      }
-    }
-  },
-
-  /**
-   * Fetch the number of items that match a set of given conditions.
-   * TODO: Implement filtering, sorting, etc. Needs backend storage work.
-   *
-   * @param {Object} conditions Object specifying a set of conditions for
-   *                            filtering items.
-   * @return {Promise}
-   * @resolves {number}
-   */
-  getNumItems(conditions = {unread: false}) {
-    return new Promise((resolve, reject) => {
-      resolve(this._items.length);
-    });
-  },
-
-  /**
-   * Fetch items matching a set of conditions, in a sorted list.
-   * TODO: Implement filtering, sorting, etc. Needs backend storage work.
-   *
-   * @return {Promise}
-   * @resolves {[Item]}
-   */
-  getItems(options = {sort: "addedOn", conditions: {unread: false}}) {
-    return new Promise((resolve, reject) => {
-      resolve([...this._items]);
-    });
-  },
-
-  /**
-   * Find an item based on its ID.
-   * TODO: Implement. Needs backend storage work.
-   *
-   * @return {Promise}
-   * @resolves {Item}
-   */
-  getItemByID(url) {
-    return new Promise((resolve, reject) => {
-      resolve(null);
-    });
-  },
-
-  /**
-   * Find an item based on its URL.
-   *
-   * TODO: Implement. Needs backend storage work.
-   * TODO: Does this match original or resolved URL, or both?
-   * TODO: Should this just be a generic findItem API?
-   *
-   * @return {Promise}
-   * @resolves {Item}
-   */
-  getItemByURL(url) {
-    return new Promise((resolve, reject) => {
-      resolve(null);
-    });
-  },
-};
-
-
-ReadingList._init();
diff --git a/browser/components/readinglist/jar.mn b/browser/components/readinglist/jar.mn
deleted file mode 100644
index d3be251a329e..000000000000
--- a/browser/components/readinglist/jar.mn
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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/readinglist/sidebar.xhtml
-  content/browser/readinglist/sidebar.js
diff --git a/browser/components/readinglist/moz.build b/browser/components/readinglist/moz.build
deleted file mode 100644
index 0dfdf141706c..000000000000
--- a/browser/components/readinglist/moz.build
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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 += ['jar.mn']
-
-EXTRA_JS_MODULES.readinglist += [
-    'ReadingList.jsm',
-]
-
-TESTING_JS_MODULES += [
-    'test/ReadingListTestUtils.jsm',
-]
-
-BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
diff --git a/browser/components/readinglist/sidebar.js b/browser/components/readinglist/sidebar.js
deleted file mode 100644
index 249a6707d3dd..000000000000
--- a/browser/components/readinglist/sidebar.js
+++ /dev/null
@@ -1,403 +0,0 @@
-/* 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/. */
-
-"use strict";
-
-const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
-
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource:///modules/readinglist/ReadingList.jsm");
-
-let log = Cu.import("resource://gre/modules/Log.jsm", {})
-            .Log.repository.getLogger("readinglist.sidebar");
-
-
-let RLSidebar = {
-  /**
-   * Container element for all list item elements.
-   * @type {Element}
-   */
-  list: null,
-
-  /**
-   * <template> element used for constructing list item elements.
-   * @type {Element}
-   */
-  itemTemplate: null,
-
-  /**
-   * Map of ReadingList Item objects, keyed by their ID.
-   * @type {Map}
-   */
-  itemsById: new Map(),
-  /**
-   * Map of list item elements, keyed by their corresponding Item's ID.
-   * @type {Map}
-   */
-  itemNodesById: new Map(),
-
-  /**
-   * Initialize the sidebar UI.
-   */
-  init() {
-    log.debug("Initializing");
-
-    addEventListener("unload", () => this.uninit());
-
-    this.list = document.getElementById("list");
-    this.itemTemplate = document.getElementById("item-template");
-
-    this.list.addEventListener("click", event => this.onListClick(event));
-    this.list.addEventListener("mousemove", event => this.onListMouseMove(event));
-    this.list.addEventListener("keydown", event => this.onListKeyDown(event), true);
-
-    this.ensureListItems();
-    ReadingList.addListener(this);
-
-    let initEvent = new CustomEvent("Initialized", {bubbles: true});
-    document.documentElement.dispatchEvent(initEvent);
-  },
-
-  /**
-   * Un-initialize the sidebar UI.
-   */
-  uninit() {
-    log.debug("Shutting down");
-
-    ReadingList.removeListener(this);
-  },
-
-  /**
-   * Handle an item being added to the ReadingList.
-   * TODO: We may not want to show this new item right now.
-   * TODO: We should guard against the list growing here.
-   *
-   * @param {Readinglist.Item} item - Item that was added.
-   */
-  onItemAdded(item) {
-    log.trace(`onItemAdded: ${item}`);
-
-    let itemNode = document.importNode(this.itemTemplate.content, true).firstElementChild;
-    this.updateItem(item, itemNode);
-    this.list.appendChild(itemNode);
-    this.itemNodesById.set(item.id, itemNode);
-    this.itemsById.set(item.id, item);
-  },
-
-  /**
-   * Handle an item being deleted from the ReadingList.
-   * @param {ReadingList.Item} item - Item that was deleted.
-   */
-  onItemDeleted(item) {
-    log.trace(`onItemDeleted: ${item}`);
-
-    let itemNode = this.itemNodesById.get(item.id);
-    itemNode.remove();
-    this.itemNodesById.delete(item.id);
-    this.itemsById.delete(item.id);
-    // TODO: ensureListItems doesn't yet cope with needing to add one item.
-    //this.ensureListItems();
-  },
-
-  /**
-   * Handle an item in the ReadingList having any of its properties changed.
-   * @param {ReadingList.Item} item - Item that was updated.
-   */
-  onItemUpdated(item) {
-    log.trace(`onItemUpdated: ${item}`);
-
-    let itemNode = this.itemNodesById.get(item.id);
-    if (!itemNode)
-      return;
-
-    this.updateItem(item, itemNode);
-  },
-
-  /**
-   * Update the element representing an item, ensuring it's in sync with the
-   * underlying data.
-   * @param {ReadingList.Item} item - Item to use as a source.
-   * @param {Element} itemNode - Element to update.
-   */
-  updateItem(item, itemNode) {
-    itemNode.setAttribute("id", "item-" + item.id);
-    itemNode.setAttribute("title", `${item.title}\n${item.url.spec}`);
-
-    itemNode.querySelector(".item-title").textContent = item.title;
-    itemNode.querySelector(".item-domain").textContent = item.domain;
-  },
-
-  /**
-   * Ensure that the list is populated with the correct items.
-   */
-  ensureListItems() {
-    ReadingList.getItems().then(items => {
-      for (let item of items) {
-        // TODO: Should be batch inserting via DocumentFragment
-        try {
-          this.onItemAdded(item);
-        } catch (e) {
-          log.warn("Error adding item", e);
-        }
-      }
-    });
-  },
-
-  /**
-   * Get the number of items currently displayed in the list.
-   * @type {number}
-   */
-  get numItems() {
-    return this.list.childElementCount;
-  },
-
-  /**
-   * The currently active element in the list.
-   * @type {Element}
-   */
-  get activeItem() {
-    return document.querySelector("#list > .item.active");
-  },
-
-  set activeItem(node) {
-    if (node && node.parentNode != this.list) {
-      log.error(`Unable to set activeItem to invalid node ${node}`);
-      return;
-    }
-
-    log.debug(`Setting activeItem: ${node ? node.id : null}`);
-
-    if (node) {
-      if (!node.classList.contains("selected")) {
-        this.selectedItem = node;
-      }
-
-      if (node.classList.contains("active")) {
-        return;
-      }
-    }
-
-    let prevItem = document.querySelector("#list > .item.active");
-    if (prevItem) {
-      prevItem.classList.remove("active");
-    }
-
-    if (node) {
-      node.classList.add("active");
-    }
-
-    let event = new CustomEvent("ActiveItemChanged", {bubbles: true});
-    this.list.dispatchEvent(event);
-  },
-
-  /**
-   * The currently selected item in the list.
-   * @type {Element}
-   */
-  get selectedItem() {
-    return document.querySelector("#list > .item.selected");
-  },
-
-  set selectedItem(node) {
-    if (node && node.parentNode != this.list) {
-      log.error(`Unable to set selectedItem to invalid node ${node}`);
-      return;
-    }
-
-    log.debug(`Setting activeItem: ${node ? node.id : null}`);
-
-    let prevItem = document.querySelector("#list > .item.selected");
-    if (prevItem) {
-      prevItem.classList.remove("selected");
-    }
-
-    if (node) {
-      node.classList.add("selected");
-      let itemId = this.getItemIdFromNode(node);
-      this.list.setAttribute("aria-activedescendant", "item-" + itemId);
-    } else {
-      this.list.removeAttribute("aria-activedescendant");
-    }
-
-    let event = new CustomEvent("SelectedItemChanged", {bubbles: true});
-    this.list.dispatchEvent(event);
-  },
-
-  /**
-   * The index of the currently selected item in the list.
-   * @type {number}
-   */
-  get selectedIndex() {
-    for (let i = 0; i < this.numItems; i++) {
-      let item = this.list.children.item(i);
-      if (!item) {
-        break;
-      }
-      if (item.classList.contains("selected")) {
-        return i;
-      }
-    }
-    return -1;
-  },
-
-  set selectedIndex(index) {
-    log.debug(`Setting selectedIndex: ${index}`);
-
-    if (index == -1) {
-      this.selectedItem = null;
-      return;
-    }
-
-    let item = this.list.children.item(index);
-    if (!item) {
-      log.warn(`Unable to set selectedIndex to invalid index ${index}`);
-      return;
-    }
-    this.selectedItem = item;
-  },
-
-  /**
-   * Open a given URL. The event is used to determine where it should be opened
-   * (current tab, new tab, new window).
-   * @param {string} url - URL to open.
-   * @param {Event} event - KeyEvent or MouseEvent that triggered this action.
-   */
-  openURL(url, event) {
-    // TODO: Disabled while working on the listbox mechanics.
-    log.debug(`Opening page ${url}`);
-    return;
-
-    let mainWindow = window.QueryInterface(Ci.nsIInterfaceRequestor)
-                           .getInterface(Ci.nsIWebNavigation)
-                           .QueryInterface(Ci.nsIDocShellTreeItem)
-                           .rootTreeItem
-                           .QueryInterface(Ci.nsIInterfaceRequestor)
-                           .getInterface(Ci.nsIDOMWindow);
-    mainWindow.openUILink(url, event);
-  },
-
-  /**
-   * Get the ID of the Item associated with a given list item element.
-   * @param {element} node - List item element to get an ID for.
-   * @return {string} Assocated Item ID.
-   */
-  getItemIdFromNode(node) {
-    let id = node.getAttribute("id");
-    if (id && id.startsWith("item-")) {
-      return id.slice(5);
-    }
-
-    return null;
-  },
-
-  /**
-   * Get the Item associated with a given list item element.
-   * @param {element} node - List item element to get an Item for.
-   * @return {string} Associated Item.
-   */
-  getItemFromNode(node) {
-    let itemId = this.getItemIdFromNode(node);
-    if (!itemId) {
-      return null;
-    }
-
-    return this.itemsById.get(itemId);
-  },
-
-  /**
-   * Open the active item in the list.
-   * @param {Event} event - Event triggering this.
-   */
-  openActiveItem(event) {
-    let itemNode = this.activeItem;
-    if (!itemNode) {
-      return;
-    }
-
-    let item = this.getItemFromNode(itemNode);
-    this.openURL(item.url.spec, event);
-  },
-
-  /**
-   * Find the parent item element, from a given child element.
-   * @param {Element} node - Child element.
-   * @return {Element} Element for the item, or null if not found.
-   */
-  findParentItemNode(node) {
-    while (node && node != this.list && node != document.documentElement &&
-           !node.classList.contains("item")) {
-      node = node.parentNode;
-    }
-
-    if (node != this.list && node != document.documentElement) {
-      return node;
-    }
-
-    return null;
-  },
-
-  /**
-   * Handle a click event on the list box.
-   * @param {Event} event - Triggering event.
-   */
-  onListClick(event) {
-    let itemNode = this.findParentItemNode(event.target);
-    if (!itemNode)
-      return;
-
-    this.activeItem = itemNode;
-    this.openActiveItem(event);
-  },
-
-  /**
-   * Handle a mousemove event over the list box.
-   * @param {Event} event - Triggering event.
-   */
-  onListMouseMove(event) {
-    let itemNode = this.findParentItemNode(event.target);
-    if (!itemNode)
-      return;
-
-    this.selectedItem = itemNode;
-  },
-
-  /**
-   * Handle a keydown event on the list box.
-   * @param {Event} event - Triggering event.
-   */
-  onListKeyDown(event) {
-    if (event.keyCode == KeyEvent.DOM_VK_DOWN) {
-      // TODO: Refactor this so we pass a direction to a generic method.
-      // See autocomplete.xml's getNextIndex
-      event.preventDefault();
-      let index = this.selectedIndex + 1;
-      if (index >= this.numItems) {
-        index = 0;
-      }
-
-      this.selectedIndex = index;
-      this.selectedItem.focus();
-    } else if (event.keyCode == KeyEvent.DOM_VK_UP) {
-      event.preventDefault();
-
-      let index = this.selectedIndex - 1;
-      if (index < 0) {
-        index = this.numItems - 1;
-      }
-
-      this.selectedIndex = index;
-      this.selectedItem.focus();
-    } else if (event.keyCode == KeyEvent.DOM_VK_RETURN) {
-      let selectedItem = this.selectedItem;
-      if (selectedItem) {
-        this.activeItem = this.selectedItem;
-        this.openActiveItem(event);
-      }
-    }
-  },
-};
-
-
-addEventListener("DOMContentLoaded", () => RLSidebar.init());
diff --git a/browser/components/readinglist/sidebar.xhtml b/browser/components/readinglist/sidebar.xhtml
deleted file mode 100644
index 12f0342eaff7..000000000000
--- a/browser/components/readinglist/sidebar.xhtml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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 [
-  <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
-  %browserDTD;
-]>
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <script src="chrome://browser/content/readinglist/sidebar.js" type="application/javascript;version=1.8"></script>
-    <link rel="stylesheet" type="text/css" media="all" href="chrome://browser/skin/readinglist/sidebar.css"/>
-    <!-- <title>&readingList.label;</title> -->
-  </head>
-
-  <body role="application">
-    <template id="item-template">
-      <div class="item" role="option" tabindex="-1">
-        <div class="item-thumb-container"></div>
-        <div class="item-summary-container">
-          <div class="item-title"></div>
-          <div class="item-domain"></div>
-        </div>
-      </div>
-    </template>
-
-    <div id="list" role="listbox" tabindex="1"></div>
-  </body>
-</html>
diff --git a/browser/components/readinglist/test/ReadingListTestUtils.jsm b/browser/components/readinglist/test/ReadingListTestUtils.jsm
deleted file mode 100644
index 775b6e80fe8a..000000000000
--- a/browser/components/readinglist/test/ReadingListTestUtils.jsm
+++ /dev/null
@@ -1,159 +0,0 @@
-"use strict";
-
-this.EXPORTED_SYMBOLS = [
-  "ReadingListTestUtils",
-];
-
-const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/Preferences.jsm");
-Cu.import("resource:///modules/readinglist/ReadingList.jsm");
-
-
-/** Preference name controlling whether the ReadingList feature is enabled/disabled. */
-const PREF_RL_ENABLED = "browser.readinglist.enabled";
-
-
-/**
- * Utilities for testing the ReadingList sidebar.
- */
-function SidebarUtils(window, assert) {
-  this.window = window;
-  this.Assert = assert;
-}
-
-SidebarUtils.prototype = {
-  /**
-   * Reference to the RLSidebar object controlling the ReadingList sidebar UI.
-   * @type {object}
-   */
-  get RLSidebar() {
-    return this.window.SidebarUI.browser.contentWindow.RLSidebar;
-  },
-
-  /**
-   * Reference to the list container element in the sidebar.
-   * @type {Element}
-   */
-  get list() {
-    return this.RLSidebar.list;
-  },
-
-  /**
-   * Check that the number of elements in the list matches the expected count.
-   * @param {number} count - Expected number of items.
-   */
-  expectNumItems(count) {
-    this.Assert.equal(this.list.childElementCount, count,
-                      "Should have expected number of items in the sidebar list");
-  },
-
-  /**
-   * Check all items in the sidebar list, ensuring the DOM matches the data.
-   */
-  checkAllItems() {
-    for (let itemNode of this.list.children) {
-      this.checkSidebarItem(itemNode);
-    }
-  },
-
-  /**
-   * Run a series of sanity checks for an element in the list associated with
-   * an Item, ensuring the DOM matches the data.
-   */
-  checkItem(node) {
-    let item = this.RLSidebar.getItemFromNode(node);
-
-    this.Assert.ok(node.classList.contains("item"),
-                   "Node should have .item class");
-    this.Assert.equal(node.id, "item-" + item.id,
-                      "Node should have correct ID");
-    this.Assert.equal(node.getAttribute("title"), item.title + "\n" + item.url.spec,
-                      "Node should have correct title attribute");
-    this.Assert.equal(node.querySelector(".item-title").textContent, item.title,
-                      "Node's title element's text should match item title");
-    this.Assert.equal(node.querySelector(".item-domain").textContent, item.domain,
-                      "Node's domain element's text should match item title");
-  },
-
-  expectSelectedId(itemId) {
-    let selectedItem = this.RLSidebar.selectedItem;
-    if (itemId == null) {
-      this.Assert.equal(selectedItem, null, "Should have no selected item");
-    } else {
-      this.Assert.notEqual(selectedItem, null, "selectedItem should not be null");
-      let selectedId = this.RLSidebar.getItemIdFromNode(selectedItem);
-      this.Assert.equal(itemId, selectedId, "Should have currect item selected");
-    }
-  },
-
-  expectActiveId(itemId) {
-    let activeItem = this.RLSidebar.activeItem;
-    if (itemId == null) {
-      this.Assert.equal(activeItem, null, "Should have no active item");
-    } else {
-      this.Assert.notEqual(activeItem, null, "activeItem should not be null");
-      let activeId = this.RLSidebar.getItemIdFromNode(activeItem);
-      this.Assert.equal(itemId, activeId, "Should have correct item active");
-    }
-  },
-};
-
-
-/**
- * Utilities for testing the ReadingList.
- */
-this.ReadingListTestUtils = {
-  /**
-   * Whether the ReadingList feature is enabled or not.
-   * @type {boolean}
-   */
-  get enabled() {
-    return Preferences.get(PREF_RL_ENABLED, false);
-  },
-  set enabled(value) {
-    Preferences.set(PREF_RL_ENABLED, !!value);
-  },
-
-  /**
-   * Utilities for testing the ReadingList sidebar.
-   */
-  SidebarUtils: SidebarUtils,
-
-  /**
-   * Synthetically add an item to the ReadingList.
-   * @param {object|[object]} data - Object or array of objects to pass to the
-   *                                 Item constructor.
-   * @return {Promise} Promise that gets fulfilled with the item or items added.
-   */
-  addItem(data) {
-    if (Array.isArray(data)) {
-      let promises = [];
-      for (let itemData of data) {
-        promises.push(this.addItem(itemData));
-      }
-      return Promise.all(promises);
-    }
-
-    return new Promise(resolve => {
-      let item = new ReadingList.Item(data);
-      ReadingList._items.push(item);
-      ReadingList._notifyListeners("onItemAdded", item);
-      resolve(item);
-    });
-  },
-
-  /**
-   * Cleanup all data, resetting to a blank state.
-   */
-  cleanup() {
-    return new Promise(resolve => {
-      ReadingList._items = [];
-      ReadingList._listeners.clear();
-      Preferences.reset(PREF_RL_ENABLED);
-      resolve();
-    });
-  },
-};
diff --git a/browser/components/readinglist/test/browser/browser.ini b/browser/components/readinglist/test/browser/browser.ini
deleted file mode 100644
index ffaab5619b1a..000000000000
--- a/browser/components/readinglist/test/browser/browser.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[DEFAULT]
-support-files =
-  head.js
-
-[browser_ui_enable_disable.js]
-[browser_sidebar_list.js]
-[browser_sidebar_mouse_nav.js]
diff --git a/browser/components/readinglist/test/browser/browser_sidebar_list.js b/browser/components/readinglist/test/browser/browser_sidebar_list.js
deleted file mode 100644
index 8826b7c9b6d4..000000000000
--- a/browser/components/readinglist/test/browser/browser_sidebar_list.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * This tests the basic functionality of the sidebar to list items.
- */
-
-add_task(function*() {
-  registerCleanupFunction(function*() {
-    ReadingListUI.hideSidebar();
-    yield RLUtils.cleanup();
-  });
-
-  RLUtils.enabled = true;
-
-  yield ReadingListUI.showSidebar();
-  let RLSidebar = RLSidebarUtils.RLSidebar;
-  let sidebarDoc = SidebarUI.browser.contentDocument;
-  Assert.equal(RLSidebar.numItems, 0, "Should start with no items");
-  Assert.equal(RLSidebar.activeItem, null, "Should start with no active item");
-  Assert.equal(RLSidebar.activeItem, null, "Should start with no selected item");
-
-  info("Adding first item");
-  yield RLUtils.addItem({
-    id: "c3502a49-bcef-4a94-b222-d4834463de33",
-    url: "http://example.com/article1",
-    title: "Article 1",
-  });
-  RLSidebarUtils.expectNumItems(1);
-
-  info("Adding more items");
-  yield RLUtils.addItem([{
-    id: "e054f5b7-1f4f-463f-bb96-d64c02448c31",
-    url: "http://example.com/article2",
-    title: "Article 2",
-  }, {
-    id: "4207230b-2364-4e97-9587-01312b0ce4e6",
-    url: "http://example.com/article3",
-    title: "Article 3",
-  }]);
-  RLSidebarUtils.expectNumItems(3);
-
-  info("Closing sidebar");
-  ReadingListUI.hideSidebar();
-
-  info("Adding another item");
-  yield RLUtils.addItem({
-    id: "dae0e855-607e-4df3-b27f-73a5e35c94fe",
-    url: "http://example.com/article4",
-    title: "Article 4",
-  });
-
-  info("Re-eopning sidebar");
-  yield ReadingListUI.showSidebar();
-  RLSidebarUtils.expectNumItems(4);
-});
diff --git a/browser/components/readinglist/test/browser/browser_sidebar_mouse_nav.js b/browser/components/readinglist/test/browser/browser_sidebar_mouse_nav.js
deleted file mode 100644
index aef3173b3c22..000000000000
--- a/browser/components/readinglist/test/browser/browser_sidebar_mouse_nav.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Test mouse navigation for selecting items in the sidebar.
- */
-
-
-function mouseInteraction(mouseEvent, responseEvent, itemNode) {
-  let eventPromise = BrowserUITestUtils.waitForEvent(RLSidebarUtils.list, responseEvent);
-  let details = {};
-  if (mouseEvent != "click") {
-    details.type = mouseEvent;
-  }
-
-  EventUtils.synthesizeMouseAtCenter(itemNode, details, itemNode.ownerDocument.defaultView);
-  return eventPromise;
-}
-
-add_task(function*() {
-  registerCleanupFunction(function*() {
-    ReadingListUI.hideSidebar();
-    yield RLUtils.cleanup();
-  });
-
-  RLUtils.enabled = true;
-
-  let itemData = [{
-    id: "00bd24c7-3629-40b0-acde-37aa81768735",
-    url: "http://example.com/article1",
-    title: "Article 1",
-  }, {
-    id: "28bf7f19-cf94-4ceb-876a-ac1878342e0d",
-    url: "http://example.com/article2",
-    title: "Article 2",
-  }, {
-    id: "7e5064ea-f45d-4fc7-8d8c-c067b7781e78",
-    url: "http://example.com/article3",
-    title: "Article 3",
-  }, {
-    id: "8e72a472-8db8-4904-ba39-9672f029e2d0",
-    url: "http://example.com/article4",
-    title: "Article 4",
-  }, {
-    id: "8d332744-37bc-4a1a-a26b-e9953b9f7d91",
-    url: "http://example.com/article5",
-    title: "Article 5",
-  }];
-  yield RLUtils.addItem(itemData);
-
-  yield ReadingListUI.showSidebar();
-  RLSidebarUtils.expectNumItems(5);
-  RLSidebarUtils.expectSelectedId(null);
-  RLSidebarUtils.expectActiveId(null);
-
-  info("Mouse move over item 1");
-  yield mouseInteraction("mousemove", "SelectedItemChanged", RLSidebarUtils.list.children[0]);
-  RLSidebarUtils.expectSelectedId(itemData[0].id);
-  RLSidebarUtils.expectActiveId(null);
-
-  info("Mouse move over item 2");
-  yield mouseInteraction("mousemove", "SelectedItemChanged", RLSidebarUtils.list.children[1]);
-  RLSidebarUtils.expectSelectedId(itemData[1].id);
-  RLSidebarUtils.expectActiveId(null);
-
-  info("Mouse move over item 5");
-  yield mouseInteraction("mousemove", "SelectedItemChanged", RLSidebarUtils.list.children[4]);
-  RLSidebarUtils.expectSelectedId(itemData[4].id);
-  RLSidebarUtils.expectActiveId(null);
-
-  info("Mouse move over item 1 again");
-  yield mouseInteraction("mousemove", "SelectedItemChanged", RLSidebarUtils.list.children[0]);
-  RLSidebarUtils.expectSelectedId(itemData[0].id);
-  RLSidebarUtils.expectActiveId(null);
-
-  info("Mouse click on item 1");
-  yield mouseInteraction("click", "ActiveItemChanged", RLSidebarUtils.list.children[0]);
-  RLSidebarUtils.expectSelectedId(itemData[0].id);
-  RLSidebarUtils.expectActiveId(itemData[0].id);
-
-  info("Mouse click on item 3");
-  yield mouseInteraction("click", "ActiveItemChanged", RLSidebarUtils.list.children[2]);
-  RLSidebarUtils.expectSelectedId(itemData[2].id);
-  RLSidebarUtils.expectActiveId(itemData[2].id);
-});
diff --git a/browser/components/readinglist/test/browser/browser_ui_enable_disable.js b/browser/components/readinglist/test/browser/browser_ui_enable_disable.js
deleted file mode 100644
index 797286e8154f..000000000000
--- a/browser/components/readinglist/test/browser/browser_ui_enable_disable.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Test enabling/disabling the entire ReadingList feature via the
- * browser.readinglist.enabled preference.
- */
-
-function checkRLState() {
-  let enabled = RLUtils.enabled;
-  info("Checking ReadingList UI is " + (enabled ? "enabled" : "disabled"));
-
-  let sidebarBroadcaster = document.getElementById("readingListSidebar");
-  let sidebarMenuitem = document.getElementById("menu_readingListSidebar");
-
-  if (enabled) {
-    Assert.notEqual(sidebarBroadcaster.getAttribute("hidden"), "true",
-                    "Sidebar broadcaster should not be hidden");
-    Assert.notEqual(sidebarMenuitem.getAttribute("hidden"), "true",
-                    "Sidebar menuitem should be visible");
-  } else {
-    Assert.equal(sidebarBroadcaster.getAttribute("hidden"), "true",
-                 "Sidebar broadcaster should be hidden");
-    Assert.equal(sidebarMenuitem.getAttribute("hidden"), "true",
-                 "Sidebar menuitem should be hidden");
-    Assert.equal(ReadingListUI.isSidebarOpen, false,
-                 "ReadingListUI should not think sidebar is open");
-  }
-
-  if (!enabled) {
-    Assert.equal(SidebarUI.isOpen, false, "Sidebar should not be open");
-  }
-}
-
-add_task(function*() {
-  info("Start with ReadingList disabled");
-  RLUtils.enabled = false;
-  checkRLState();
-  info("Enabling ReadingList");
-  RLUtils.enabled = true;
-  checkRLState();
-
-  info("Opening ReadingList sidebar");
-  yield ReadingListUI.showSidebar();
-  Assert.ok(SidebarUI.isOpen, "Sidebar should be open");
-  Assert.equal(SidebarUI.currentID, "readingListSidebar", "Sidebar should have ReadingList loaded");
-
-  info("Disabling ReadingList");
-  RLUtils.enabled = false;
-  Assert.ok(!SidebarUI.isOpen, "Sidebar should be closed");
-  checkRLState();
-});
diff --git a/browser/components/readinglist/test/browser/head.js b/browser/components/readinglist/test/browser/head.js
deleted file mode 100644
index 113622d82652..000000000000
--- a/browser/components/readinglist/test/browser/head.js
+++ /dev/null
@@ -1,15 +0,0 @@
-XPCOMUtils.defineLazyModuleGetter(this, "ReadingList",
-                                  "resource:///modules/readinglist/ReadingList.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "ReadingListTestUtils",
-                                  "resource://testing-common/ReadingListTestUtils.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "BrowserUITestUtils",
-                                  "resource://testing-common/BrowserUITestUtils.jsm");
-
-
-XPCOMUtils.defineLazyGetter(this, "RLUtils", () => {
-  return ReadingListTestUtils;
-});
-
-XPCOMUtils.defineLazyGetter(this, "RLSidebarUtils", () => {
-  return new RLUtils.SidebarUtils(window, Assert);
-});
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 5fbc45478a22..237e23fe6fb4 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -838,7 +838,5 @@ just addresses the organization to follow, e.g. "This site is run by " -->
 <!ENTITY processHang.terminateProcess.label       "Kill Web Process">
 <!ENTITY processHang.terminateProcess.accessKey   "K">
 
-<!ENTITY readingList.label                        "Reading List">
-<!ENTITY readingList.sidebar.commandKey           "R">
 <!ENTITY emeLearnMoreContextMenu.label            "Learn more about DRM…">
 <!ENTITY emeLearnMoreContextMenu.accesskey        "D">
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index e41f0a2ea401..7720857eca88 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -91,7 +91,6 @@ browser.jar:
   skin/classic/browser/tab-crashed.svg                      (../shared/incontent-icons/tab-crashed.svg)
   skin/classic/browser/welcome-back.svg                     (../shared/incontent-icons/welcome-back.svg)
   skin/classic/browser/reader-mode-16.png             (../shared/reader/reader-mode-16.png)
-  skin/classic/browser/readinglist/sidebar.css        (../shared/readinglist/sidebar.css)
   skin/classic/browser/webRTC-shareDevice-16.png
   skin/classic/browser/webRTC-shareDevice-64.png
   skin/classic/browser/webRTC-sharingDevice-16.png    (../shared/webrtc/webRTC-sharingDevice-16.png)
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index d77f49deb8b3..ca58b7a9672a 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -142,7 +142,6 @@ browser.jar:
   skin/classic/browser/welcome-back.svg               (../shared/incontent-icons/welcome-back.svg)
   skin/classic/browser/reader-mode-16.png             (../shared/reader/reader-mode-16.png)
   skin/classic/browser/reader-mode-16@2x.png          (../shared/reader/reader-mode-16@2x.png)
-  skin/classic/browser/readinglist/sidebar.css        (../shared/readinglist/sidebar.css)
   skin/classic/browser/webRTC-shareDevice-16.png
   skin/classic/browser/webRTC-shareDevice-16@2x.png
   skin/classic/browser/webRTC-shareDevice-64.png
diff --git a/browser/themes/shared/readinglist/sidebar.css b/browser/themes/shared/readinglist/sidebar.css
deleted file mode 100644
index b8ce94d9396d..000000000000
--- a/browser/themes/shared/readinglist/sidebar.css
+++ /dev/null
@@ -1,72 +0,0 @@
-/* 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/. */
-
-:root, body {
-  height: 100%;
-  overflow-x: hidden;
-}
-
-body {
-  margin: 0;
-  font: message-box;
-  background: #F8F7F8;
-  color: #333333;
-  -moz-user-select: none;
-  overflow: hidden;
-}
-
-#list {
-  height: 100%;
-  overflow-x: auto;
-}
-
-.item {
-  display: flex;
-  flex-flow: row;
-  cursor: pointer;
-  padding: 6px;
-}
-
-.item.active {
-  background: #FEFEFE;
-}
-
-.item.selected {
-  background: #FDFDFD;
-}
-
-.item-thumb-container {
-  min-width: 64px;
-  max-width: 64px;
-  min-height: 40px;
-  max-height: 40px;
-  background: #EBEBEB;
-  border: 1px solid white;
-  box-shadow: 0px 1px 2px rgba(0,0,0,.35);
-  margin: 5px;
-}
-
-.item-summary-container {
-  display: flex;
-  flex-flow: column;
-  -moz-padding-start: 4px;
-  overflow: hidden;
-}
-
-.item-title {
-  overflow: hidden;
-  height: 2.8em;
-}
-
-.item-domain {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  max-height: 1.4em;
-  color: #0095DD;
-}
-
-.item:hover .item-domain {
-  color: #008ACB;
-}
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index d98485765c4f..307dfa4c0e6d 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -110,7 +110,6 @@ browser.jar:
         skin/classic/browser/tab-crashed.svg                         (../shared/incontent-icons/tab-crashed.svg)
         skin/classic/browser/welcome-back.svg                        (../shared/incontent-icons/welcome-back.svg)
         skin/classic/browser/reader-mode-16.png                      (../shared/reader/reader-mode-16.png)
-        skin/classic/browser/readinglist/sidebar.css                 (../shared/readinglist/sidebar.css)
         skin/classic/browser/notification-pluginNormal.png           (../shared/plugins/notification-pluginNormal.png)
         skin/classic/browser/notification-pluginAlert.png            (../shared/plugins/notification-pluginAlert.png)
         skin/classic/browser/notification-pluginBlocked.png          (../shared/plugins/notification-pluginBlocked.png)
@@ -576,7 +575,6 @@ browser.jar:
         skin/classic/aero/browser/tab-crashed.svg                   (../shared/incontent-icons/tab-crashed.svg)
         skin/classic/aero/browser/welcome-back.svg                  (../shared/incontent-icons/welcome-back.svg)
         skin/classic/aero/browser/reader-mode-16.png                (../shared/reader/reader-mode-16.png)
-        skin/classic/aero/browser/readinglist/sidebar.css           (../shared/readinglist/sidebar.css)
         skin/classic/aero/browser/notification-pluginNormal.png     (../shared/plugins/notification-pluginNormal.png)
         skin/classic/aero/browser/notification-pluginAlert.png      (../shared/plugins/notification-pluginAlert.png)
         skin/classic/aero/browser/notification-pluginBlocked.png    (../shared/plugins/notification-pluginBlocked.png)

From 3764a77aca292a400cdeffb1a9a03bbb044341ab Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Thu, 19 Feb 2015 11:10:14 +0100
Subject: [PATCH 04/18] Backed out changeset 5dfb417f346e (bug 1123517) for bc1
 test failures

---
 browser/base/content/browser-sets.inc         |   6 +-
 browser/base/content/browser-sidebar.js       | 309 ------------------
 browser/base/content/browser.js               | 262 ++++++++++++---
 browser/base/content/browser.xul              |   4 +-
 .../content/test/general/browser_bug409481.js |   4 +-
 .../customizableui/content/panelUI.inc.xul    |   4 +-
 .../test/browser_988072_sidebar_events.js     |   2 +-
 .../places/tests/browser/browser_555547.js    |   6 +-
 .../browser/browser_bookmarksProperties.js    |  14 +-
 .../browser/browser_history_sidebar_search.js |   4 +-
 .../browser/browser_sidebarpanels_click.js    |   6 +-
 .../tests/browser/browser_views_liveupdate.js |   4 +-
 .../browser_privatebrowsing_sidebar.js        |   2 +-
 .../components/sessionstore/SessionStore.jsm  |   2 +-
 14 files changed, 249 insertions(+), 380 deletions(-)
 delete mode 100644 browser/base/content/browser-sidebar.js

diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 3e293dc4c0d4..ec3f227c2fdf 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -138,7 +138,7 @@
     <broadcaster id="Social:PageShareOrMark" disabled="true"/>
     <broadcaster id="viewBookmarksSidebar" autoCheck="false" label="&bookmarksButton.label;"
                  type="checkbox" group="sidebar" sidebarurl="chrome://browser/content/bookmarks/bookmarksPanel.xul"
-                 oncommand="SidebarUI.toggle('viewBookmarksSidebar');"/>
+                 oncommand="toggleSidebar('viewBookmarksSidebar');"/>
 
     <!-- for both places and non-places, the sidebar lives at
          chrome://browser/content/history/history-panel.xul so there are no
@@ -146,11 +146,11 @@
     <broadcaster id="viewHistorySidebar" autoCheck="false" sidebartitle="&historyButton.label;"
                  type="checkbox" group="sidebar"
                  sidebarurl="chrome://browser/content/history/history-panel.xul"
-                 oncommand="SidebarUI.toggle('viewHistorySidebar');"/>
+                 oncommand="toggleSidebar('viewHistorySidebar');"/>
 
     <broadcaster id="viewWebPanelsSidebar" autoCheck="false"
                  type="checkbox" group="sidebar" sidebarurl="chrome://browser/content/web-panels.xul"
-                 oncommand="SidebarUI.toggle('viewWebPanelsSidebar');"/>
+                 oncommand="toggleSidebar('viewWebPanelsSidebar');"/>
 
     <broadcaster id="bookmarkThisPageBroadcaster"
                  label="&bookmarkThisPageCmd.label;"
diff --git a/browser/base/content/browser-sidebar.js b/browser/base/content/browser-sidebar.js
deleted file mode 100644
index 258205e7c1f6..000000000000
--- a/browser/base/content/browser-sidebar.js
+++ /dev/null
@@ -1,309 +0,0 @@
-# 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/.
-
-/**
- * SidebarUI controls showing and hiding the browser sidebar.
- *
- * @note
- * Some of these methods take a commandID argument - we expect to find a
- * xul:broadcaster element with the specified ID.
- * The following attributes on that element may be used and/or modified:
- *  - id           (required) the string to match commandID. The convention
- *                 is to use this naming scheme: 'view<sidebar-name>Sidebar'.
- *  - sidebarurl   (required) specifies the URL to load in this sidebar.
- *  - sidebartitle or label (in that order) specify the title to
- *                 display on the sidebar.
- *  - checked      indicates whether the sidebar is currently displayed.
- *                 Note that toggleSidebar updates this attribute when
- *                 it changes the sidebar's visibility.
- *  - group        this attribute must be set to "sidebar".
- */
-let SidebarUI = {
-  browser: null,
-
-  _box: null,
-  _title: null,
-  _splitter: null,
-
-  init() {
-    this._box = document.getElementById("sidebar-box");
-    this.browser = document.getElementById("sidebar");
-    this._title = document.getElementById("sidebar-title");
-    this._splitter = document.getElementById("sidebar-splitter");
-
-    if (window.opener && !window.opener.closed &&
-        window.opener.document.documentURIObject.schemeIs("chrome") &&
-        PrivateBrowsingUtils.isWindowPrivate(window) == PrivateBrowsingUtils.isWindowPrivate(window.opener)) {
-      this.adoptFromWindow(window.opener);
-    } else {
-      let commandID = this._box.getAttribute("sidebarcommand");
-      if (commandID) {
-        let command = document.getElementById(commandID);
-        if (command) {
-          this._delayedLoad = true;
-          this._box.hidden = false;
-          this._splitter.hidden = false;
-          command.setAttribute("checked", "true");
-        } else {
-          // Remove the |sidebarcommand| attribute, because the element it
-          // refers to no longer exists, so we should assume this sidebar
-          // panel has been uninstalled. (249883)
-          this._box.removeAttribute("sidebarcommand");
-        }
-      }
-    }
-  },
-
-  uninit() {
-    let enumerator = Services.wm.getEnumerator(null);
-    enumerator.getNext();
-    if (!enumerator.hasMoreElements()) {
-      document.persist("sidebar-box", "sidebarcommand");
-      document.persist("sidebar-box", "width");
-      document.persist("sidebar-box", "src");
-      document.persist("sidebar-title", "value");
-    }
-  },
-
-  /**
-   * Adopt the status of the sidebar from another window.
-   * @param {Window} sourceWindow - Window to use as a source for sidebar status.
-   */
-  adoptFromWindow(sourceWindow) {
-    // If the opener had a sidebar, open the same sidebar in our window.
-    // The opener can be the hidden window too, if we're coming from the state
-    // where no windows are open, and the hidden window has no sidebar box.
-    let sourceUI = sourceWindow.SidebarUI;
-    if (!sourceUI || sourceUI._box.hidden) {
-      return;
-    }
-
-    let commandID = sourceUI._box.getAttribute("sidebarcommand");
-    let commandElem = document.getElementById(commandID);
-
-    // dynamically generated sidebars will fail this check.
-    if (!commandElem) {
-      return;
-    }
-
-    this._title.setAttribute("value",
-                             sourceUI._title.getAttribute("value"));
-    this._box.setAttribute("width", sourceUI._box.boxObject.width);
-
-    this._box.setAttribute("sidebarcommand", commandID);
-    // Note: we're setting 'src' on this._box, which is a <vbox>, not on
-    // the <browser id="sidebar">. This lets us delay the actual load until
-    // delayedStartup().
-    this._box.setAttribute("src", sourceUI.browser.getAttribute("src"));
-    this._delayedLoad = true;
-
-    this._box.hidden = false;
-    this._splitter.hidden = false;
-    commandElem.setAttribute("checked", "true");
-  },
-
-  /**
-   * If loading a sidebar was delayed on startup, start the load now.
-   */
-  startDelayedLoad() {
-    if (!this._delayedLoad) {
-      return;
-    }
-
-    this.browser.setAttribute("src", this._box.getAttribute("src"));
-  },
-
-  /**
-   * Fire a "SidebarFocused" event on the sidebar's |window| to give the sidebar
-   * a chance to adjust focus as needed. An additional event is needed, because
-   * we don't want to focus the sidebar when it's opened on startup or in a new
-   * window, only when the user opens the sidebar.
-   */
-  _fireFocusedEvent() {
-    let event = new CustomEvent("SidebarFocused", {bubbles: true});
-    this.browser.contentWindow.dispatchEvent(event);
-
-    // Run the original function for backwards compatibility.
-    fireSidebarFocusedEvent();
-  },
-
-  /**
-   * True if the sidebar is currently open.
-   */
-  get isOpen() {
-    return !this._box.hidden;
-  },
-
-  /**
-   * The ID of the current sidebar (ie, the ID of the broadcaster being used).
-   * This can be set even if the sidebar is hidden.
-   */
-  get currentID() {
-    return this._box.getAttribute("sidebarcommand");
-  },
-
-  get title() {
-    return this._title.value;
-  },
-
-  set title(value) {
-    this._title.value = value;
-  },
-
-  /**
-   * Toggle the visibility of the sidebar. If the sidebar is hidden or is open
-   * with a different commandID, then the sidebar will be opened using the
-   * specified commandID. Otherwise the sidebar will be hidden.
-   *
-   * @param {string} commandID ID of the xul:broadcaster element to use.
-   * @return {Promise}
-   */
-  toggle(commandID = this.currentID) {
-    if (this.isOpen && commandID == this.currentID) {
-      this.hide();
-      return Promise.resolve();
-    } else {
-      return this.show(commandID);
-    }
-  },
-
-  /**
-   * Show the sidebar, using the parameters from the specified broadcaster.
-   * @see SidebarUI note.
-   *
-   * @param {string} commandID ID of the xul:broadcaster element to use.
-   */
-  show(commandID) {
-    return new Promise((resolve, reject) => {
-      let sidebarBroadcaster = document.getElementById(commandID);
-      if (!sidebarBroadcaster || sidebarBroadcaster.localName != "broadcaster") {
-        reject(new Error("Invalid sidebar broadcaster specified"));
-        return;
-      }
-
-      let broadcasters = document.getElementsByAttribute("group", "sidebar");
-      for (let broadcaster of broadcasters) {
-        // skip elements that observe sidebar broadcasters and random
-        // other elements
-        if (broadcaster.localName != "broadcaster") {
-          continue;
-        }
-
-        if (broadcaster != sidebarBroadcaster) {
-          broadcaster.removeAttribute("checked");
-        } else {
-          sidebarBroadcaster.setAttribute("checked", "true");
-        }
-      }
-
-      this._box.hidden = false;
-      this._splitter.hidden = false;
-
-      this._box.setAttribute("sidebarcommand", sidebarBroadcaster.id);
-
-      let title = sidebarBroadcaster.getAttribute("sidebartitle");
-      if (!title) {
-        title = sidebarBroadcaster.getAttribute("label");
-      }
-      this._title.value = title;
-
-      let url = sidebarBroadcaster.getAttribute("sidebarurl");
-      this.browser.setAttribute("src", url); // kick off async load
-
-      // We set this attribute here in addition to setting it on the <browser>
-      // element itself, because the code in SidebarUI.uninit() persists this
-      // attribute, not the "src" of the <browser id="sidebar">. The reason it
-      // does that is that we want to delay sidebar load a bit when a browser
-      // window opens. See delayedStartup() and SidebarUI.startDelayedLoad().
-      this._box.setAttribute("src", url);
-
-      if (this.browser.contentDocument.location.href != url) {
-        let onLoad = event => {
-          this.browser.removeEventListener("load", onLoad, true);
-
-          // We're handling the 'load' event before it bubbles up to the usual
-          // (non-capturing) event handlers. Let it bubble up before firing the
-          // SidebarFocused event.
-          setTimeout(() => this._fireFocusedEvent(), 0);
-
-          // Run the original function for backwards compatibility.
-          sidebarOnLoad(event);
-
-          resolve();
-        };
-
-        this.browser.addEventListener("load", onLoad, true);
-      } else {
-        // Older code handled this case, so we do it too.
-        this._fireFocusedEvent();
-        resolve();
-      }
-    });
-  },
-
-  /**
-   * Hide the sidebar.
-   */
-  hide() {
-    if (!this.isOpen) {
-      return;
-    }
-
-    let commandID = this._box.getAttribute("sidebarcommand");
-    let sidebarBroadcaster = document.getElementById(commandID);
-
-    if (sidebarBroadcaster.getAttribute("checked") != "true") {
-      return;
-    }
-
-    // Replace the document currently displayed in the sidebar with about:blank
-    // so that we can free memory by unloading the page. We need to explicitly
-    // create a new content viewer because the old one doesn't get destroyed
-    // until about:blank has loaded (which does not happen as long as the
-    // element is hidden).
-    this.browser.setAttribute("src", "about:blank");
-    this.browser.docShell.createAboutBlankContentViewer(null);
-
-    sidebarBroadcaster.removeAttribute("checked");
-    this._box.setAttribute("sidebarcommand", "");
-    this._title.value = "";
-    this._box.hidden = true;
-    this._splitter.hidden = true;
-    gBrowser.selectedBrowser.focus();
-  },
-};
-
-/**
- * This exists for backards compatibility - it will be called once a sidebar is
- * ready, following any request to show it.
- *
- * @deprecated
- */
-function fireSidebarFocusedEvent() {}
-
-/**
- * This exists for backards compatibility - it gets called when a sidebar has
- * been loaded.
- *
- * @deprecated
- */
-function sidebarOnLoad(event) {}
-
-/**
- * This exists for backards compatibility, and is equivilent to
- * SidebarUI.toggle() without the forceOpen param. With forceOpen set to true,
- * it is equalivent to SidebarUI.show().
- *
- * @deprecated
- */
-function toggleSidebar(commandID, forceOpen = false) {
-  Deprecated.warning("toggleSidebar() is deprecated, please use SidebarUI.toggle() or SidebarUI.show() instead",
-                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/Sidebar");
-
-  if (forceOpen) {
-    SidebarUI.show(commandID);
-  } else {
-    SidebarUI.toggle(commandID);
-  }
-}
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index e4b782ec4d96..50f9de8cd578 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -12,9 +12,6 @@ Cu.import("resource://gre/modules/NotificationDB.jsm");
 Cu.import("resource:///modules/RecentWindow.jsm");
 Cu.import("resource://gre/modules/WindowsPrefSync.jsm");
 
-
-XPCOMUtils.defineLazyModuleGetter(this, "Deprecated",
-                                  "resource://gre/modules/Deprecated.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "BrowserUITelemetry",
                                   "resource:///modules/BrowserUITelemetry.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "E10SUtils",
@@ -226,7 +223,6 @@ let gInitialPages = [
 #include browser-places.js
 #include browser-plugins.js
 #include browser-safebrowsing.js
-#include browser-sidebar.js
 #include browser-social.js
 #include browser-tabview.js
 #include browser-thumbnails.js
@@ -903,6 +899,8 @@ var gBrowserInit = {
   delayedStartupFinished: false,
 
   onLoad: function() {
+    var mustLoadSidebar = false;
+
     gBrowser.addEventListener("DOMUpdatePageReport", gPopupBlockerObserver, false);
 
     Services.obs.addObserver(gPluginHandler.pluginCrashed, "plugin-crashed", false);
@@ -954,7 +952,61 @@ var gBrowserInit = {
     // setup history swipe animation
     gHistorySwipeAnimation.init();
 
-    SidebarUI.init();
+    if (window.opener && !window.opener.closed &&
+        window.opener.document.documentURIObject.schemeIs("chrome") &&
+        PrivateBrowsingUtils.isWindowPrivate(window) == PrivateBrowsingUtils.isWindowPrivate(window.opener)) {
+      let openerSidebarBox = window.opener.document.getElementById("sidebar-box");
+      // If the opener had a sidebar, open the same sidebar in our window.
+      // The opener can be the hidden window too, if we're coming from the state
+      // where no windows are open, and the hidden window has no sidebar box.
+      if (openerSidebarBox && !openerSidebarBox.hidden) {
+        let sidebarCmd = openerSidebarBox.getAttribute("sidebarcommand");
+        let sidebarCmdElem = document.getElementById(sidebarCmd);
+
+        // dynamically generated sidebars will fail this check.
+        if (sidebarCmdElem) {
+          let sidebarBox = document.getElementById("sidebar-box");
+          let sidebarTitle = document.getElementById("sidebar-title");
+
+          sidebarTitle.setAttribute(
+            "value", window.opener.document.getElementById("sidebar-title").getAttribute("value"));
+          sidebarBox.setAttribute("width", openerSidebarBox.boxObject.width);
+
+          sidebarBox.setAttribute("sidebarcommand", sidebarCmd);
+          // Note: we're setting 'src' on sidebarBox, which is a <vbox>, not on
+          // the <browser id="sidebar">. This lets us delay the actual load until
+          // delayedStartup().
+          sidebarBox.setAttribute(
+            "src", window.opener.document.getElementById("sidebar").getAttribute("src"));
+          mustLoadSidebar = true;
+
+          sidebarBox.hidden = false;
+          document.getElementById("sidebar-splitter").hidden = false;
+          sidebarCmdElem.setAttribute("checked", "true");
+        }
+      }
+    }
+    else {
+      let box = document.getElementById("sidebar-box");
+      if (box.hasAttribute("sidebarcommand")) {
+        let commandID = box.getAttribute("sidebarcommand");
+        if (commandID) {
+          let command = document.getElementById(commandID);
+          if (command) {
+            mustLoadSidebar = true;
+            box.hidden = false;
+            document.getElementById("sidebar-splitter").hidden = false;
+            command.setAttribute("checked", "true");
+          }
+          else {
+            // Remove the |sidebarcommand| attribute, because the element it
+            // refers to no longer exists, so we should assume this sidebar
+            // panel has been uninstalled. (249883)
+            box.removeAttribute("sidebarcommand");
+          }
+        }
+      }
+    }
 
     // Certain kinds of automigration rely on this notification to complete
     // their tasks BEFORE the browser window is shown. SessionStore uses it to
@@ -1043,7 +1095,7 @@ var gBrowserInit = {
     ToolbarIconColor.init();
 
     // Wait until chrome is painted before executing code not critical to making the window visible
-    this._boundDelayedStartup = this._delayedStartup.bind(this);
+    this._boundDelayedStartup = this._delayedStartup.bind(this, mustLoadSidebar);
     window.addEventListener("MozAfterPaint", this._boundDelayedStartup);
 
     this._loadHandled = true;
@@ -1054,7 +1106,7 @@ var gBrowserInit = {
     this._boundDelayedStartup = null;
   },
 
-  _delayedStartup: function() {
+  _delayedStartup: function(mustLoadSidebar) {
     let tmp = {};
     Cu.import("resource://gre/modules/TelemetryTimestamps.jsm", tmp);
     let TelemetryTimestamps = tmp.TelemetryTimestamps;
@@ -1217,7 +1269,11 @@ var gBrowserInit = {
 
     Services.telemetry.getHistogramById("E10S_WINDOW").add(gMultiProcessBrowser);
 
-    SidebarUI.startDelayedLoad();
+    if (mustLoadSidebar) {
+      let sidebar = document.getElementById("sidebar");
+      let sidebarBox = document.getElementById("sidebar-box");
+      sidebar.setAttribute("src", sidebarBox.getAttribute("src"));
+    }
 
     UpdateUrlbarSearchSplitterState();
 
@@ -1479,7 +1535,14 @@ var gBrowserInit = {
 
     gMenuButtonUpdateBadge.uninit();
 
-    SidebarUI.uninit();
+    var enumerator = Services.wm.getEnumerator(null);
+    enumerator.getNext();
+    if (!enumerator.hasMoreElements()) {
+      document.persist("sidebar-box", "sidebarcommand");
+      document.persist("sidebar-box", "width");
+      document.persist("sidebar-box", "src");
+      document.persist("sidebar-title", "value");
+    }
 
     // Now either cancel delayedStartup, or clean up the services initialized from
     // it.
@@ -1706,7 +1769,7 @@ function HandleAppCommandEvent(evt) {
     BrowserSearch.webSearch();
     break;
   case "Bookmarks":
-    SidebarUI.toggle("viewBookmarksSidebar");
+    toggleSidebar('viewBookmarksSidebar');
     break;
   case "Home":
     BrowserHome();
@@ -3076,19 +3139,23 @@ var PrintPreviewListener = {
     else
       this._showChrome();
 
+    if (this._chromeState.sidebarOpen)
+      toggleSidebar(this._sidebarCommand);
+
     TabsInTitlebar.allowedBy("print-preview", !gInPrintPreviewMode);
   },
   _hideChrome: function () {
     this._chromeState = {};
 
-    this._chromeState.sidebarOpen = SidebarUI.isOpen;
-    this._sidebarCommand = SidebarUI.currentID;
-    SidebarUI.hide();
+    var sidebar = document.getElementById("sidebar-box");
+    this._chromeState.sidebarOpen = !sidebar.hidden;
+    this._sidebarCommand = sidebar.getAttribute("sidebarcommand");
 
     var notificationBox = gBrowser.getNotificationBox();
     this._chromeState.notificationsOpen = !notificationBox.notificationsHidden;
     notificationBox.notificationsHidden = true;
 
+    document.getElementById("sidebar").setAttribute("src", "about:blank");
     gBrowser.updateWindowResizers();
 
     this._chromeState.findOpen = gFindBarInitialized && !gFindBar.hidden;
@@ -3118,9 +3185,6 @@ var PrintPreviewListener = {
 
     if (this._chromeState.syncNotificationsOpen)
       document.getElementById("sync-notifications").notificationsHidden = false;
-
-    if (this._chromeState.sidebarOpen)
-      SidebarUI.show(this._sidebarCommand);
   }
 }
 
@@ -5149,6 +5213,121 @@ function displaySecurityInfo()
   BrowserPageInfo(null, "securityTab");
 }
 
+/**
+ * Opens or closes the sidebar identified by commandID.
+ *
+ * @param commandID a string identifying the sidebar to toggle; see the
+ *                  note below. (Optional if a sidebar is already open.)
+ * @param forceOpen boolean indicating whether the sidebar should be
+ *                  opened regardless of its current state (optional).
+ * @note
+ * We expect to find a xul:broadcaster element with the specified ID.
+ * The following attributes on that element may be used and/or modified:
+ *  - id           (required) the string to match commandID. The convention
+ *                 is to use this naming scheme: 'view<sidebar-name>Sidebar'.
+ *  - sidebarurl   (required) specifies the URL to load in this sidebar.
+ *  - sidebartitle or label (in that order) specify the title to
+ *                 display on the sidebar.
+ *  - checked      indicates whether the sidebar is currently displayed.
+ *                 Note that toggleSidebar updates this attribute when
+ *                 it changes the sidebar's visibility.
+ *  - group        this attribute must be set to "sidebar".
+ */
+function toggleSidebar(commandID, forceOpen) {
+
+  var sidebarBox = document.getElementById("sidebar-box");
+  if (!commandID)
+    commandID = sidebarBox.getAttribute("sidebarcommand");
+
+  var sidebarBroadcaster = document.getElementById(commandID);
+  var sidebar = document.getElementById("sidebar"); // xul:browser
+  var sidebarTitle = document.getElementById("sidebar-title");
+  var sidebarSplitter = document.getElementById("sidebar-splitter");
+
+  if (sidebarBroadcaster.getAttribute("checked") == "true") {
+    if (!forceOpen) {
+      // Replace the document currently displayed in the sidebar with about:blank
+      // so that we can free memory by unloading the page. We need to explicitly
+      // create a new content viewer because the old one doesn't get destroyed
+      // until about:blank has loaded (which does not happen as long as the
+      // element is hidden).
+      sidebar.setAttribute("src", "about:blank");
+      sidebar.docShell.createAboutBlankContentViewer(null);
+
+      sidebarBroadcaster.removeAttribute("checked");
+      sidebarBox.setAttribute("sidebarcommand", "");
+      sidebarTitle.value = "";
+      sidebarBox.hidden = true;
+      sidebarSplitter.hidden = true;
+      gBrowser.selectedBrowser.focus();
+    } else {
+      fireSidebarFocusedEvent();
+    }
+    return;
+  }
+
+  // now we need to show the specified sidebar
+
+  // ..but first update the 'checked' state of all sidebar broadcasters
+  var broadcasters = document.getElementsByAttribute("group", "sidebar");
+  for (let broadcaster of broadcasters) {
+    // skip elements that observe sidebar broadcasters and random
+    // other elements
+    if (broadcaster.localName != "broadcaster")
+      continue;
+
+    if (broadcaster != sidebarBroadcaster)
+      broadcaster.removeAttribute("checked");
+    else
+      sidebarBroadcaster.setAttribute("checked", "true");
+  }
+
+  sidebarBox.hidden = false;
+  sidebarSplitter.hidden = false;
+
+  var url = sidebarBroadcaster.getAttribute("sidebarurl");
+  var title = sidebarBroadcaster.getAttribute("sidebartitle");
+  if (!title)
+    title = sidebarBroadcaster.getAttribute("label");
+  sidebar.setAttribute("src", url); // kick off async load
+  sidebarBox.setAttribute("sidebarcommand", sidebarBroadcaster.id);
+  sidebarTitle.value = title;
+
+  // We set this attribute here in addition to setting it on the <browser>
+  // element itself, because the code in gBrowserInit.onUnload persists this
+  // attribute, not the "src" of the <browser id="sidebar">. The reason it
+  // does that is that we want to delay sidebar load a bit when a browser
+  // window opens. See delayedStartup().
+  sidebarBox.setAttribute("src", url);
+
+  if (sidebar.contentDocument.location.href != url)
+    sidebar.addEventListener("load", sidebarOnLoad, true);
+  else // older code handled this case, so we do it too
+    fireSidebarFocusedEvent();
+}
+
+function sidebarOnLoad(event) {
+  var sidebar = document.getElementById("sidebar");
+  sidebar.removeEventListener("load", sidebarOnLoad, true);
+  // We're handling the 'load' event before it bubbles up to the usual
+  // (non-capturing) event handlers. Let it bubble up before firing the
+  // SidebarFocused event.
+  setTimeout(fireSidebarFocusedEvent, 0);
+}
+
+/**
+ * Fire a "SidebarFocused" event on the sidebar's |window| to give the sidebar
+ * a chance to adjust focus as needed. An additional event is needed, because
+ * we don't want to focus the sidebar when it's opened on startup or in a new
+ * window, only when the user opens the sidebar.
+ */
+function fireSidebarFocusedEvent() {
+  var sidebar = document.getElementById("sidebar");
+  var event = document.createEvent("Events");
+  event.initEvent("SidebarFocused", true, false);
+  sidebar.contentWindow.dispatchEvent(event);
+}
+
 
 var gHomeButton = {
   prefDomain: "browser.startup.homepage",
@@ -5295,37 +5474,38 @@ function getBrowserSelection(aCharLen) {
 }
 
 var gWebPanelURI;
-function openWebPanel(title, uri) {
-  // Ensure that the web panels sidebar is open.
-  SidebarUI.show("viewWebPanelsSidebar");
+function openWebPanel(aTitle, aURI)
+{
+    // Ensure that the web panels sidebar is open.
+    toggleSidebar('viewWebPanelsSidebar', true);
 
-  // Set the title of the panel.
-  SidebarUI.title = title;
+    // Set the title of the panel.
+    document.getElementById("sidebar-title").value = aTitle;
 
-  // Tell the Web Panels sidebar to load the bookmark.
-  if (SidebarUI.browser.docShell && SidebarUI.browser.contentDocument &&
-      SidebarUI.browser.contentDocument.getElementById("web-panels-browser")) {
-    SidebarUI.browser.contentWindow.loadWebPanel(uri);
-    if (gWebPanelURI) {
-      gWebPanelURI = "";
-      SidebarUI.browser.removeEventListener("load", asyncOpenWebPanel, true);
+    // Tell the Web Panels sidebar to load the bookmark.
+    var sidebar = document.getElementById("sidebar");
+    if (sidebar.docShell && sidebar.contentDocument && sidebar.contentDocument.getElementById('web-panels-browser')) {
+        sidebar.contentWindow.loadWebPanel(aURI);
+        if (gWebPanelURI) {
+            gWebPanelURI = "";
+            sidebar.removeEventListener("load", asyncOpenWebPanel, true);
+        }
     }
-  } else {
-    // The panel is still being constructed.  Attach an onload handler.
-    if (!gWebPanelURI) {
-      SidebarUI.browser.addEventListener("load", asyncOpenWebPanel, true);
+    else {
+        // The panel is still being constructed.  Attach an onload handler.
+        if (!gWebPanelURI)
+            sidebar.addEventListener("load", asyncOpenWebPanel, true);
+        gWebPanelURI = aURI;
     }
-    gWebPanelURI = uri;
-  }
 }
 
-function asyncOpenWebPanel(event) {
-  if (gWebPanelURI && SidebarUI.browser.contentDocument &&
-      SidebarUI.browser.contentDocument.getElementById("web-panels-browser")) {
-    SidebarUI.browser.contentWindow.loadWebPanel(gWebPanelURI);
-  }
-  gWebPanelURI = "";
-  SidebarUI.browser.removeEventListener("load", asyncOpenWebPanel, true);
+function asyncOpenWebPanel(event)
+{
+    var sidebar = document.getElementById("sidebar");
+    if (gWebPanelURI && sidebar.contentDocument && sidebar.contentDocument.getElementById('web-panels-browser'))
+        sidebar.contentWindow.loadWebPanel(gWebPanelURI);
+    gWebPanelURI = "";
+    sidebar.removeEventListener("load", asyncOpenWebPanel, true);
 }
 
 /*
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 6f0beea807ff..fb2eaad40811 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -874,7 +874,7 @@
                       class="subviewbutton"
                       label="&viewBookmarksSidebar2.label;"
                       type="checkbox"
-                      oncommand="SidebarUI.toggle('viewBookmarksSidebar');">
+                      oncommand="toggleSidebar('viewBookmarksSidebar');">
               <observes element="viewBookmarksSidebar" attribute="checked"/>
             </menuitem>
             <!-- NB: temporary solution for bug 985024, this should go away soon. -->
@@ -1127,7 +1127,7 @@
         <sidebarheader id="sidebar-header" align="center">
           <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
           <image id="sidebar-throbber"/>
-          <toolbarbutton class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="SidebarUI.hide();"/>
+          <toolbarbutton class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/>
         </sidebarheader>
         <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true"
                   style="min-width: 14em; width: 18em; max-width: 36em;"/>
diff --git a/browser/base/content/test/general/browser_bug409481.js b/browser/base/content/test/general/browser_bug409481.js
index 395ad93d433e..ade9d209928d 100644
--- a/browser/base/content/test/general/browser_bug409481.js
+++ b/browser/base/content/test/general/browser_bug409481.js
@@ -4,7 +4,7 @@ function test() {
   // XXX This looks a bit odd, but is needed to avoid throwing when removing the
   // event listeners below. See bug 310955.
   document.getElementById("sidebar").addEventListener("load", delayedOpenUrl, true);
-  SidebarUI.show("viewWebPanelsSidebar");
+  toggleSidebar("viewWebPanelsSidebar", true);
 }
 
 function delayedOpenUrl() {
@@ -75,7 +75,7 @@ function contextMenuClosed()
   var sidebar = document.getElementById("sidebar");
   sidebar.contentDocument.removeEventListener("popuphidden", contextMenuClosed, false);
 
-  SidebarUI.hide();
+  toggleSidebar("viewWebPanelsSidebar");
 
   ok(document.getElementById("sidebar-box").hidden, "Sidebar successfully hidden");
 
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index b96057246ae7..3e7d4fca4805 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -64,7 +64,7 @@
                        type="checkbox"
                        class="subviewbutton"
                        key="key_gotoHistory"
-                       oncommand="SidebarUI.toggle('viewHistorySidebar'); PanelUI.hide();">
+                       oncommand="toggleSidebar('viewHistorySidebar'); PanelUI.hide();">
           <observes element="viewHistorySidebar" attribute="checked"/>
         </toolbarbutton>
         <toolbarbutton id="appMenuClearRecentHistory"
@@ -108,7 +108,7 @@
                        label="&viewBookmarksSidebar2.label;"
                        class="subviewbutton"
                        key="viewBookmarksSidebarKb"
-                       oncommand="SidebarUI.toggle('viewBookmarksSidebar'); PanelUI.hide();">
+                       oncommand="toggleSidebar('viewBookmarksSidebar'); PanelUI.hide();">
           <observes element="viewBookmarksSidebar" attribute="checked"/>
         </toolbarbutton>
         <toolbarbutton id="panelMenu_viewBookmarksToolbar"
diff --git a/browser/components/customizableui/test/browser_988072_sidebar_events.js b/browser/components/customizableui/test/browser_988072_sidebar_events.js
index 203ecae915b3..332a2e23d44a 100644
--- a/browser/components/customizableui/test/browser_988072_sidebar_events.js
+++ b/browser/components/customizableui/test/browser_988072_sidebar_events.js
@@ -22,7 +22,7 @@ registerCleanupFunction(() => {
 
   // Ensure sidebar is hidden after each test:
   if (!document.getElementById("sidebar-box").hidden) {
-    SidebarUI.hide();
+    toggleSidebar("", false);
   }
 });
 
diff --git a/browser/components/places/tests/browser/browser_555547.js b/browser/components/places/tests/browser/browser_555547.js
index 0654139cbac2..04476c26e743 100644
--- a/browser/components/places/tests/browser/browser_555547.js
+++ b/browser/components/places/tests/browser/browser_555547.js
@@ -16,9 +16,7 @@ add_task(function* test() {
   }
 
   let sidebar = yield promiseLoadedSidebar("viewBookmarksSidebar");
-  registerCleanupFunction(() => {
-    SidebarUI.hide();
-  });
+  registerCleanupFunction(toggleSidebar);
 
   // Focus the tree and check if its controller is returned.
   let tree = sidebar.contentDocument.getElementById("bookmarks-view");
@@ -61,6 +59,6 @@ function promiseLoadedSidebar(cmd) {
       resolve(sidebar);
     }, true);
 
-    SidebarUI.show(cmd);
+    toggleSidebar(cmd, true);
   });
 }
diff --git a/browser/components/places/tests/browser/browser_bookmarksProperties.js b/browser/components/places/tests/browser/browser_bookmarksProperties.js
index ea1ca3a538d9..3b3f3b424cd8 100644
--- a/browser/components/places/tests/browser/browser_bookmarksProperties.js
+++ b/browser/components/places/tests/browser/browser_bookmarksProperties.js
@@ -79,7 +79,7 @@ gTests.push({
   finish: function() {
     // Close window, toggle sidebar and goto next test.
     this.window.document.documentElement.cancelDialog();
-    SidebarUI.hide();
+    toggleSidebar(this.sidebar, false);
     runNextTest();
   },
 
@@ -138,7 +138,7 @@ gTests.push({
 
   finish: function() {
     this.window.document.documentElement.cancelDialog();
-    SidebarUI.hide();
+    toggleSidebar(this.sidebar, false);
     runNextTest();
   },
 
@@ -232,7 +232,7 @@ gTests.push({
   },
 
   finish: function() {
-    SidebarUI.hide();
+    toggleSidebar(this.sidebar, false);
     runNextTest();
   },
 
@@ -291,7 +291,7 @@ gTests.push({
 
   finish: function() {
     // Window is already closed.
-    SidebarUI.hide();
+    toggleSidebar(this.sidebar, false);
     runNextTest();
   },
 
@@ -390,7 +390,7 @@ gTests.push({
   },
 
   finish: function() {
-    SidebarUI.hide();
+    toggleSidebar(this.sidebar, false);
     runNextTest();
   },
 
@@ -468,7 +468,7 @@ gTests.push({
   },
 
   finish: function() {
-    SidebarUI.hide();
+    toggleSidebar(this.sidebar, false);
     runNextTest();
   },
 
@@ -529,7 +529,7 @@ function execute_test_in_sidebar() {
       // Need to executeSoon since the tree is initialized on sidebar load.
       executeSoon(open_properties_dialog);
     }, true);
-    SidebarUI.show(gCurrentTest.sidebar);
+    toggleSidebar(gCurrentTest.sidebar, true);
 }
 
 function open_properties_dialog() {
diff --git a/browser/components/places/tests/browser/browser_history_sidebar_search.js b/browser/components/places/tests/browser/browser_history_sidebar_search.js
index 0ae57a4d9ed3..906b9561e5ff 100644
--- a/browser/components/places/tests/browser/browser_history_sidebar_search.js
+++ b/browser/components/places/tests/browser/browser_history_sidebar_search.js
@@ -44,7 +44,7 @@ function continue_test() {
                  transition: hs.TRANSITION_TYPED});
   }
   PlacesTestUtils.addVisits(places).then(() => {
-    SidebarUI.show("viewHistorySidebar");
+    toggleSidebar("viewHistorySidebar", true);
   });
 
   sidebar.addEventListener("load", function() {
@@ -63,7 +63,7 @@ function continue_test() {
       check_sidebar_tree_order(pages.length);
 
       // Cleanup.
-      SidebarUI.hide();
+      toggleSidebar("viewHistorySidebar", false);
       PlacesTestUtils.clearHistory().then(finish);
     });
   }, true);
diff --git a/browser/components/places/tests/browser/browser_sidebarpanels_click.js b/browser/components/places/tests/browser/browser_sidebarpanels_click.js
index 80ed2eb2bb0e..662e0d30fc05 100644
--- a/browser/components/places/tests/browser/browser_sidebarpanels_click.js
+++ b/browser/components/places/tests/browser/browser_sidebarpanels_click.js
@@ -18,7 +18,7 @@ function test() {
   // If a sidebar is already open, close it.
   if (!document.getElementById("sidebar-box").hidden) {
     info("Unexpected sidebar found - a previous test failed to cleanup correctly");
-    SidebarUI.hide();
+    toggleSidebar();
   }
 
   let sidebar = document.getElementById("sidebar");
@@ -76,7 +76,7 @@ function test() {
 
   function testPlacesPanel(preFunc, postFunc) {
     currentTest.init(function() {
-      SidebarUI.show(currentTest.sidebarName);
+      toggleSidebar(currentTest.sidebarName);
     });
 
     sidebar.addEventListener("load", function() {
@@ -95,7 +95,7 @@ function test() {
           aSubject.Dialog.ui.button0.click();
 
           executeSoon(function () {
-              SidebarUI.hide();
+              toggleSidebar(currentTest.sidebarName);
               currentTest.cleanup(postFunc);
             });
         }
diff --git a/browser/components/places/tests/browser/browser_views_liveupdate.js b/browser/components/places/tests/browser/browser_views_liveupdate.js
index 994f20888991..41c61a1f6a20 100644
--- a/browser/components/places/tests/browser/browser_views_liveupdate.js
+++ b/browser/components/places/tests/browser/browser_views_liveupdate.js
@@ -37,7 +37,7 @@ function openBookmarksSidebar() {
     // Need to executeSoon since the tree is initialized on sidebar load.
     executeSoon(startTest);
   }, true);
-  SidebarUI.show("viewBookmarksSidebar");
+  toggleSidebar("viewBookmarksSidebar", true);
 }
 
 /**
@@ -171,7 +171,7 @@ function startTest() {
  */
 function finishTest() {
   // Close bookmarks sidebar.
-  SidebarUI.hide();
+  toggleSidebar("viewBookmarksSidebar", false);
 
   // Collapse the personal toolbar if needed.
   if (wasCollapsed) {
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_sidebar.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_sidebar.js
index 2d89cdf3fc88..7883f5d55df3 100644
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_sidebar.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_sidebar.js
@@ -33,7 +33,7 @@ function test() {
       resolve(win);
     }, true);
 
-    win.SidebarUI.show(sidebarID);
+    win.toggleSidebar(sidebarID, true);
 
     return promise;
   }
diff --git a/browser/components/sessionstore/SessionStore.jsm b/browser/components/sessionstore/SessionStore.jsm
index 64017f7344bf..cc771af85e14 100644
--- a/browser/components/sessionstore/SessionStore.jsm
+++ b/browser/components/sessionstore/SessionStore.jsm
@@ -2865,7 +2865,7 @@ let SessionStoreInternal = {
     }
     var sidebar = aWindow.document.getElementById("sidebar-box");
     if (sidebar.getAttribute("sidebarcommand") != aSidebar) {
-      aWindow.SidebarUI.show(aSidebar);
+      aWindow.toggleSidebar(aSidebar);
     }
     // since resizing/moving a window brings it to the foreground,
     // we might want to re-focus the last focused window

From 9dd2cba6bf5c3ff8e5432b1dfb77d2c7b1f75f2c Mon Sep 17 00:00:00 2001
From: Martyn Haigh <martyn.haigh@gmail.com>
Date: Thu, 19 Feb 2015 15:20:47 +0000
Subject: [PATCH 05/18] Bug 1134248 - Default for Title Bar in the Display
 settings screen is incorrect in robocop test (r=margaret)

---
 mobile/android/base/tests/testSettingsMenuItems.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/android/base/tests/testSettingsMenuItems.java b/mobile/android/base/tests/testSettingsMenuItems.java
index fd22fb2172e4..797041c1f874 100644
--- a/mobile/android/base/tests/testSettingsMenuItems.java
+++ b/mobile/android/base/tests/testSettingsMenuItems.java
@@ -45,7 +45,7 @@ public class testSettingsMenuItems extends PixelTest {
 
     // Display menu items.
     String[] PATH_DISPLAY = { StringHelper.DISPLAY_SECTION_LABEL };
-    final String[] TITLE_BAR_LABEL_ARR = { StringHelper.TITLE_BAR_LABEL, StringHelper.SHOW_PAGE_TITLE_LABEL,
+    final String[] TITLE_BAR_LABEL_ARR = { StringHelper.TITLE_BAR_LABEL, StringHelper.SHOW_PAGE_ADDRESS_LABEL,
         StringHelper.SHOW_PAGE_TITLE_LABEL, StringHelper.SHOW_PAGE_ADDRESS_LABEL };
     String[][] OPTIONS_DISPLAY = {
         { StringHelper.TEXT_SIZE_LABEL },

From 7a185bb620020fd73533f84f3d0e4b485f018f5a Mon Sep 17 00:00:00 2001
From: Sami Jaktholm <sjakthol@outlook.com>
Date: Thu, 19 Feb 2015 08:43:31 +0200
Subject: [PATCH 06/18] Bug 1133481 - Make
 browser_webconsole_bug_597136_network_requests_from_chrome.js fail only if an
 exception is coming from webconsole code. r=past

---
 ...owser_webconsole_bug_597136_network_requests_from_chrome.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_597136_network_requests_from_chrome.js b/browser/devtools/webconsole/test/browser_webconsole_bug_597136_network_requests_from_chrome.js
index 5f4f66f23d52..bf745ac3db43 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_597136_network_requests_from_chrome.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_597136_network_requests_from_chrome.js
@@ -11,7 +11,8 @@ let listener = {
     QueryInterface: XPCOMUtils.generateQI([ Ci.nsIObserver ]),
     observe: function(aSubject, aTopic, aData) {
         if (aSubject instanceof Ci.nsIScriptError &&
-                aSubject.category === "XPConnect JavaScript") {
+            aSubject.category === "XPConnect JavaScript" &&
+            aSubject.sourceName.contains("webconsole")) {
             good = false;
         }
     }

From f80aea2eb3d414dd4d0cbb2f55bb88e1d006332e Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Wed, 4 Feb 2015 08:36:14 -0800
Subject: [PATCH 07/18] Bug 1106935 - Remove MOZ_ANDROID_NEW_TABLET_UI from
 configure.in. r=nalexander

--HG--
extra : rebase_source : 13f7cf033023b6cbbe3d1b59614190b6189e94bf
extra : source : f8366cf7e7c88d53221715d6bc907b003f09057e
---
 configure.in | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/configure.in b/configure.in
index c833b27cb27e..84da550f1a56 100644
--- a/configure.in
+++ b/configure.in
@@ -3953,7 +3953,6 @@ MOZ_ANDROID_SEARCH_ACTIVITY=
 MOZ_ANDROID_DOWNLOADS_INTEGRATION=
 MOZ_ANDROID_MLS_STUMBLER=
 MOZ_ANDROID_SHARE_OVERLAY=
-MOZ_ANDROID_NEW_TABLET_UI=
 ACCESSIBILITY=1
 MOZ_TIME_MANAGER=
 MOZ_PAY=
@@ -5042,14 +5041,6 @@ if test -n "$MOZ_ANDROID_TAB_QUEUE"; then
     AC_DEFINE(MOZ_ANDROID_TAB_QUEUE)
 fi
 
-dnl ========================================================
-dnl = Include New Tablet UI on Android
-dnl = Temporary build flag to allow development in Nightly
-dnl ========================================================
-if test -n "$MOZ_ANDROID_NEW_TABLET_UI"; then
-    AC_DEFINE(MOZ_ANDROID_NEW_TABLET_UI)
-fi
-
 dnl ========================================================
 dnl = Enable IPDL's "expensive" unit tests
 dnl ========================================================
@@ -8548,7 +8539,6 @@ AC_SUBST(MOZ_ANDROID_READING_LIST_SERVICE)
 AC_SUBST(MOZ_ANDROID_SEARCH_ACTIVITY)
 AC_SUBST(MOZ_ANDROID_SHARE_OVERLAY)
 AC_SUBST(MOZ_ANDROID_TAB_QUEUE)
-AC_SUBST(MOZ_ANDROID_NEW_TABLET_UI)
 AC_SUBST(MOZ_ANDROID_MLS_STUMBLER)
 AC_SUBST(MOZ_ANDROID_DOWNLOADS_INTEGRATION)
 AC_SUBST(ENABLE_STRIP)

From d68a9461f44007ef9bf8fb42b11d1b5bcd92bfbd Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Tue, 3 Feb 2015 18:18:21 -0800
Subject: [PATCH 08/18] Bug 1106935 - Remove new tablet branch in selecting
 default toolbar favicons. r=mhaigh

As a cleanup, this required the move of favicon -> favicon_globe and the
creation of new resources toolbar_favicon_default, which is aliased to
favicon_globe on phones.

--HG--
rename : mobile/android/base/resources/drawable-hdpi/favicon.png => mobile/android/base/resources/drawable-hdpi/favicon_globe.png
rename : mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_default_favicon.png => mobile/android/base/resources/drawable-large-hdpi-v11/toolbar_favicon_default.png
rename : mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_default_favicon.png => mobile/android/base/resources/drawable-large-mdpi-v11/toolbar_favicon_default.png
rename : mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_default_favicon.png => mobile/android/base/resources/drawable-large-xhdpi-v11/toolbar_favicon_default.png
rename : mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_default_favicon.png => mobile/android/base/resources/drawable-large-xxhdpi-v11/toolbar_favicon_default.png
rename : mobile/android/base/resources/drawable-mdpi/favicon.png => mobile/android/base/resources/drawable-mdpi/favicon_globe.png
rename : mobile/android/base/resources/drawable-xhdpi/favicon.png => mobile/android/base/resources/drawable-xhdpi/favicon_globe.png
extra : rebase_source : 8e43b8c4a04ccc8be7489385de5bd8d3f60058eb
extra : source : efa9411df1c4c1ea74fcdde7b5c3fc8a88725d79
---
 mobile/android/base/favicons/Favicons.java          |   8 +-------
 mobile/android/base/home/TopSitesGridItemView.java  |   8 +++++---
 mobile/android/base/home/TopSitesPanel.java         |   2 +-
 .../{favicon.png => favicon_globe.png}              | Bin
 ...ault_favicon.png => toolbar_favicon_default.png} | Bin
 ...ault_favicon.png => toolbar_favicon_default.png} | Bin
 .../new_tablet_site_security_unknown.xml            |   2 +-
 ...ault_favicon.png => toolbar_favicon_default.png} | Bin
 ...ault_favicon.png => toolbar_favicon_default.png} | Bin
 .../{favicon.png => favicon_globe.png}              | Bin
 .../{favicon.png => favicon_globe.png}              | Bin
 ...ault_favicon.xml => toolbar_favicon_default.xml} |   2 +-
 .../base/resources/layout/two_line_page_row.xml     |   2 +-
 mobile/android/base/tabs/TabStripItemView.java      |   2 +-
 .../android/base/toolbar/ToolbarDisplayLayout.java  |   2 +-
 mobile/android/base/widget/FaviconView.java         |   2 +-
 16 files changed, 13 insertions(+), 17 deletions(-)
 rename mobile/android/base/resources/drawable-hdpi/{favicon.png => favicon_globe.png} (100%)
 rename mobile/android/base/resources/drawable-large-hdpi-v11/{new_tablet_default_favicon.png => toolbar_favicon_default.png} (100%)
 rename mobile/android/base/resources/drawable-large-mdpi-v11/{new_tablet_default_favicon.png => toolbar_favicon_default.png} (100%)
 rename mobile/android/base/resources/drawable-large-xhdpi-v11/{new_tablet_default_favicon.png => toolbar_favicon_default.png} (100%)
 rename mobile/android/base/resources/drawable-large-xxhdpi-v11/{new_tablet_default_favicon.png => toolbar_favicon_default.png} (100%)
 rename mobile/android/base/resources/drawable-mdpi/{favicon.png => favicon_globe.png} (100%)
 rename mobile/android/base/resources/drawable-xhdpi/{favicon.png => favicon_globe.png} (100%)
 rename mobile/android/base/resources/drawable/{new_tablet_default_favicon.xml => toolbar_favicon_default.xml} (86%)

diff --git a/mobile/android/base/favicons/Favicons.java b/mobile/android/base/favicons/Favicons.java
index 8ff6ca342456..c6720165c0e6 100644
--- a/mobile/android/base/favicons/Favicons.java
+++ b/mobile/android/base/favicons/Favicons.java
@@ -450,15 +450,9 @@ public class Favicons {
             return;
         }
 
-        final boolean isNewTabletEnabled = NewTabletUI.isEnabled(context);
         final Resources res = context.getResources();
 
-        // Decode the default Favicon ready for use. We'd preferably override the drawable for
-        // different screen sizes, but since we need phone's default favicon on tablet (in
-        // ToolbarDisplayLayout), we can't.
-        final int defaultFaviconDrawableID =
-                isNewTabletEnabled ? R.drawable.new_tablet_default_favicon : R.drawable.favicon;
-        defaultFavicon = BitmapFactory.decodeResource(res, defaultFaviconDrawableID);
+        defaultFavicon = BitmapFactory.decodeResource(res, R.drawable.toolbar_favicon_default);
         if (defaultFavicon == null) {
             throw new IllegalStateException("Null default favicon was returned from the resources system!");
         }
diff --git a/mobile/android/base/home/TopSitesGridItemView.java b/mobile/android/base/home/TopSitesGridItemView.java
index 5f81d1771aec..7149bf81f754 100644
--- a/mobile/android/base/home/TopSitesGridItemView.java
+++ b/mobile/android/base/home/TopSitesGridItemView.java
@@ -35,6 +35,8 @@ public class TopSitesGridItemView extends RelativeLayout {
     private static final ScaleType SCALE_TYPE_THUMBNAIL = ScaleType.CENTER_CROP;
     private static final ScaleType SCALE_TYPE_URL       = ScaleType.CENTER_INSIDE;
 
+    private static final int THUMBNAIL_DEFAULT_FAVICON_ID = R.drawable.favicon_globe;
+
     // Child views.
     private final TextView mTitleView;
     private final TopSitesThumbnailView mThumbnailView;
@@ -216,7 +218,7 @@ public class TopSitesGridItemView extends RelativeLayout {
     public void displayThumbnail(Bitmap thumbnail) {
         if (thumbnail == null) {
             // Show a favicon based view instead.
-            displayThumbnail(R.drawable.favicon);
+            displayThumbnail(THUMBNAIL_DEFAULT_FAVICON_ID);
             return;
         }
         mThumbnailSet = true;
@@ -242,7 +244,7 @@ public class TopSitesGridItemView extends RelativeLayout {
         ImageLoader.with(getContext())
                    .load(imageUrl)
                    .noFade()
-                   .error(R.drawable.favicon)
+                   .error(THUMBNAIL_DEFAULT_FAVICON_ID)
                    .into(mThumbnailView);
     }
 
@@ -270,7 +272,7 @@ public class TopSitesGridItemView extends RelativeLayout {
 
         if (favicon == null) {
             // Should show default favicon.
-            displayThumbnail(R.drawable.favicon);
+            displayThumbnail(THUMBNAIL_DEFAULT_FAVICON_ID);
             return;
         }
 
diff --git a/mobile/android/base/home/TopSitesPanel.java b/mobile/android/base/home/TopSitesPanel.java
index f20a39b05b9a..f28c8aca7ed0 100644
--- a/mobile/android/base/home/TopSitesPanel.java
+++ b/mobile/android/base/home/TopSitesPanel.java
@@ -659,7 +659,7 @@ public class TopSitesPanel extends HomeFragment {
             }
 
             // Otherwise, do this until the async lookup returns.
-            view.displayThumbnail(R.drawable.favicon);
+            view.displayThumbnail(R.drawable.favicon_globe);
 
             // Give each side enough information to shake hands later.
             listener.setLoadId(loadId);
diff --git a/mobile/android/base/resources/drawable-hdpi/favicon.png b/mobile/android/base/resources/drawable-hdpi/favicon_globe.png
similarity index 100%
rename from mobile/android/base/resources/drawable-hdpi/favicon.png
rename to mobile/android/base/resources/drawable-hdpi/favicon_globe.png
diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_default_favicon.png b/mobile/android/base/resources/drawable-large-hdpi-v11/toolbar_favicon_default.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_default_favicon.png
rename to mobile/android/base/resources/drawable-large-hdpi-v11/toolbar_favicon_default.png
diff --git a/mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_default_favicon.png b/mobile/android/base/resources/drawable-large-mdpi-v11/toolbar_favicon_default.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_default_favicon.png
rename to mobile/android/base/resources/drawable-large-mdpi-v11/toolbar_favicon_default.png
diff --git a/mobile/android/base/resources/drawable-large-v11/new_tablet_site_security_unknown.xml b/mobile/android/base/resources/drawable-large-v11/new_tablet_site_security_unknown.xml
index 16049c41a7f6..af305ac54ade 100644
--- a/mobile/android/base/resources/drawable-large-v11/new_tablet_site_security_unknown.xml
+++ b/mobile/android/base/resources/drawable-large-v11/new_tablet_site_security_unknown.xml
@@ -7,6 +7,6 @@
      lock icons so we offset it using this drawable to compensate. -->
 <inset
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/favicon"
+    android:drawable="@drawable/favicon_globe"
     android:insetTop="@dimen/new_tablet_site_security_unknown_inset_top"
     android:insetBottom="@dimen/new_tablet_site_security_unknown_inset_bottom"/>
diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_default_favicon.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/toolbar_favicon_default.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_default_favicon.png
rename to mobile/android/base/resources/drawable-large-xhdpi-v11/toolbar_favicon_default.png
diff --git a/mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_default_favicon.png b/mobile/android/base/resources/drawable-large-xxhdpi-v11/toolbar_favicon_default.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_default_favicon.png
rename to mobile/android/base/resources/drawable-large-xxhdpi-v11/toolbar_favicon_default.png
diff --git a/mobile/android/base/resources/drawable-mdpi/favicon.png b/mobile/android/base/resources/drawable-mdpi/favicon_globe.png
similarity index 100%
rename from mobile/android/base/resources/drawable-mdpi/favicon.png
rename to mobile/android/base/resources/drawable-mdpi/favicon_globe.png
diff --git a/mobile/android/base/resources/drawable-xhdpi/favicon.png b/mobile/android/base/resources/drawable-xhdpi/favicon_globe.png
similarity index 100%
rename from mobile/android/base/resources/drawable-xhdpi/favicon.png
rename to mobile/android/base/resources/drawable-xhdpi/favicon_globe.png
diff --git a/mobile/android/base/resources/drawable/new_tablet_default_favicon.xml b/mobile/android/base/resources/drawable/toolbar_favicon_default.xml
similarity index 86%
rename from mobile/android/base/resources/drawable/new_tablet_default_favicon.xml
rename to mobile/android/base/resources/drawable/toolbar_favicon_default.xml
index d3e7c7917252..92e294fb3bc7 100644
--- a/mobile/android/base/resources/drawable/new_tablet_default_favicon.xml
+++ b/mobile/android/base/resources/drawable/toolbar_favicon_default.xml
@@ -4,4 +4,4 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@null"/>
+        android:src="@drawable/favicon_globe" />
diff --git a/mobile/android/base/resources/layout/two_line_page_row.xml b/mobile/android/base/resources/layout/two_line_page_row.xml
index 617fcf47479a..a36472ed677b 100644
--- a/mobile/android/base/resources/layout/two_line_page_row.xml
+++ b/mobile/android/base/resources/layout/two_line_page_row.xml
@@ -12,7 +12,7 @@
                                           android:layout_width="@dimen/favicon_bg"
                                           android:layout_height="@dimen/favicon_bg"
                                           android:layout_margin="16dp"
-                                          tools:background="@drawable/favicon"/>
+                                          tools:background="@drawable/favicon_globe"/>
 
     <LinearLayout android:layout_width="match_parent"
                   android:layout_height="wrap_content"
diff --git a/mobile/android/base/tabs/TabStripItemView.java b/mobile/android/base/tabs/TabStripItemView.java
index db1cacb65eec..cb4347b0e308 100644
--- a/mobile/android/base/tabs/TabStripItemView.java
+++ b/mobile/android/base/tabs/TabStripItemView.java
@@ -209,7 +209,7 @@ public class TabStripItemView extends ThemedLinearLayout
     private void updateFavicon(final Bitmap favicon) {
         if (favicon == null) {
             lastFavicon = null;
-            faviconView.setImageResource(R.drawable.new_tablet_default_favicon);
+            faviconView.setImageResource(R.drawable.toolbar_favicon_default);
             return;
         }
         if (favicon == lastFavicon) {
diff --git a/mobile/android/base/toolbar/ToolbarDisplayLayout.java b/mobile/android/base/toolbar/ToolbarDisplayLayout.java
index 8c7bfe56976f..455a6a90af77 100644
--- a/mobile/android/base/toolbar/ToolbarDisplayLayout.java
+++ b/mobile/android/base/toolbar/ToolbarDisplayLayout.java
@@ -409,7 +409,7 @@ public class ToolbarDisplayLayout extends ThemedLinearLayout
             image = Bitmap.createScaledBitmap(image, mFaviconSize, mFaviconSize, false);
             mFavicon.setImageBitmap(image);
         } else {
-            mFavicon.setImageResource(R.drawable.favicon);
+            mFavicon.setImageResource(R.drawable.favicon_globe);
         }
     }
 
diff --git a/mobile/android/base/widget/FaviconView.java b/mobile/android/base/widget/FaviconView.java
index ef3924c84b70..799240dcda6c 100644
--- a/mobile/android/base/widget/FaviconView.java
+++ b/mobile/android/base/widget/FaviconView.java
@@ -214,7 +214,7 @@ public class FaviconView extends ImageView {
     }
 
     public void showDefaultFavicon() {
-        setImageResource(R.drawable.favicon);
+        setImageResource(R.drawable.favicon_globe);
         mDominantColor = 0;
     }
 

From 7ecfaef531d029a06c15a4bdd222d9323fcc12c2 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Tue, 3 Feb 2015 17:43:40 -0800
Subject: [PATCH 09/18] Bug 1106935 - Remove new tablet favicon size branch
 from Favicons. r=mhaigh

--HG--
extra : rebase_source : 20e15f7647a90b8ad8df6488d121b18b82079cd5
extra : source : f292df38d7eb785980cb35ef3e2e2b93756934db
---
 mobile/android/base/favicons/Favicons.java                   | 5 +----
 .../base/resources/layout-large-v11/tab_strip_item_view.xml  | 2 +-
 mobile/android/base/resources/values-large-v11/dimens.xml    | 1 +
 mobile/android/base/resources/values/dimens.xml              | 1 -
 mobile/android/base/tabs/TabStripItemView.java               | 2 +-
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/mobile/android/base/favicons/Favicons.java b/mobile/android/base/favicons/Favicons.java
index c6720165c0e6..dd80dd98620b 100644
--- a/mobile/android/base/favicons/Favicons.java
+++ b/mobile/android/base/favicons/Favicons.java
@@ -463,10 +463,7 @@ public class Favicons {
         // downscaled to this size or discarded.
         largestFaviconSize = res.getDimensionPixelSize(R.dimen.favicon_largest_interesting_size);
 
-        // TODO: Remove this branch when old tablet is removed.
-        final int browserToolbarFaviconSizeDimenID = NewTabletUI.isEnabled(context) ?
-                R.dimen.new_tablet_tab_strip_favicon_size : R.dimen.browser_toolbar_favicon_size;
-        browserToolbarFaviconSize = res.getDimensionPixelSize(browserToolbarFaviconSizeDimenID);
+        browserToolbarFaviconSize = res.getDimensionPixelSize(R.dimen.browser_toolbar_favicon_size);
 
         faviconsCache = new FaviconCache(FAVICON_CACHE_SIZE_BYTES, largestFaviconSize);
 
diff --git a/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml b/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml
index cbe41f6f3b4e..a3e4d271b77f 100644
--- a/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml
+++ b/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml
@@ -8,7 +8,7 @@
 
    <ImageView
         android:id="@+id/favicon"
-        android:layout_width="@dimen/new_tablet_tab_strip_favicon_size"
+        android:layout_width="@dimen/browser_toolbar_favicon_size"
         android:layout_height="match_parent"
         android:layout_marginRight="8dp"
         android:scaleType="centerInside"
diff --git a/mobile/android/base/resources/values-large-v11/dimens.xml b/mobile/android/base/resources/values-large-v11/dimens.xml
index 4c8abc9b08f0..801798df2407 100644
--- a/mobile/android/base/resources/values-large-v11/dimens.xml
+++ b/mobile/android/base/resources/values-large-v11/dimens.xml
@@ -7,6 +7,7 @@
 
     <dimen name="browser_toolbar_height">56dp</dimen>
     <dimen name="browser_toolbar_button_padding">16dp</dimen>
+    <dimen name="browser_toolbar_favicon_size">16dp</dimen>
 
     <dimen name="tabs_counter_size">26sp</dimen>
     <dimen name="panel_grid_view_column_width">200dp</dimen>
diff --git a/mobile/android/base/resources/values/dimens.xml b/mobile/android/base/resources/values/dimens.xml
index a8459f60c9a6..ff0509b47f15 100644
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -29,7 +29,6 @@
     <dimen name="new_tablet_tab_strip_height">48dp</dimen>
     <dimen name="new_tablet_tab_strip_item_width">208dp</dimen>
     <dimen name="new_tablet_tab_strip_item_margin">-28dp</dimen>
-    <dimen name="new_tablet_tab_strip_favicon_size">16dp</dimen>
     <dimen name="new_tablet_tab_strip_fading_edge_size">15dp</dimen>
     <dimen name="new_tablet_site_security_height">60dp</dimen>
     <dimen name="new_tablet_site_security_width">34dp</dimen>
diff --git a/mobile/android/base/tabs/TabStripItemView.java b/mobile/android/base/tabs/TabStripItemView.java
index cb4347b0e308..a4c0f092c8d2 100644
--- a/mobile/android/base/tabs/TabStripItemView.java
+++ b/mobile/android/base/tabs/TabStripItemView.java
@@ -71,7 +71,7 @@ public class TabStripItemView extends ThemedLinearLayout
         backgroundDrawable = new ResizablePathDrawable(new TabCurveShape(), tabColors);
         setBackgroundDrawable(backgroundDrawable);
 
-        faviconSize = res.getDimensionPixelSize(R.dimen.new_tablet_tab_strip_favicon_size);
+        faviconSize = res.getDimensionPixelSize(R.dimen.browser_toolbar_favicon_size);
 
         LayoutInflater.from(context).inflate(R.layout.tab_strip_item_view, this);
         setOnClickListener(new View.OnClickListener() {

From 07299502009748d1913c87d34aa3d5424a51117a Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Tue, 3 Feb 2015 17:13:19 -0800
Subject: [PATCH 10/18] Bug 1106935 - Remove new tablet branch in
 GeckoMenuInflater. r=mhaigh

--HG--
extra : rebase_source : f9a32c335ff19dc43f828bb20b833a4f546afc6f
extra : source : 319511aa757a5b3615b13bb86c62db3b4f4f17f2
---
 mobile/android/base/menu/GeckoMenuInflater.java | 17 +----------------
 .../menu-large-v11/browser_app_menu.xml         |  2 +-
 .../menu-xlarge-v11/browser_app_menu.xml        |  4 ++--
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/mobile/android/base/menu/GeckoMenuInflater.java b/mobile/android/base/menu/GeckoMenuInflater.java
index 3ca02ce7a645..e8558b7263c5 100644
--- a/mobile/android/base/menu/GeckoMenuInflater.java
+++ b/mobile/android/base/menu/GeckoMenuInflater.java
@@ -131,22 +131,7 @@ public class GeckoMenuInflater extends MenuInflater {
         item.visible = a.getBoolean(R.styleable.MenuItem_android_visible, true);
         item.enabled = a.getBoolean(R.styleable.MenuItem_android_enabled, true);
         item.hasSubMenu = false;
-
-        // TODO: (bug 1058909) Remove this branch when we remove old tablet. We do this to
-        // avoid using a new menu resource for new tablet.
-        final int iconResID;
-        if (!NewTabletUI.isEnabled(mContext)) {
-            iconResID = a.getResourceId(R.styleable.MenuItem_android_icon, 0);
-        } else {
-            if (item.id == R.id.reload) {
-                iconResID = R.drawable.new_tablet_ic_menu_reload;
-            } else if (HardwareUtils.isLargeTablet() && item.id == R.id.bookmark) {
-                iconResID = R.drawable.new_tablet_ic_menu_bookmark_add;
-            } else {
-                iconResID = a.getResourceId(R.styleable.MenuItem_android_icon, 0);
-            }
-        }
-        item.iconRes = iconResID;
+        item.iconRes = a.getResourceId(R.styleable.MenuItem_android_icon, 0);
 
         if (Versions.feature11Plus) {
             item.showAsAction = a.getInt(R.styleable.MenuItem_android_showAsAction, 0);
diff --git a/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml b/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml
index 5ec04538a95c..224be758e6d7 100644
--- a/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml
+++ b/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml
@@ -6,7 +6,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:id="@+id/reload"
-          android:icon="@drawable/ic_menu_reload"
+          android:icon="@drawable/new_tablet_ic_menu_reload"
           android:title="@string/reload"
           android:showAsAction="always"/>
 
diff --git a/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml b/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
index dd4299a3df41..896477822e3a 100644
--- a/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
+++ b/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
@@ -6,7 +6,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:id="@+id/reload"
-          android:icon="@drawable/ic_menu_reload"
+          android:icon="@drawable/new_tablet_ic_menu_reload"
           android:title="@string/reload"
           android:showAsAction="always"/>
 
@@ -21,7 +21,7 @@
           android:visible="false"/>
 
     <item android:id="@+id/bookmark"
-          android:icon="@drawable/ic_menu_bookmark_add"
+          android:icon="@drawable/new_tablet_ic_menu_bookmark_add"
           android:title="@string/bookmark"
           android:showAsAction="always"/>
 

From 706e1973a01703ae74f484371855c35fba249a95 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Tue, 3 Feb 2015 17:03:45 -0800
Subject: [PATCH 11/18] Bug 1106935 - Remove MOZ_ANDROID_NEW_TABLET_UI confvar.
 r=nalexander

--HG--
extra : rebase_source : 10d7065f143f287737213c8de96f824a5ba776ac
extra : source : 78cb4369b3963aabac55172e3eac88010f67ffe3
---
 mobile/android/base/moz.build | 4 ++--
 mobile/android/confvars.sh    | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 9237e5c3309f..8523cf4af4eb 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -560,7 +560,7 @@ else:
 
 # Only bother to include new tablet code if we're building for tablet-capable
 # OS releases.
-if CONFIG['MOZ_ANDROID_NEW_TABLET_UI'] and max_sdk_version >= 11:
+if max_sdk_version >= 11:
     gbjar.sources += [
         'tabs/TabStrip.java',
         'tabs/TabStripAdapter.java',
@@ -684,7 +684,7 @@ ANDROID_GENERATED_RESFILES += [
 for var in ('MOZ_ANDROID_ANR_REPORTER', 'MOZ_LINKER_EXTRACT', 'MOZILLA_OFFICIAL', 'MOZ_DEBUG',
             'MOZ_ANDROID_SEARCH_ACTIVITY', 'MOZ_NATIVE_DEVICES', 'MOZ_ANDROID_MLS_STUMBLER',
             'MOZ_ANDROID_SHARE_OVERLAY', 'MOZ_ANDROID_DOWNLOADS_INTEGRATION',
-            'MOZ_ANDROID_NEW_TABLET_UI', 'MOZ_ANDROID_TAB_QUEUE'):
+            'MOZ_ANDROID_TAB_QUEUE'):
     if CONFIG[var]:
         DEFINES[var] = 1
 
diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index e49bf99a17bb..570a78b36ae7 100644
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -76,9 +76,6 @@ MOZ_WEBGL_CONFORMANT=1
 # Enable the Search Activity.
 MOZ_ANDROID_SEARCH_ACTIVITY=1
 
-# Use the new tablet UI. This will go away in Bug 1106935.
-MOZ_ANDROID_NEW_TABLET_UI=1
-
 # Enable the share handler.
 MOZ_ANDROID_SHARE_OVERLAY=1
 

From 30de5773074038fe2982ca51a7c88f563394c9e1 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Tue, 3 Feb 2015 16:54:39 -0800
Subject: [PATCH 12/18] Bug 1106935 - Move BrowserToolbarTablet menu button
 right margin hack to xml. r=mhaigh

We couldn't do this before because the button declaration was shared by old and
new tablet - this is no longer a problem now that old tablet is no longer in
use.

--HG--
extra : rebase_source : 4b60fe6ca371e783c8cc648568b8af7ec8791396
extra : source : fb066050757e614338dd185e6f99cfdbdbf818ec
---
 .../resources/layout-large-v11/browser_toolbar.xml    |  1 +
 mobile/android/base/resources/values/dimens.xml       |  1 -
 mobile/android/base/toolbar/BrowserToolbarTablet.java | 11 -----------
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
index 57300bd0f753..98412e60378c 100644
--- a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
@@ -82,6 +82,7 @@
             android:id="@+id/menu"
             style="@style/UrlBar.ImageButton.NewTablet"
             android:layout_alignParentRight="true"
+            android:layout_marginRight="6dp"
             android:contentDescription="@string/menu"
             android:background="@drawable/new_tablet_action_bar_button"
             android:visibility="gone"/>
diff --git a/mobile/android/base/resources/values/dimens.xml b/mobile/android/base/resources/values/dimens.xml
index ff0509b47f15..e8f50f46294d 100644
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -37,7 +37,6 @@
     <dimen name="new_tablet_site_security_padding_horizontal">8dp</dimen>
     <dimen name="new_tablet_site_security_right_margin">1dp</dimen>
     <dimen name="new_tablet_browser_toolbar_height">60dp</dimen>
-    <dimen name="new_tablet_browser_toolbar_menu_right_margin">6dp</dimen>
     <dimen name="new_tablet_browser_toolbar_menu_item_width">56dp</dimen>
     <!-- Padding combines with an 18dp image to form the menu item width and height. -->
     <dimen name="new_tablet_browser_toolbar_menu_item_padding_horizontal">19dp</dimen>
diff --git a/mobile/android/base/toolbar/BrowserToolbarTablet.java b/mobile/android/base/toolbar/BrowserToolbarTablet.java
index 1fa78719ccc0..40fe4826ce26 100644
--- a/mobile/android/base/toolbar/BrowserToolbarTablet.java
+++ b/mobile/android/base/toolbar/BrowserToolbarTablet.java
@@ -10,7 +10,6 @@ import org.mozilla.gecko.animation.PropertyAnimator;
 import org.mozilla.gecko.animation.ViewHelper;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 
@@ -51,16 +50,6 @@ class BrowserToolbarTablet extends BrowserToolbarTabletBase {
         setButtonEnabled(forwardButton, true);
 
         updateForwardButtonState(ForwardButtonState.HIDDEN);
-
-        setRightMargin();
-    }
-
-    private void setRightMargin() {
-        // TODO: Remove this hack in favor of resources when old tablet is removed.
-        final Resources res = getContext().getResources();
-        final int rightMargin =
-                res.getDimensionPixelOffset(R.dimen.new_tablet_browser_toolbar_menu_right_margin);
-        setPadding(getPaddingLeft(), getPaddingTop(), rightMargin, getPaddingBottom());
     }
 
     private void updateForwardButtonState(final ForwardButtonState state) {

From 1432a025c9d90fefde1270f28c61a687cb617bf0 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Tue, 3 Feb 2015 16:31:15 -0800
Subject: [PATCH 13/18] Bug 1106935 - Remove new tablet branch in
 MenuItemActionBar. r=mhaigh

--HG--
extra : rebase_source : 5a3e142c517c00c224c21f22f61271fc4ea36aac
extra : source : 9080887b3cc4a922a8721ca4a32134d886a27025
---
 mobile/android/base/menu/MenuItemActionBar.java   |  4 +---
 .../base/resources/values-large-v11/styles.xml    | 15 +--------------
 .../base/resources/values-large-v11/themes.xml    |  1 -
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/mobile/android/base/menu/MenuItemActionBar.java b/mobile/android/base/menu/MenuItemActionBar.java
index 488aa7bd2653..5c8e667fb358 100644
--- a/mobile/android/base/menu/MenuItemActionBar.java
+++ b/mobile/android/base/menu/MenuItemActionBar.java
@@ -22,9 +22,7 @@ public class MenuItemActionBar extends ThemedImageButton
     }
 
     public MenuItemActionBar(Context context, AttributeSet attrs) {
-        // TODO: Remove this branch (and associated attr) when old tablet is removed.
-        this(context, attrs, (NewTabletUI.isEnabled(context)) ?
-                R.attr.menuItemActionBarStyleNewTablet : R.attr.menuItemActionBarStyle);
+        this(context, attrs, R.attr.menuItemActionBarStyle);
     }
 
     public MenuItemActionBar(Context context, AttributeSet attrs, int defStyle) {
diff --git a/mobile/android/base/resources/values-large-v11/styles.xml b/mobile/android/base/resources/values-large-v11/styles.xml
index 306cd4bc6d4a..4c1f17322211 100644
--- a/mobile/android/base/resources/values-large-v11/styles.xml
+++ b/mobile/android/base/resources/values-large-v11/styles.xml
@@ -75,23 +75,10 @@
     </style>
 
     <style name="Widget.MenuItemActionBar">
-        <item name="android:layout_width">@dimen/browser_toolbar_height</item>
-        <item name="android:layout_height">@dimen/browser_toolbar_height</item>
-        <item name="android:background">@drawable/action_bar_button</item>
-        <item name="android:scaleType">fitCenter</item>
-
-        <!-- We split up padding* because we can't override it in *.NewTablet otherwise. -->
-        <item name="android:paddingTop">@dimen/browser_toolbar_button_padding</item>
-        <item name="android:paddingBottom">@dimen/browser_toolbar_button_padding</item>
-        <item name="android:paddingLeft">@dimen/browser_toolbar_button_padding</item>
-        <item name="android:paddingRight">@dimen/browser_toolbar_button_padding</item>
-    </style>
-
-    <style name="Widget.MenuItemActionBar.NewTablet">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:scaleType">center</item>
         <item name="android:background">@drawable/new_tablet_action_bar_button</item>
+        <item name="android:scaleType">center</item>
 
         <!-- layout_width/height doesn't work here, likely because it's
              an ImageButton, so we use padding instead.
diff --git a/mobile/android/base/resources/values-large-v11/themes.xml b/mobile/android/base/resources/values-large-v11/themes.xml
index b4a3fea5c2d9..f9a32b91ad08 100644
--- a/mobile/android/base/resources/values-large-v11/themes.xml
+++ b/mobile/android/base/resources/values-large-v11/themes.xml
@@ -14,7 +14,6 @@
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
         <item name="arrowPopupWidth">400dp</item>
-        <item name="menuItemActionBarStyleNewTablet">@style/Widget.MenuItemActionBar.NewTablet</item>
     </style>
 
     <style name="GeckoStartPane" parent="Gecko.Dialog"/>

From 0a8101c414675cf9fec0cee1dfa4a6fae90ed221 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Wed, 18 Feb 2015 15:34:13 -0800
Subject: [PATCH 14/18] Bug 1106935 - Get bitmap from Drawable, rather than
 BitmapFactory. r=rnewman

BitmapFactory seemingly can't handle resource aliases:

http://stackoverflow.com/a/14553767

Note that this bug affected all phone devices, not just 2.3.

Also removed some unused imports while I was at it.

--HG--
extra : rebase_source : e8385a3d132176913922a182f6562618629d3d3c
---
 mobile/android/base/favicons/Favicons.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/mobile/android/base/favicons/Favicons.java b/mobile/android/base/favicons/Favicons.java
index dd80dd98620b..afb2a86e72ae 100644
--- a/mobile/android/base/favicons/Favicons.java
+++ b/mobile/android/base/favicons/Favicons.java
@@ -5,10 +5,9 @@
 
 package org.mozilla.gecko.favicons;
 
+import android.graphics.drawable.Drawable;
 import org.mozilla.gecko.AboutPages;
-import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.GeckoAppShell;
-import org.mozilla.gecko.NewTabletUI;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
@@ -23,11 +22,11 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
 
-import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Arrays;
@@ -452,9 +451,11 @@ public class Favicons {
 
         final Resources res = context.getResources();
 
-        defaultFavicon = BitmapFactory.decodeResource(res, R.drawable.toolbar_favicon_default);
-        if (defaultFavicon == null) {
-            throw new IllegalStateException("Null default favicon was returned from the resources system!");
+        final Drawable defaultFaviconDrawable = res.getDrawable(R.drawable.toolbar_favicon_default);
+        if (defaultFaviconDrawable instanceof BitmapDrawable) {
+            defaultFavicon = ((BitmapDrawable) defaultFaviconDrawable).getBitmap();
+        } else {
+            throw new IllegalStateException("toolbar_favicon_default wasn't a bitmap resource!");
         }
 
         defaultFaviconSize = res.getDimensionPixelSize(R.dimen.favicon_bg);

From 2b0e4efb61241fdbc7723e6f521ff09817e08f83 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Wed, 18 Feb 2015 14:23:19 -0800
Subject: [PATCH 15/18] Bug 1133770 - Display the selected tab in the tab strip
 on device rotation. r=mhaigh

This does not always work in the case that one of the last few tabs (to the
right) are selected and the device is rotated from landscape to portrait.
Filed bug 1134408 to track this.

--HG--
extra : rebase_source : f9071610c50fc344d55e54876252c7e2cdca09bd
---
 mobile/android/base/BrowserApp.java        |  8 +++++++-
 mobile/android/base/tabs/TabStrip.java     |  4 ++++
 mobile/android/base/tabs/TabStripView.java | 17 ++++++++++++++---
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 6ccb665ef02f..d4a5a6d01dae 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -66,6 +66,7 @@ import org.mozilla.gecko.sync.setup.SyncAccounts;
 import org.mozilla.gecko.tabs.TabHistoryController;
 import org.mozilla.gecko.tabs.TabHistoryFragment;
 import org.mozilla.gecko.tabs.TabHistoryPage;
+import org.mozilla.gecko.tabs.TabStrip;
 import org.mozilla.gecko.tabs.TabsPanel;
 import org.mozilla.gecko.tabs.TabHistoryController.OnShowTabHistory;
 import org.mozilla.gecko.toolbar.AutocompleteHandler;
@@ -176,6 +177,7 @@ public class BrowserApp extends GeckoApp
     public ViewFlipper mActionBarFlipper;
     public ActionModeCompatView mActionBar;
     private BrowserToolbar mBrowserToolbar;
+    private TabStrip mTabStrip;
     private ToolbarProgressView mProgressView;
     private FirstrunPane mFirstrunPane;
     private HomePager mHomePager;
@@ -721,7 +723,7 @@ public class BrowserApp extends GeckoApp
         }
 
         if (HardwareUtils.isTablet()) {
-            findViewById(R.id.new_tablet_tab_strip).setVisibility(View.VISIBLE);
+            mTabStrip = (TabStrip) (((ViewStub) findViewById(R.id.new_tablet_tab_strip)).inflate());
         }
 
         ((GeckoApp.MainLayout) mMainLayout).setTouchEventInterceptor(new HideOnTouchListener());
@@ -1530,6 +1532,10 @@ public class BrowserApp extends GeckoApp
             mTabsPanel.refresh();
         }
 
+        if (mTabStrip != null) {
+            mTabStrip.refresh();
+        }
+
         mBrowserToolbar.refresh();
     }
 
diff --git a/mobile/android/base/tabs/TabStrip.java b/mobile/android/base/tabs/TabStrip.java
index a58ec6187852..f58b1df01d57 100644
--- a/mobile/android/base/tabs/TabStrip.java
+++ b/mobile/android/base/tabs/TabStrip.java
@@ -128,6 +128,10 @@ public class TabStrip extends ThemedLinearLayout {
         }
     }
 
+    public void refresh() {
+        tabStripView.refresh();
+    }
+
     @Override
     public void onLightweightThemeChanged() {
         final Drawable drawable = getTheme().getDrawable(this);
diff --git a/mobile/android/base/tabs/TabStripView.java b/mobile/android/base/tabs/TabStripView.java
index 7a7a0d16364d..8d805dc62696 100644
--- a/mobile/android/base/tabs/TabStripView.java
+++ b/mobile/android/base/tabs/TabStripView.java
@@ -102,7 +102,7 @@ public class TabStripView extends TwoWayView {
             updateSelectedStyle(selected);
 
             if (ensureVisible) {
-                ensurePositionIsVisible(selected);
+                ensurePositionIsVisible(selected, true);
             }
         }
     }
@@ -239,10 +239,14 @@ public class TabStripView extends TwoWayView {
         });
     }
 
-    private void ensurePositionIsVisible(final int position) {
+    /**
+     * Ensures the tab at the given position is visible. If we are not restoring tabs and
+     * shouldAnimate == true, the tab will animate to be visible, if it is not already visible.
+     */
+    private void ensurePositionIsVisible(final int position, final boolean shouldAnimate) {
         // We just want to move the strip to the right position
         // when restoring tabs on startup.
-        if (isRestoringTabs) {
+        if (isRestoringTabs || !shouldAnimate) {
             setSelection(position);
             return;
         }
@@ -414,6 +418,13 @@ public class TabStripView extends TwoWayView {
         drawFadingEdge(canvas);
     }
 
+    public void refresh() {
+        final int selectedPosition = getPositionForSelectedTab();
+        if (selectedPosition != -1) {
+            ensurePositionIsVisible(selectedPosition, false);
+        }
+    }
+
     private class TabAnimatorListener implements AnimatorListener {
         private void setLayerType(int layerType) {
             final int childCount = getChildCount();

From 88cbae6a9838416365d0150fdf7ae081f61c626a Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 19 Feb 2015 13:56:59 -0500
Subject: [PATCH 16/18] Backed out changeset e755879c138c (bug 1133770) for
 bustage. CLOSED TREE DONTBUILD

---
 mobile/android/base/BrowserApp.java        |  8 +-------
 mobile/android/base/tabs/TabStrip.java     |  4 ----
 mobile/android/base/tabs/TabStripView.java | 17 +++--------------
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index d4a5a6d01dae..6ccb665ef02f 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -66,7 +66,6 @@ import org.mozilla.gecko.sync.setup.SyncAccounts;
 import org.mozilla.gecko.tabs.TabHistoryController;
 import org.mozilla.gecko.tabs.TabHistoryFragment;
 import org.mozilla.gecko.tabs.TabHistoryPage;
-import org.mozilla.gecko.tabs.TabStrip;
 import org.mozilla.gecko.tabs.TabsPanel;
 import org.mozilla.gecko.tabs.TabHistoryController.OnShowTabHistory;
 import org.mozilla.gecko.toolbar.AutocompleteHandler;
@@ -177,7 +176,6 @@ public class BrowserApp extends GeckoApp
     public ViewFlipper mActionBarFlipper;
     public ActionModeCompatView mActionBar;
     private BrowserToolbar mBrowserToolbar;
-    private TabStrip mTabStrip;
     private ToolbarProgressView mProgressView;
     private FirstrunPane mFirstrunPane;
     private HomePager mHomePager;
@@ -723,7 +721,7 @@ public class BrowserApp extends GeckoApp
         }
 
         if (HardwareUtils.isTablet()) {
-            mTabStrip = (TabStrip) (((ViewStub) findViewById(R.id.new_tablet_tab_strip)).inflate());
+            findViewById(R.id.new_tablet_tab_strip).setVisibility(View.VISIBLE);
         }
 
         ((GeckoApp.MainLayout) mMainLayout).setTouchEventInterceptor(new HideOnTouchListener());
@@ -1532,10 +1530,6 @@ public class BrowserApp extends GeckoApp
             mTabsPanel.refresh();
         }
 
-        if (mTabStrip != null) {
-            mTabStrip.refresh();
-        }
-
         mBrowserToolbar.refresh();
     }
 
diff --git a/mobile/android/base/tabs/TabStrip.java b/mobile/android/base/tabs/TabStrip.java
index f58b1df01d57..a58ec6187852 100644
--- a/mobile/android/base/tabs/TabStrip.java
+++ b/mobile/android/base/tabs/TabStrip.java
@@ -128,10 +128,6 @@ public class TabStrip extends ThemedLinearLayout {
         }
     }
 
-    public void refresh() {
-        tabStripView.refresh();
-    }
-
     @Override
     public void onLightweightThemeChanged() {
         final Drawable drawable = getTheme().getDrawable(this);
diff --git a/mobile/android/base/tabs/TabStripView.java b/mobile/android/base/tabs/TabStripView.java
index 8d805dc62696..7a7a0d16364d 100644
--- a/mobile/android/base/tabs/TabStripView.java
+++ b/mobile/android/base/tabs/TabStripView.java
@@ -102,7 +102,7 @@ public class TabStripView extends TwoWayView {
             updateSelectedStyle(selected);
 
             if (ensureVisible) {
-                ensurePositionIsVisible(selected, true);
+                ensurePositionIsVisible(selected);
             }
         }
     }
@@ -239,14 +239,10 @@ public class TabStripView extends TwoWayView {
         });
     }
 
-    /**
-     * Ensures the tab at the given position is visible. If we are not restoring tabs and
-     * shouldAnimate == true, the tab will animate to be visible, if it is not already visible.
-     */
-    private void ensurePositionIsVisible(final int position, final boolean shouldAnimate) {
+    private void ensurePositionIsVisible(final int position) {
         // We just want to move the strip to the right position
         // when restoring tabs on startup.
-        if (isRestoringTabs || !shouldAnimate) {
+        if (isRestoringTabs) {
             setSelection(position);
             return;
         }
@@ -418,13 +414,6 @@ public class TabStripView extends TwoWayView {
         drawFadingEdge(canvas);
     }
 
-    public void refresh() {
-        final int selectedPosition = getPositionForSelectedTab();
-        if (selectedPosition != -1) {
-            ensurePositionIsVisible(selectedPosition, false);
-        }
-    }
-
     private class TabAnimatorListener implements AnimatorListener {
         private void setLayerType(int layerType) {
             final int childCount = getChildCount();

From 8ee21641097cb997d2ffc154b1612cbad1f7988b Mon Sep 17 00:00:00 2001
From: Shane Caraveo <scaraveo@mozilla.com>
Date: Thu, 19 Feb 2015 11:27:27 -0800
Subject: [PATCH 17/18] Bug 1134315 revert prior fix

---
 toolkit/components/social/SocialService.jsm | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/toolkit/components/social/SocialService.jsm b/toolkit/components/social/SocialService.jsm
index 449ab4f40aba..c5aaab7fdec9 100644
--- a/toolkit/components/social/SocialService.jsm
+++ b/toolkit/components/social/SocialService.jsm
@@ -160,9 +160,9 @@ function getOriginActivationType(origin) {
 
   let directories = Services.prefs.getCharPref("social.directories").split(',');
   if (directories.indexOf(origin) >= 0)
-    return "directory";
+    return 'directory';
 
-  return "foreign";
+  return 'foreign';
 }
 
 let ActiveProviders = {
@@ -549,15 +549,9 @@ this.SocialService = {
     let brandBundle = Services.strings.createBundle("chrome://branding/locale/brand.properties");
     let browserBundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
 
-
-    // foreign activation uses the activation url for origin, directory or
-    // internal (in-product) activations use the origin defined in the manifest
-    let url = data.installType == "foreign" ?
-            data.url :
-            data.installType == "directory" ||
-            data.installType == "internal" ?
-              data.manifest.origin : undefined;
-    let requestingURI = Services.io.newURI(url, null, null);
+    // internal activation does not have a host, use the manifest origin in that case
+    let requestingURI =  Services.io.newURI(data.installType == "internal" ?
+                                            data.manifest.origin : data.url, null, null);
     let productName = brandBundle.GetStringFromName("brandShortName");
 
     let message = browserBundle.formatStringFromName("service.install.description",

From 9116f1284593dfd5fd16997265e3d4449c49be71 Mon Sep 17 00:00:00 2001
From: Shane Caraveo <scaraveo@mozilla.com>
Date: Thu, 19 Feb 2015 11:27:27 -0800
Subject: [PATCH 18/18] Bug 1134315 fix domain origin displayed in activation
 panel for directory, r=jaws

---
 toolkit/components/social/SocialService.jsm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/toolkit/components/social/SocialService.jsm b/toolkit/components/social/SocialService.jsm
index c5aaab7fdec9..fd238fd1d09a 100644
--- a/toolkit/components/social/SocialService.jsm
+++ b/toolkit/components/social/SocialService.jsm
@@ -160,9 +160,9 @@ function getOriginActivationType(origin) {
 
   let directories = Services.prefs.getCharPref("social.directories").split(',');
   if (directories.indexOf(origin) >= 0)
-    return 'directory';
+    return "directory";
 
-  return 'foreign';
+  return "foreign";
 }
 
 let ActiveProviders = {
@@ -549,9 +549,13 @@ this.SocialService = {
     let brandBundle = Services.strings.createBundle("chrome://branding/locale/brand.properties");
     let browserBundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
 
-    // internal activation does not have a host, use the manifest origin in that case
-    let requestingURI =  Services.io.newURI(data.installType == "internal" ?
-                                            data.manifest.origin : data.url, null, null);
+    // internal/directory activations need to use the manifest origin, any other
+    // use the domain activation is occurring on
+    let url = data.url;
+    if (data.installType == "internal" || data.installType == "directory") {
+      url = data.manifest.origin;
+    }
+    let requestingURI =  Services.io.newURI(url, null, null);
     let productName = brandBundle.GetStringFromName("brandShortName");
 
     let message = browserBundle.formatStringFromName("service.install.description",