From 6a7273f4d44830c3c206f6e68ee8bb1c29fe4340 Mon Sep 17 00:00:00 2001
From: Heather Arthur <fayearthur@gmail.com>
Date: Sat, 15 Mar 2014 10:31:30 -0700
Subject: [PATCH 01/17] Bug 983892 - Inspector Box model tab's background
 should be light to match light theme; r=vporof

---
 browser/devtools/layoutview/view.xhtml         | 2 +-
 browser/themes/linux/devtools/layoutview.css   | 8 ++------
 browser/themes/osx/devtools/layoutview.css     | 8 ++------
 browser/themes/windows/devtools/layoutview.css | 8 ++------
 4 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/browser/devtools/layoutview/view.xhtml b/browser/devtools/layoutview/view.xhtml
index 7c860528107..6a897f82b58 100644
--- a/browser/devtools/layoutview/view.xhtml
+++ b/browser/devtools/layoutview/view.xhtml
@@ -22,7 +22,7 @@
     <link rel="stylesheet" href="view.css" type="text/css"/>
 
   </head>
-  <body class="theme-body devtools-monospace">
+  <body class="theme-sidebar devtools-monospace">
 
     <p id="header">
       <span id="element-size"></span><span id="element-position"></span>
diff --git a/browser/themes/linux/devtools/layoutview.css b/browser/themes/linux/devtools/layoutview.css
index 64ff0d2d0f5..4e2ab5e83b6 100644
--- a/browser/themes/linux/devtools/layoutview.css
+++ b/browser/themes/linux/devtools/layoutview.css
@@ -2,15 +2,11 @@
  * 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/. */
 
-.theme-dark .theme-body {
+.theme-dark .theme-sidebar {
   background-image: url(layout-background-grid.png);
 }
 
-.theme-light .theme-body {
-  background-image: url(layout-background-grid.png), radial-gradient(circle at 50% 70%, hsl(210,53%,45%) 0%, hsl(210,54%,33%) 100%);
-}
-
-.theme-body {
+.theme-sidebar {
   color: hsl(210,53%,45%) !important;
   box-sizing: border-box;
 }
diff --git a/browser/themes/osx/devtools/layoutview.css b/browser/themes/osx/devtools/layoutview.css
index 64ff0d2d0f5..4e2ab5e83b6 100644
--- a/browser/themes/osx/devtools/layoutview.css
+++ b/browser/themes/osx/devtools/layoutview.css
@@ -2,15 +2,11 @@
  * 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/. */
 
-.theme-dark .theme-body {
+.theme-dark .theme-sidebar {
   background-image: url(layout-background-grid.png);
 }
 
-.theme-light .theme-body {
-  background-image: url(layout-background-grid.png), radial-gradient(circle at 50% 70%, hsl(210,53%,45%) 0%, hsl(210,54%,33%) 100%);
-}
-
-.theme-body {
+.theme-sidebar {
   color: hsl(210,53%,45%) !important;
   box-sizing: border-box;
 }
diff --git a/browser/themes/windows/devtools/layoutview.css b/browser/themes/windows/devtools/layoutview.css
index 64ff0d2d0f5..4e2ab5e83b6 100644
--- a/browser/themes/windows/devtools/layoutview.css
+++ b/browser/themes/windows/devtools/layoutview.css
@@ -2,15 +2,11 @@
  * 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/. */
 
-.theme-dark .theme-body {
+.theme-dark .theme-sidebar {
   background-image: url(layout-background-grid.png);
 }
 
-.theme-light .theme-body {
-  background-image: url(layout-background-grid.png), radial-gradient(circle at 50% 70%, hsl(210,53%,45%) 0%, hsl(210,54%,33%) 100%);
-}
-
-.theme-body {
+.theme-sidebar {
   color: hsl(210,53%,45%) !important;
   box-sizing: border-box;
 }

From a932f1fd325916bb46044c579bfd2df60420f756 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Sat, 15 Mar 2014 00:52:15 +0100
Subject: [PATCH 02/17] Bug 982620 - Australis' UITour doesn't hide the menu
 panel on teardown, causing recreatePopup to break later hideMenu calls,
 r=MattN

---
 browser/modules/UITour.jsm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/modules/UITour.jsm b/browser/modules/UITour.jsm
index 6c24c4e123f..804a0224a96 100644
--- a/browser/modules/UITour.jsm
+++ b/browser/modules/UITour.jsm
@@ -553,8 +553,8 @@ this.UITour = {
     if (!aWindowClosing) {
       this.hideHighlight(aWindow);
       this.hideInfo(aWindow);
-      aWindow.PanelUI.panel.removeAttribute("noautohide");
-      this.recreatePopup(aWindow.PanelUI.panel);
+      // Ensure the menu panel is hidden before calling recreatePopup so popup events occur.
+      this.hideMenu(aWindow, "appMenu");
     }
 
     this.endUrlbarCapture(aWindow);

From 08bb94a554e5397c1103a92267cccfc435a3bfdc Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Sat, 15 Mar 2014 11:21:43 -0700
Subject: [PATCH 03/17] Bug 982620 - UITour: Test that the menu panel is closed
 after tearing down. r=Gijs [Australis]

---
 browser/modules/test/browser_UITour.js | 6 ++++++
 browser/modules/test/head.js           | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/browser/modules/test/browser_UITour.js b/browser/modules/test/browser_UITour.js
index 2a21d633a80..28e0fb906af 100644
--- a/browser/modules/test/browser_UITour.js
+++ b/browser/modules/test/browser_UITour.js
@@ -251,4 +251,10 @@ let tests = [
 
     gContentAPI.showInfo("urlbar", "urlbar title", "urlbar text");
   },
+
+  // Make sure this test is last in the file so the appMenu gets left open and done will confirm it got tore down.
+  function cleanupMenus(done) {
+    gContentAPI.showMenu("appMenu");
+    done();
+  },
 ];
diff --git a/browser/modules/test/head.js b/browser/modules/test/head.js
index ffeb10b40da..9906ef4ef4c 100644
--- a/browser/modules/test/head.js
+++ b/browser/modules/test/head.js
@@ -128,6 +128,9 @@ function UITourTest() {
       is_element_hidden(tooltip, "Tooltip should be closed/hidden after UITour tab is closed");
 
       ok(!PanelUI.panel.hasAttribute("noautohide"), "@noautohide on the menu panel should have been cleaned up");
+      ok(!PanelUI.panel.hasAttribute("panelopen"), "The panel shouldn't have @panelopen");
+      isnot(PanelUI.panel.state, "open", "The panel shouldn't be open");
+      is(document.getElementById("PanelUI-menu-button").hasAttribute("open"), false, "Menu button should know that the menu is closed");
 
       is(UITour.pinnedTabs.get(window), null, "Any pinned tab should be closed after UITour tab is closed");
 

From ea2ddb1425aff6d772492a3beb15db29697d59ad Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Sat, 15 Mar 2014 19:21:36 +0100
Subject: [PATCH 04/17] Bug 963143 - Australis - fix nits for download finish
 notification patch, rs=mak

--HG--
extra : rebase_source : dec8b20839abdfccb9429d949b2e20709495ad9d
---
 browser/components/downloads/content/indicator.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/browser/components/downloads/content/indicator.js b/browser/components/downloads/content/indicator.js
index 9cf14130efc..51db6cece0d 100644
--- a/browser/components/downloads/content/indicator.js
+++ b/browser/components/downloads/content/indicator.js
@@ -334,15 +334,17 @@ const DownloadsIndicatorView = {
 
     let anchor = DownloadsButton._placeholder;
     let widgetGroup = CustomizableUI.getWidget("downloads-button");
-    let widgetInWindow = widgetGroup.forWindow(window);
-    if (widgetInWindow.overflowed || widgetGroup.areaType == CustomizableUI.TYPE_MENU_PANEL) {
+    let widget = widgetGroup.forWindow(window);
+    if (widget.overflowed || widgetGroup.areaType == CustomizableUI.TYPE_MENU_PANEL) {
       if (anchor && this._isAncestorPanelOpen(anchor)) {
-        // If the containing panel is open, don't do anything:
+        // If the containing panel is open, don't do anything, because the
+        // notification would appear under the open panel. See
+        // https://bugzilla.mozilla.org/show_bug.cgi?id=984023
         return;
       }
 
       // Otherwise, try to use the anchor of the panel:
-      anchor = widgetInWindow.anchor;
+      anchor = widget.anchor;
     }
     if (!anchor || !isElementVisible(anchor.parentNode)) {
       // Our container isn't visible, so can't show the animation:

From a4f369ecc88ddb462d4faedaf97aa106a1eafde2 Mon Sep 17 00:00:00 2001
From: Stephen Horlander <shorlander@mozilla.com>
Date: Thu, 6 Mar 2014 08:57:00 -0500
Subject: [PATCH 05/17] Bug 969584 - Patch 3: Consolidate typography and sizing
 of panel subview items for Australis, r=mikedeboer

--HG--
extra : rebase_source : c9fcac25fedf0521fdcca7bccb7052587b4c1594
---
 .../places/content/browserPlacesViews.js      |  6 +++
 browser/themes/linux/browser.css              |  6 +--
 .../linux/customizableui/panelUIOverlay.css   | 31 +++++++++++++
 .../osx/customizableui/panelUIOverlay.css     |  4 +-
 .../customizableui/panelUIOverlay.inc.css     | 44 ++++++++++++-------
 browser/themes/windows/browser.css            |  6 +--
 .../windows/customizableui/panelUIOverlay.css | 38 +++++++++++++++-
 7 files changed, 110 insertions(+), 25 deletions(-)

diff --git a/browser/components/places/content/browserPlacesViews.js b/browser/components/places/content/browserPlacesViews.js
index 4a9ea13c60b..599e960346d 100644
--- a/browser/components/places/content/browserPlacesViews.js
+++ b/browser/components/places/content/browserPlacesViews.js
@@ -766,6 +766,12 @@ PlacesViewBase.prototype = {
       hasMultipleURIs = numURINodes > 1;
     }
 
+    if (!hasMultipleURIs) {
+      aPopup.setAttribute("singleitempopup", "true");
+    } else {
+      aPopup.removeAttribute("singleitempopup");
+    }
+
     if (!hasMultipleURIs) {
       // We don't have to show any option.
       if (aPopup._endOptOpenAllInTabs) {
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 6f65e410c17..7e97a2e3610 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -81,13 +81,13 @@
 }
 
 /* Places toolbar */
-toolbarbutton.bookmark-item,
+toolbarbutton.bookmark-item:not(.subviewbutton),
 #personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder {
   margin: 0;
   padding: 2px 3px;
 }
 
-toolbarbutton.bookmark-item:hover:active,
+toolbarbutton.bookmark-item:not(.subviewbutton):hover:active,
 toolbarbutton.bookmark-item[open="true"] {
   padding-top: 3px;
   padding-bottom: 1px;
@@ -188,7 +188,7 @@ menuitem.bookmark-item {
   max-width: 32em;
 }
 
-.bookmark-item > .menu-iconic-left {
+.bookmark-item:not(.subviewbutton) > .menu-iconic-left {
   margin-top: 0;
   margin-bottom: 0;
 }
diff --git a/browser/themes/linux/customizableui/panelUIOverlay.css b/browser/themes/linux/customizableui/panelUIOverlay.css
index fb6ab18ba29..ef7ea088368 100644
--- a/browser/themes/linux/customizableui/panelUIOverlay.css
+++ b/browser/themes/linux/customizableui/panelUIOverlay.css
@@ -4,10 +4,29 @@
 
 %include ../../shared/customizableui/panelUIOverlay.inc.css
 
+.panel-subviews {
+  background-color: -moz-dialog;
+}
+
 #BMB_bookmarksPopup > menuitem[type="checkbox"] {
   -moz-appearance: none !important; /* important, to override toolkit rule */
 }
 
+#BMB_bookmarksPopup menupopup[placespopup=true] {
+  margin-top: -6px;
+  padding-top: 2px;
+}
+
+/* Add some space at the top because there are no headers: */
+#BMB_bookmarksPopup menupopup[placespopup=true] > hbox > .popup-internal-box > .arrowscrollbox-scrollbox > .scrollbox-innerbox  {
+  padding-top: 4px;
+}
+
+.subviewbutton > .toolbarbutton-text {
+  padding-top: 3px;
+  padding-bottom: 3px;
+}
+
 .widget-overflow-list .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-appearance: none;
   border: 0;
@@ -57,6 +76,18 @@ menu[disabled="true"].subviewbutton > .menu-right {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
+.subviewbutton > .toolbarbutton-icon {
+  -moz-margin-end: 5px !important;
+}
+
+.subviewbutton > .menu-right,
+.subviewbutton > .menu-iconic-left {
+  padding-top: 1px;
+  /* These need !important to override menu.css */
+  margin-top: 1px !important;
+  margin-bottom: 2px !important;
+}
+
 .PanelUI-subView toolbarseparator,
 .PanelUI-subView menuseparator,
 .cui-widget-panelview menuseparator,
diff --git a/browser/themes/osx/customizableui/panelUIOverlay.css b/browser/themes/osx/customizableui/panelUIOverlay.css
index b4427e70db8..6ec2524b572 100644
--- a/browser/themes/osx/customizableui/panelUIOverlay.css
+++ b/browser/themes/osx/customizableui/panelUIOverlay.css
@@ -98,8 +98,8 @@
 
 menu.subviewbutton,
 menuitem.subviewbutton:not(.panel-subview-footer) {
-  padding-top: 5px;
-  padding-bottom: 5px;
+  padding-top: 2px;
+  padding-bottom: 2px;
 }
 
 /* Override OSX-specific toolkit styles for the bookmarks panel */
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index 19844aca6ec..5e32d67dca9 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -101,7 +101,7 @@
 
 #PanelUI-popup .panel-subview-body {
   margin: -4px;
-  padding: 2px 4px;
+  padding: 4px 4px;
 }
 
 .panel-subview-header,
@@ -586,13 +586,11 @@ panelview .toolbarbutton-1,
 .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button,
 .toolbaritem-combined-buttons@inAnyPanel@ > toolbarbutton {
   -moz-appearance: none;
-  padding: 2px 6px;
+  padding: 0 6px;
   background-color: hsla(210,4%,10%,0);
   border-radius: 2px;
   border-style: solid;
   border-color: hsla(210,4%,10%,0);
-  transition-property: background-color, border-color;
-  transition-duration: 150ms;
 }
 
 panelview .toolbarbutton-1,
@@ -615,14 +613,20 @@ panelview .toolbarbutton-1,
 }
 
 .subviewbutton:not(.panel-subview-footer) {
-  margin: 2px 0;
+  margin: 0;
 }
 
 .subviewbutton:not(.panel-subview-footer) > .toolbarbutton-text,
 /* Bookmark items need a more specific selector. */
 .PanelUI-subView .subviewbutton:not(.panel-subview-footer) > .menu-text,
 .PanelUI-subView .subviewbutton:not(.panel-subview-footer) > .menu-iconic-text {
-  font-size: 1.1em;
+  font: menu;
+}
+
+/* This is a <label> but it should fit in with the menu font- and colorwise. */
+#PanelUI-characterEncodingView-autodetect-label {
+  font: menu;
+  color: inherit;
 }
 
 .cui-widget-panelview .subviewbutton:not(.panel-subview-footer) {
@@ -680,7 +684,7 @@ menuitem.subviewbutton@menuStateActive@,
 }
 
 #BMB_bookmarksPopup .subviewbutton {
-  font: inherit;
+  font: menu;
   font-weight: normal;
 }
 
@@ -700,22 +704,32 @@ menuitem.subviewbutton@menuStateActive@,
   padding-bottom: 0px;
 }
 
-#BMB_bookmarksPopup menupopup {
-  padding-top: 2px;
-}
-
 #BMB_bookmarksPopup menupopup > .bookmarks-actions-menuseparator {
   /* Hide bottom separator as the styled footer includes a top border serving the same purpose */
   display: none;
 }
 
+/* Popups with only one item don't have a footer */
+menupopup[placespopup=true][singleitempopup=true] > hbox > .popup-internal-box > .arrowscrollbox-scrollbox > .scrollbox-innerbox,
+/* These popups never have a footer */
+#BMB_bookmarksToolbarPopup > hbox > .popup-internal-box > .arrowscrollbox-scrollbox > .scrollbox-innerbox,
+#BMB_unsortedBookmarksPopup > hbox > .popup-internal-box > .arrowscrollbox-scrollbox > .scrollbox-innerbox {
+  /* And so they need some bottom padding: */
+  padding-bottom: 4px;
+}
+
+/* Disabled (empty) item is always alone and never has an icon, so fix its left padding */
+#BMB_bookmarksPopup menupopup[emptyplacesresult] .bookmark-item.subviewbutton {
+  padding-left: 6px;
+}
+
 .PanelUI-subView menuseparator,
 .PanelUI-subView toolbarseparator,
 .cui-widget-panelview menuseparator {
   -moz-appearance: none;
   min-height: 0;
   border-top: 1px solid hsla(210,4%,10%,.15);
-  margin: 2px 0;
+  margin: 6px 0;
   padding: 0;
 }
 
@@ -949,14 +963,14 @@ toolbaritem[overflowedItem=true],
 }
 
 .subviewbutton[checked="true"] {
-  background: url("chrome://global/skin/menu/shared-menu-check.png") top 7px left 7px / 11px 11px no-repeat transparent;
+  background: url("chrome://global/skin/menu/shared-menu-check.png") center left 7px / 11px 11px no-repeat transparent;
 }
 
-.PanelUI-subView .menu-iconic-left {
+.subviewbutton > .menu-iconic-left {
   -moz-appearance: none;
   -moz-margin-end: 3px;
 }
 
-.PanelUI-subView menuitem[checked="true"] > .menu-iconic-left {
+menuitem[checked="true"].subviewbutton > .menu-iconic-left {
   visibility: hidden;
 }
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 40bf011e560..a341cad4cf4 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -328,13 +328,13 @@
 
 /* ::::: bookmark buttons ::::: */
 
-toolbarbutton.bookmark-item,
+toolbarbutton.bookmark-item:not(.subviewbutton),
 #personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder {
   margin: 0;
   padding: 2px 3px;
 }
 
-toolbarbutton.bookmark-item:hover:active:not([disabled="true"]),
+toolbarbutton.bookmark-item:not([disabled="true"]):not(.subviewbutton):hover:active,
 toolbarbutton.bookmark-item[open="true"] {
   padding-top: 3px;
   padding-bottom: 1px;
@@ -420,7 +420,7 @@ menuitem.bookmark-item {
   max-width: 32em;
 }
 
-.bookmark-item > .menu-iconic-left {
+.bookmark-item:not(.subviewbutton) > .menu-iconic-left {
   margin-top: 0;
   margin-bottom: 0;
 }
diff --git a/browser/themes/windows/customizableui/panelUIOverlay.css b/browser/themes/windows/customizableui/panelUIOverlay.css
index 88b1afa7f2f..888dc257145 100644
--- a/browser/themes/windows/customizableui/panelUIOverlay.css
+++ b/browser/themes/windows/customizableui/panelUIOverlay.css
@@ -16,14 +16,14 @@
 
 /* bookmark panel submenus */
 
-#BMB_bookmarksPopup menupopup {
+#BMB_bookmarksPopup menupopup[placespopup=true] {
   -moz-appearance: none;
   background: transparent;
   border: none;
   padding: 6px;
 }
 
-#BMB_bookmarksPopup menupopup > hbox {
+#BMB_bookmarksPopup menupopup[placespopup=true] > hbox {
   /* emulating chrome://browser/content/places/menu.xml#places-popup-arrow but without the arrow */
   box-shadow: 0 0 4px rgba(0,0,0,0.2);
   background: #FFF;
@@ -32,16 +32,50 @@
   margin-top: -4px;
 }
 
+#BMB_bookmarksPopup menupopup {
+  padding-top: 2px;
+}
+
+/* Add some space at the top because there are no headers: */
+#BMB_bookmarksPopup menupopup[placespopup=true] > hbox > .popup-internal-box > .arrowscrollbox-scrollbox > .scrollbox-innerbox  {
+  padding-top: 4px;
+}
+
 #BMB_bookmarksPopup .menu-text {
   color: #000;
 }
 
+#BMB_bookmarksPopup .subviewbutton[disabled=true] > .menu-text {
+  color: #6d6d6d;
+}
+
 /* bookmark panel separator */
 #BMB_bookmarksPopup menuseparator {
   padding-top: 0;
   padding-bottom: 0;
 }
 
+.subviewbutton > .menu-right,
+.subviewbutton > .menu-iconic-left {
+  padding-top: 1px;
+  margin-top: 1px;
+  margin-bottom: 2px;
+}
+
+/* Disabled empty item looks too small otherwise, because it has no icon. */
+menuitem.subviewbutton[disabled]:not(.menuitem-iconic),
+/* Same for checkbox menu items, whose icons lose size due to -moz-appearance: none: */
+menuitem[type="checkbox"].subviewbutton {
+  /* This is 16px for an icon + 3px for its margins + 1px for its padding +
+   * 2px for its border, see above */
+  min-height: 22px;
+}
+
+.subviewbutton > .toolbarbutton-text {
+  padding-top: 3px;
+  padding-bottom: 3px;
+}
+
 .widget-overflow-list .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-appearance: none;
   border: 0;

From 4be2366b5d350959c0808b1ed691d200c8a083ba Mon Sep 17 00:00:00 2001
From: Ratnadeep Debnath <rtnpro@gmail.com>
Date: Sat, 15 Mar 2014 17:17:45 -0400
Subject: [PATCH 06/17] Bug 912900 - Show open tabs in connected device's
 Firefox in AppManager. r=jryans

---
 .../devtools/app-manager/content/device.js    | 31 +++++++++++++++++--
 .../devtools/app-manager/content/device.xhtml | 18 ++++++++++-
 browser/devtools/app-manager/device-store.js  | 18 ++++++++++-
 .../app-manager/test/test_device_store.html   |  4 +--
 .../chrome/browser/devtools/app-manager.dtd   |  4 +++
 .../shared/devtools/app-manager/device.css    | 16 ++++++----
 6 files changed, 79 insertions(+), 12 deletions(-)

diff --git a/browser/devtools/app-manager/content/device.js b/browser/devtools/app-manager/content/device.js
index f1748e0e897..23d754f6b0a 100644
--- a/browser/devtools/app-manager/content/device.js
+++ b/browser/devtools/app-manager/content/device.js
@@ -4,7 +4,8 @@
 
 const Cu = Components.utils;
 Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource:///modules/devtools/gDevTools.jsm");
+Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
+const {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
 
 const {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 const {require} = devtools;
@@ -17,6 +18,7 @@ const {getTargetForApp, launchApp, closeApp}
 const DeviceStore = require("devtools/app-manager/device-store");
 const WebappsStore = require("devtools/app-manager/webapps-store");
 const promise = require("sdk/core/promise");
+const DEFAULT_APP_ICON = "chrome://browser/skin/devtools/app-manager/default-app-icon.png";
 
 window.addEventListener("message", function(event) {
   try {
@@ -141,7 +143,7 @@ let UI = {
     if (panel) panel.classList.add("selected");
   },
 
-  openToolbox: function(manifest) {
+  openToolboxForApp: function(manifest) {
     if (!this.connected) {
       return;
     }
@@ -155,6 +157,31 @@ let UI = {
     }, console.error);
   },
 
+  _getTargetForTab: function (form) {
+      let options = {
+        form: form,
+        client: this.connection.client,
+        chrome: false
+      };
+      let deferred = promise.defer();
+      return devtools.TargetFactory.forRemoteTab(options);
+  },
+
+  openToolboxForTab: function (aNode) {
+    let index = Array.prototype.indexOf.apply(
+      aNode.parentNode.parentNode.parentNode.children,
+      [aNode.parentNode.parentNode]);
+    this.connection.client.listTabs(
+      response => {
+        let tab = response.tabs[index];
+        this._getTargetForTab(tab).then(target => {
+          top.UI.openAndShowToolboxForTarget(
+            target, tab.title, DEFAULT_APP_ICON);
+        }, console.error);
+      }
+    );
+  },
+
   startApp: function(manifest) {
     if (!this.connected) {
       return promise.reject();
diff --git a/browser/devtools/app-manager/content/device.xhtml b/browser/devtools/app-manager/content/device.xhtml
index 2ed66769e3e..bd19968ac3e 100644
--- a/browser/devtools/app-manager/content/device.xhtml
+++ b/browser/devtools/app-manager/content/device.xhtml
@@ -44,6 +44,7 @@
                 <button class="help">&device.help;</button>
               </a>
             </div>
+            <div onclick="UI.setTab('browser-tabs')" class="tab sidebar-item browser-tabs" title="&device.browserTabsTooltip;">&device.browserTabs;</div>
           </div>
         </div>
       </aside>
@@ -68,6 +69,9 @@
               <div class="deny-label" title="&device.denyTooltip;">&device.deny;</div>
             </div>
           </div>
+          <div class="tabpanel browser-tabs">
+            <section template-loop='{"arrayPath":"device.tabs","childSelector":"#browser-tab-template"}'></section>
+          </div>
         </div>
       </section>
     </section>
@@ -83,12 +87,24 @@
   </div>
   </template>
 
+  <template id="browser-tab-template">
+  <div class="browser-tab">
+    <div class="browser-tab-details">
+      <p template='{"type":"textContent","path":"title"}'></p>
+      <p class="browser-tab-url-subheading" template='{"type":"textContent","path":"url"}'></p>
+    </div>
+    <div class="browser-tab-buttons">
+      <button class="button-debug" template='{"type":"attribute","path":"actor","name":"data-actor"}' onclick="UI.openToolboxForTab(this)" style="display: inline-block;" title="&device.debugBrowserTabTooltip;">&device.debugBrowserTab;</button>
+    </div>
+  </div>
+  </template>
+
   <template id="app-template">
   <div class="app" template='{"type":"attribute","path":"running","name":"running"}'>
     <img class="app-icon" template='{"type":"attribute","path":"iconURL","name":"src"}'></img>
     <span class="app-name" template='{"type":"textContent","path":"name"}'></span>
     <div class="app-buttons">
-      <button class="button-debug" template='{"type":"attribute","path":"manifestURL","name":"data-manifest"}' onclick="UI.openToolbox(this.dataset.manifest)" title="&device.debugAppTooltip;">&device.debugApp;</button>
+      <button class="button-debug" template='{"type":"attribute","path":"manifestURL","name":"data-manifest"}' onclick="UI.openToolboxForApp(this.dataset.manifest)" title="&device.debugAppTooltip;">&device.debugApp;</button>
       <button class="button-start" template='{"type":"attribute","path":"manifestURL","name":"data-manifest"}' onclick="UI.startApp(this.dataset.manifest)" title="&device.startAppTooltip;">&device.startApp;</button>
       <button class="button-stop" template='{"type":"attribute","path":"manifestURL","name":"data-manifest"}' onclick="UI.stopApp(this.dataset.manifest)" title="&device.stopAppTooltip;">&device.stopApp;</button>
     </div>
diff --git a/browser/devtools/app-manager/device-store.js b/browser/devtools/app-manager/device-store.js
index bf18eb6f441..70b46923e5f 100644
--- a/browser/devtools/app-manager/device-store.js
+++ b/browser/devtools/app-manager/device-store.js
@@ -31,6 +31,7 @@ module.exports = DeviceStore = function(connection) {
   this._connection = connection;
   this._connection.once(Connection.Events.DESTROYED, this.destroy);
   this._connection.on(Connection.Events.STATUS_CHANGED, this._onStatusChanged);
+  this._onTabListChanged = this._onTabListChanged.bind(this);
   this._onStatusChanged();
   return this;
 }
@@ -51,6 +52,7 @@ DeviceStore.prototype = {
   _resetStore: function() {
     this.object.description = {};
     this.object.permissions = [];
+    this.object.tabs = [];
   },
 
   _onStatusChanged: function() {
@@ -61,9 +63,23 @@ DeviceStore.prototype = {
     }
   },
 
+  _onTabListChanged: function() {
+    this._listTabs();
+  },
+
   _listTabs: function() {
     this._connection.client.listTabs((resp) => {
+      if (resp.error) {
+        this._connection.disconnect();
+        return;
+      }
       this._deviceFront = getDeviceFront(this._connection.client, resp);
+      // Save remote browser's tabs
+      this.object.tabs = resp.tabs;
+      // Add listener to update remote browser's tabs list in app-manager
+      // when it changes
+      this._connection.client.addListener(
+        'tabListChanged', this._onTabListChanged);
       this._feedStore();
     });
   },
@@ -96,5 +112,5 @@ DeviceStore.prototype = {
       }
       this.object.permissions = permissionsArray;
     });
-  },
+  }
 }
diff --git a/browser/devtools/app-manager/test/test_device_store.html b/browser/devtools/app-manager/test/test_device_store.html
index 01036aa189d..45c213c9576 100644
--- a/browser/devtools/app-manager/test/test_device_store.html
+++ b/browser/devtools/app-manager/test/test_device_store.html
@@ -67,13 +67,13 @@ Bug 901520 - [app manager] data store for device
         });
 
         connection.once("disconnected", function() {
-          compare(store.object, {description:{},permissions:[]}, "empty store after disconnect")
+          compare(store.object, {description:{},permissions:[],tabs:[]}, "empty store after disconnect")
           connection.destroy();
           DebuggerServer.destroy();
           SimpleTest.finish();
         });
 
-        compare(store.object, {description:{},permissions:[]}, "empty store before disconnect")
+        compare(store.object, {description:{},permissions:[],tabs:[]}, "empty store before disconnect")
 
         connection.connect();
 
diff --git a/browser/locales/en-US/chrome/browser/devtools/app-manager.dtd b/browser/locales/en-US/chrome/browser/devtools/app-manager.dtd
index 2c11b371b60..f7be244c90d 100644
--- a/browser/locales/en-US/chrome/browser/devtools/app-manager.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/app-manager.dtd
@@ -32,6 +32,10 @@
 <!ENTITY device.permissions "Permissions">
 <!ENTITY device.permissionsTooltip "View a table of the permissions accessible to the different types of apps">
 <!ENTITY device.permissionsHelpLink "https://developer.mozilla.org/docs/Web/Apps/App_permissions">
+<!ENTITY device.browserTabs "Browser Tabs">
+<!ENTITY device.browserTabsTooltip "View a list of tabs in the browser of the connected device">
+<!ENTITY device.debugBrowserTab "Debug">
+<!ENTITY device.debugBrowserTabTooltip "Open the Developer Tools connected to this browser tab on the device">
 <!ENTITY device.help "Help">
 
 <!ENTITY connection.connectTooltip "Connect to the device">
diff --git a/browser/themes/shared/devtools/app-manager/device.css b/browser/themes/shared/devtools/app-manager/device.css
index a63a8fc52e9..db6918d770b 100644
--- a/browser/themes/shared/devtools/app-manager/device.css
+++ b/browser/themes/shared/devtools/app-manager/device.css
@@ -308,34 +308,34 @@ header {
 
 
 
-/*****************      APPS       *****************/
+/*****************      APPS & BROWSER TABS      *****************/
 
 
 
 
-.apps {
+.apps, .browser-tabs {
   display: flex;
   flex-direction: column;
   overflow: auto;
 }
 
-.app {
+.app, .browser-tab {
   display: flex;
   align-items: center;
   order: 1;
 }
 
-.app-name {
+.app-name, .browser-tab-details {
   flex-grow: 1;
   font-weight: bold;
 }
 
-.app {
+.app, .browser-tab {
   padding: 10px 20px;
   border-bottom: 1px solid #CCC;
 }
 
-.app:hover {
+.app:hover, .browser-tab:hover {
   background-color: #EFEFEF;
 }
 
@@ -345,6 +345,10 @@ header {
   margin-right: 10px;
 }
 
+.browser-tab-url-subheading {
+  font-size: 10px;
+}
+
 
 
 /*****************      NOT CONNECTED      *****************/

From e4ad89cd7d867bd250b1b77d8818cc7bc8788d41 Mon Sep 17 00:00:00 2001
From: David Rajchenbach-Teller <dteller@mozilla.com>
Date: Sat, 15 Mar 2014 17:19:00 -0400
Subject: [PATCH 07/17] Bug 981875 - Improve error _PromiseWorker's error
 reporting in case of xpcom error. r=froydnj

---
 toolkit/components/osfile/modules/_PromiseWorker.jsm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/toolkit/components/osfile/modules/_PromiseWorker.jsm b/toolkit/components/osfile/modules/_PromiseWorker.jsm
index efeedda617c..4fd131b3b87 100644
--- a/toolkit/components/osfile/modules/_PromiseWorker.jsm
+++ b/toolkit/components/osfile/modules/_PromiseWorker.jsm
@@ -176,8 +176,18 @@ PromiseWorker.prototype = {
     let id = ++this._id;
     let message = {fun: fun, args: array, id: id};
     this._log("Posting message", message);
+    try {
+      this._worker.postMessage(message);
+    } catch (ex if typeof ex == "number") {
+      this._log("Could not post message", message, "due to xpcom error", ex);
+      // handle raw xpcom errors (see eg bug 961317)
+      return Promise.reject(new Components.Exception("Error in postMessage", ex));
+    } catch (ex) {
+      this._log("Could not post message", message, "due to error", ex);
+      return Promise.reject(ex);
+    }
+
     this._queue.push({deferred:deferred, closure: closure, id: id});
-    this._worker.postMessage(message);
     this._log("Message posted");
     return deferred.promise;
   }

From c4ebc3e784bbddf0cffcecc2881e49f7926a231a Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Sat, 15 Mar 2014 17:20:06 -0400
Subject: [PATCH 08/17] Bug 983730 - Support Android SDK build tools v19.0.3.
 r=mshal

---
 build/autoconf/android.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/autoconf/android.m4 b/build/autoconf/android.m4
index f0cb9e35481..c538e938fa7 100644
--- a/build/autoconf/android.m4
+++ b/build/autoconf/android.m4
@@ -293,7 +293,7 @@ case "$target" in
     # The build tools got moved around to different directories in
     # SDK Tools r22.  Try to locate them.
     android_build_tools=""
-    for suffix in android-4.4 android-4.3 android-4.2.2 19.0.2 19.0.0 18.1.0 18.0.1 18.0.0 17.0.0; do
+    for suffix in android-4.4 android-4.3 android-4.2.2 19.0.3 19.0.2 19.0.0 18.1.0 18.0.1 18.0.0 17.0.0; do
         tools_directory="$android_sdk_root/build-tools/$suffix"
         if test -d "$tools_directory" ; then
             android_build_tools="$tools_directory"

From 2bad21fdcf3f331448c08ca060bd3a3abe9d7425 Mon Sep 17 00:00:00 2001
From: vivek <vivekb.balakrishnan@gmail.com>
Date: Sat, 15 Mar 2014 17:20:25 -0400
Subject: [PATCH 09/17] Bug 959382 - BaseTest.setPreferenceAndWaitForChange
 helper method. r=mcomella

---
 mobile/android/base/tests/BaseTest.java       | 65 +++++++++++++++++++
 .../android/base/tests/testAddonManager.java  | 18 +----
 mobile/android/base/tests/testAdobeFlash.java | 18 +----
 mobile/android/base/tests/testDoorHanger.java | 18 +++--
 .../base/tests/testPasswordEncrypt.java       | 17 +----
 5 files changed, 76 insertions(+), 60 deletions(-)

diff --git a/mobile/android/base/tests/BaseTest.java b/mobile/android/base/tests/BaseTest.java
index db25be6ff9e..7de91a64748 100644
--- a/mobile/android/base/tests/BaseTest.java
+++ b/mobile/android/base/tests/BaseTest.java
@@ -6,6 +6,10 @@ import com.jayway.android.robotium.solo.Solo;
 import org.mozilla.gecko.*;
 import org.mozilla.gecko.GeckoThread.LaunchState;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.ContentResolver;
@@ -59,9 +63,11 @@ abstract class BaseTest extends ActivityInstrumentationTestCase2<Activity> {
     public static final int MAX_WAIT_MS = 4500;
     public static final int LONG_PRESS_TIME = 6000;
     private static final int GECKO_READY_WAIT_MS = 180000;
+    public static final int MAX_WAIT_BLOCK_FOR_EVENT_DATA_MS = 90000;
 
     private static Class<Activity> mLauncherActivityClass;
     private Activity mActivity;
+    private int mPreferenceRequestID = 0;
     protected Solo mSolo;
     protected Driver mDriver;
     protected Assert mAsserter;
@@ -897,4 +903,63 @@ abstract class BaseTest extends ActivityInstrumentationTestCase2<Activity> {
             }
         }
     }
+
+    /**
+     * Set the preference and wait for it to change before proceeding with the test.
+     */
+    public void setPreferenceAndWaitForChange(final JSONObject jsonPref) {
+        mActions.sendGeckoEvent("Preferences:Set", jsonPref.toString());
+
+        // Get the preference name from the json and store it in an array. This array 
+        // will be used later while fetching the preference data.
+        String[] prefNames = new String[1];
+        try {
+            prefNames[0] = jsonPref.getString("name");
+        } catch (JSONException e) {
+            mAsserter.ok(false, "Exception in setPreferenceAndWaitForChange", getStackTraceString(e));
+        }
+
+        // Wait for confirmation of the pref change before proceeding with the test.
+        final int ourRequestID = mPreferenceRequestID--;
+        final Actions.RepeatedEventExpecter eventExpecter = mActions.expectGeckoEvent("Preferences:Data");
+        mActions.sendPreferencesGetEvent(ourRequestID, prefNames);
+
+        // Wait until we get the correct "Preferences:Data" event
+        waitForCondition(new Condition() {
+            final long endTime = SystemClock.elapsedRealtime() + MAX_WAIT_BLOCK_FOR_EVENT_DATA_MS;
+
+            @Override
+            public boolean isSatisfied() {
+                try {
+                    long timeout = endTime - SystemClock.elapsedRealtime();
+                    if (timeout < 0) {
+                        timeout = 0;
+                    }
+
+                    JSONObject data = new JSONObject(eventExpecter.blockForEventDataWithTimeout(timeout));
+                    int requestID = data.getInt("requestId");
+                    if (requestID != ourRequestID) {
+                        return false;
+                    }
+
+                    JSONArray preferences = data.getJSONArray("preferences");
+                    mAsserter.is(preferences.length(), 1, "Expecting preference array to have one element");
+                    JSONObject prefs = (JSONObject) preferences.get(0);
+                    mAsserter.is(prefs.getString("name"), jsonPref.getString("name"),
+                            "Expecting returned preference name to be the same as the set name");
+                    mAsserter.is(prefs.getString("type"), jsonPref.getString("type"),
+                            "Expecting returned preference type to be the same as the set type");
+                    mAsserter.is(prefs.get("value"), jsonPref.get("value"),
+                            "Expecting returned preference value to be the same as the set value");
+                    return true;
+                } catch(JSONException e) {
+                    mAsserter.ok(false, "Exception in setPreferenceAndWaitForChange", getStackTraceString(e));
+                    // Please the java compiler
+                    return false;
+                }
+            }
+        }, MAX_WAIT_BLOCK_FOR_EVENT_DATA_MS);
+
+        eventExpecter.unregisterListener();
+    }
 }
diff --git a/mobile/android/base/tests/testAddonManager.java b/mobile/android/base/tests/testAddonManager.java
index b25e7d2f38b..24d45d37845 100644
--- a/mobile/android/base/tests/testAddonManager.java
+++ b/mobile/android/base/tests/testAddonManager.java
@@ -55,23 +55,7 @@ public class testAddonManager extends PixelTest  {
             jsonPref.put("name", "extensions.getAddons.browseAddons");
             jsonPref.put("type", "string");
             jsonPref.put("value", getAbsoluteUrl("/robocop/robocop_blank_01.html"));
-            mActions.sendGeckoEvent("Preferences:Set", jsonPref.toString());
-
-            // Wait for confirmation of the pref change before proceeding with the test.
-            final String[] prefNames = { "extensions.getAddons.browseAddons" };
-            final int ourRequestId = 0x7357;
-            Actions.RepeatedEventExpecter eventExpecter = mActions.expectGeckoEvent("Preferences:Data");
-            mActions.sendPreferencesGetEvent(ourRequestId, prefNames);
-
-            JSONObject data = null;
-            int requestId = -1;
-
-            // Wait until we get the correct "Preferences:Data" event
-            while (requestId != ourRequestId) {
-                data = new JSONObject(eventExpecter.blockForEventData());
-                requestId = data.getInt("requestId");
-            }
-            eventExpecter.unregisterListener();
+            setPreferenceAndWaitForChange(jsonPref);
 
         } catch (Exception ex) { 
             mAsserter.ok(false, "exception in testAddonManager", ex.toString());
diff --git a/mobile/android/base/tests/testAdobeFlash.java b/mobile/android/base/tests/testAdobeFlash.java
index ed62e8cbb09..db0739e3c36 100644
--- a/mobile/android/base/tests/testAdobeFlash.java
+++ b/mobile/android/base/tests/testAdobeFlash.java
@@ -31,23 +31,7 @@ public class testAdobeFlash extends PixelTest {
             jsonPref.put("name", "plugin.enable");
             jsonPref.put("type", "string");
             jsonPref.put("value", "1");
-            mActions.sendGeckoEvent("Preferences:Set", jsonPref.toString());
-
-            // Wait for confirmation of the pref change before proceeding with the test.
-            final String[] prefNames = { "plugin.default.state" };
-            final int ourRequestId = 0x7358;
-            Actions.RepeatedEventExpecter eventExpecter = mActions.expectGeckoEvent("Preferences:Data");
-            mActions.sendPreferencesGetEvent(ourRequestId, prefNames);
-
-            JSONObject data = null;
-            int requestId = -1;
-
-            // Wait until we get the correct "Preferences:Data" event
-            while (requestId != ourRequestId) {
-                data = new JSONObject(eventExpecter.blockForEventData());
-                requestId = data.getInt("requestId");
-            }
-            eventExpecter.unregisterListener();
+            setPreferenceAndWaitForChange(jsonPref);
         } catch (Exception ex) {
             mAsserter.ok(false, "exception in testAdobeFlash", ex.toString());
         }
diff --git a/mobile/android/base/tests/testDoorHanger.java b/mobile/android/base/tests/testDoorHanger.java
index dc42cc6dfa8..a6cb90b19e7 100644
--- a/mobile/android/base/tests/testDoorHanger.java
+++ b/mobile/android/base/tests/testDoorHanger.java
@@ -77,14 +77,12 @@ public class testDoorHanger extends BaseTest {
 
 
         boolean offlineAllowedByDefault = true;
+        // Save offline-allow-by-default preferences first
+        final String[] prefNames = { "offline-apps.allow_by_default" };
+        final int ourRequestId = 0x7357;
+        final Actions.RepeatedEventExpecter eventExpecter = mActions.expectGeckoEvent("Preferences:Data");
+        mActions.sendPreferencesGetEvent(ourRequestId, prefNames);
         try {
-            // Save offline-allow-by-default preferences first
-            final String[] prefNames = { "offline-apps.allow_by_default" };
-            final int ourRequestId = 0x7357;
-
-            Actions.RepeatedEventExpecter eventExpecter = mActions.expectGeckoEvent("Preferences:Data");
-            mActions.sendPreferencesGetEvent(ourRequestId, prefNames);
-
             JSONObject data = null;
             int requestId = -1;
 
@@ -106,7 +104,7 @@ public class testDoorHanger extends BaseTest {
             jsonPref.put("name", "offline-apps.allow_by_default");
             jsonPref.put("type", "bool");
             jsonPref.put("value", false);
-            mActions.sendGeckoEvent("Preferences:Set", jsonPref.toString());
+            setPreferenceAndWaitForChange(jsonPref);
         } catch (JSONException e) {
             mAsserter.ok(false, "exception getting preference", e.toString());
         }
@@ -134,9 +132,9 @@ public class testDoorHanger extends BaseTest {
             // Revert offline setting
             JSONObject jsonPref = new JSONObject();
             jsonPref.put("name", "offline-apps.allow_by_default");
-            jsonPref.put("type", "boolean");
+            jsonPref.put("type", "bool");
             jsonPref.put("value", offlineAllowedByDefault);
-            mActions.sendGeckoEvent("Preferences:Set", jsonPref.toString());
+            setPreferenceAndWaitForChange(jsonPref);
         } catch (JSONException e) {
             mAsserter.ok(false, "exception setting preference", e.toString());
         }
diff --git a/mobile/android/base/tests/testPasswordEncrypt.java b/mobile/android/base/tests/testPasswordEncrypt.java
index c712f06fffa..913e9185488 100644
--- a/mobile/android/base/tests/testPasswordEncrypt.java
+++ b/mobile/android/base/tests/testPasswordEncrypt.java
@@ -113,22 +113,7 @@ public class testPasswordEncrypt extends BaseTest {
             jsonPref.put("name", "privacy.masterpassword.enabled");
             jsonPref.put("type", "string");
             jsonPref.put("value", passwd);
-            mActions.sendGeckoEvent("Preferences:Set", jsonPref.toString());
-
-            // Wait for confirmation of the pref change before proceeding with the test.
-            final String[] prefNames = { "privacy.masterpassword.enabled" };
-            final int ourRequestId = 0x73577;
-            Actions.RepeatedEventExpecter eventExpecter = mActions.expectGeckoEvent("Preferences:Data");
-            mActions.sendPreferencesGetEvent(ourRequestId, prefNames);
-
-            JSONObject data = null;
-            int requestId = -1;
-
-            // Wait until we get the correct "Preferences:Data" event
-            while (requestId != ourRequestId) {
-                data = new JSONObject(eventExpecter.blockForEventData());
-                requestId = data.getInt("requestId");
-            }
+            setPreferenceAndWaitForChange(jsonPref);
         } catch (Exception ex) { 
             mAsserter.ok(false, "exception in toggleMasterPassword", ex.toString());
         }

From daf4b78a430945f0f01ba7c631e8b63bdab0b976 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Sat, 15 Mar 2014 14:21:20 -0700
Subject: [PATCH 10/17] Bug 971108 - UITour: Update the doorhanger menu style
 with a footer background and primary button style. r=Unfocused

--HG--
extra : rebase_source : fbbfc8c7a6c08f224aea0a8e786bc96f120da67b
---
 browser/base/content/browser.xul     | 16 +++----
 browser/modules/UITour.jsm           |  3 ++
 browser/themes/linux/browser.css     | 11 ++---
 browser/themes/osx/browser.css       | 18 ++++----
 browser/themes/shared/UITour.inc.css | 62 ++++++++++++++++++++--------
 browser/themes/windows/browser.css   |  4 ++
 6 files changed, 75 insertions(+), 39 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index fb908c3946c..dd073a6ff4d 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -203,20 +203,22 @@
            align="start"
            orient="vertical"
            role="alert">
-      <hbox>
-        <vbox>
+     <vbox>
+      <hbox pack="end">
+        <toolbarbutton id="UITourTooltipClose" class="close-icon"
+                       tooltiptext="&uiTour.infoPanel.close;"/>
+      </hbox>
+      <hbox id="UITourTooltipBody">
+        <vbox id="UITourTooltipIconContainer">
           <image id="UITourTooltipIcon"/>
         </vbox>
         <vbox flex="1">
           <label id="UITourTooltipTitle" flex="1"/>
           <description id="UITourTooltipDescription" flex="1"/>
-          <hbox id="UITourTooltipButtons" flex="1" align="center"/>
-        </vbox>
-        <vbox align="start">
-          <toolbarbutton id="UITourTooltipClose" class="close-icon"
-                         tooltiptext="&uiTour.infoPanel.close;"/>
         </vbox>
       </hbox>
+      <hbox id="UITourTooltipButtons" flex="1" align="center"/>
+     </vbox>
     </panel>
     <!-- type="default" forces frames to be created so that the panel's size can be determined --> 
     <panel id="UITourHighlightContainer"
diff --git a/browser/modules/UITour.jsm b/browser/modules/UITour.jsm
index 804a0224a96..e17fd83c3fc 100644
--- a/browser/modules/UITour.jsm
+++ b/browser/modules/UITour.jsm
@@ -912,6 +912,9 @@ this.UITour = {
         if (button.style == "link")
           el.setAttribute("class", "button-link");
 
+        if (button.style == "primary")
+          el.setAttribute("class", "button-primary");
+
         let callbackID = button.callbackID;
         el.addEventListener("command", event => {
           tooltip.hidePopup();
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 7e97a2e3610..9f962f5f48c 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -2235,14 +2235,11 @@ chatbox {
 }
 
 #UITourTooltipClose {
-  -moz-appearance: toolbarbutton;
-  list-style-image: url("moz-icon://stock/gtk-close?size=menu");
-}
-
-#UITourTooltipClose > .toolbarbutton-icon {
-  margin: -4px;
+  -moz-margin-end: -4px;
+  height: 16px;
+  width: 16px;
 }
 
 #UITourTooltipButtons {
-  margin-bottom: 0;
+  margin-bottom: -10px;
 }
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index b027ae23386..f6f80aca030 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -4363,16 +4363,18 @@ window > chatbox {
 
 %include ../shared/UITour.inc.css
 
-#UITourTooltipIcon {
-  -moz-margin-start: 0;
-}
-
 #UITourTooltipDescription {
-  font-size: 1.1rem;
-  line-height: 1.9rem;
+  font-size: 1.18rem;
+  line-height: 2rem;
 }
 
 #UITourTooltipClose {
-  -moz-margin-end: -15px;
-  margin-top: -12px;
+  -moz-margin-end: -10px;
+  margin-top: -14px;
+}
+
+@media (min-resolution: 2dppx) {
+  #UITourTooltipClose > .toolbarbutton-icon {
+    width: 16px;
+  }
 }
diff --git a/browser/themes/shared/UITour.inc.css b/browser/themes/shared/UITour.inc.css
index e905ce519f8..24b7359693b 100644
--- a/browser/themes/shared/UITour.inc.css
+++ b/browser/themes/shared/UITour.inc.css
@@ -23,11 +23,23 @@
   min-width: 32px;
 }
 
+#UITourTooltipBody {
+  -moz-margin-end: 14px;
+}
+
+#UITourTooltipBody > vbox {
+  padding-top: 4px;
+}
+
+#UITourTooltipIconContainer {
+  -moz-margin-start: -16px;
+}
+
 #UITourTooltipIcon {
   width: 48px;
   height: 48px;
-  -moz-margin-start: 8px;
-  -moz-margin-end: 18px;
+  -moz-margin-start: 28px;
+  -moz-margin-end: 28px;
 }
 
 #UITourTooltipTitle,
@@ -36,11 +48,11 @@
 }
 
 #UITourTooltipTitle {
-  font-size: 1.3rem;
+  font-size: 1.45rem;
   font-weight: bold;
   -moz-margin-start: 0;
   -moz-margin-end: 0;
-  margin: 10px 0 19px 0;
+  margin: 0 0 9px 0;
 }
 
 #UITourTooltipDescription {
@@ -48,6 +60,7 @@
   -moz-margin-end: 0;
   font-size: 1.15rem;
   line-height: 1.8rem;
+  margin-bottom: 0; /* Override global.css */
 }
 
 #UITourTooltipClose {
@@ -56,27 +69,29 @@
   background-color: transparent;
   min-width: 0;
   -moz-margin-start: 4px;
-  -moz-margin-end: -10px;
-  margin-top: -8px;
+  margin-top: -2px;
+}
+
+#UITourTooltipClose > .toolbarbutton-text {
+  display: none;
 }
 
 #UITourTooltipButtons {
-  margin: 1.5em 0 .9em 0;
+  -moz-box-pack: end;
+  background-color: hsla(210,4%,10%,.07);
+  border-top: 1px solid hsla(210,4%,10%,.14);
+  margin: 24px -16px -16px;
+  padding: 2em 15px;
 }
 
 #UITourTooltipButtons > button {
-  margin-left: 6px;
-  margin-right: 6px;
+  margin: 0 15px;
 }
 
 #UITourTooltipButtons > button:first-child {
   -moz-margin-start: 0;
 }
 
-#UITourTooltipButtons > button:last-child {
-  -moz-margin-end: 24px;
-}
-
 #UITourTooltipButtons > button[image] > .button-box > .button-icon {
   width: 16px;
   height: 16px;
@@ -89,11 +104,12 @@
 
 #UITourTooltipButtons > button:not(.button-link) {
   -moz-appearance: none;
-  padding: 2px 10px;
-  background-color: hsla(210,4%,10%,.08);
-  border-radius: 2px;
+  background-color: rgb(251,251,251);
+  border-radius: 3px;
   border: 1px solid;
-  border-color: hsla(210,4%,10%,.1);
+  border-color: rgb(192,192,192);
+  color: rgb(71,71,71);
+  padding: 4px 30px;
   transition-property: background-color, border-color;
   transition-duration: 150ms;
 }
@@ -117,3 +133,15 @@
 #UITourTooltipButtons > button.button-link:hover {
   color: black;
 }
+
+/* The primary button gets the same color as the customize button. */
+#UITourTooltipButtons > button.button-primary {
+  background-color: rgb(116,191,67);
+  color: white;
+  padding-left: 30px;
+  padding-right: 30px;
+}
+
+#UITourTooltipButtons > button.button-primary:not(:active):hover {
+  background-color: rgb(105,173,61);
+}
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index a341cad4cf4..3a008d758de 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2757,3 +2757,7 @@ chatbox {
 }
 
 %include ../shared/UITour.inc.css
+
+#UITourTooltipButtons {
+  margin: 24px -4px -4px;
+}

From 5a9c5d4ef700913be0ed4a023a325d4d350e259c Mon Sep 17 00:00:00 2001
From: Sebastian Hengst <archaeopteryx@coole-files.de>
Date: Sat, 15 Mar 2014 14:21:50 -0700
Subject: [PATCH 11/17] Bug 983724 - Remove unused
 customizeMode.menuAndToolbars.label from browser.dtd. rs=mconley over irc

--HG--
extra : rebase_source : d9179d9bbc7258fa219d400af56af3871909ef2d
---
 browser/locales/en-US/chrome/browser/browser.dtd | 1 -
 1 file changed, 1 deletion(-)

diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 35b81e4a8a6..bd1b0964e24 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -686,7 +686,6 @@ just addresses the organization to follow, e.g. "This site is run by " -->
 
 
 <!ENTITY customizeMode.tabTitle "Customize &brandShortName;">
-<!ENTITY customizeMode.menuAndToolbars.label "Menu and toolbars">
 <!ENTITY customizeMode.menuAndToolbars.header2 "Additional Tools and Features">
 <!ENTITY customizeMode.menuAndToolbars.empty "Want more tools?">
 <!ENTITY customizeMode.menuAndToolbars.emptyLink "Choose from thousands of add-ons">

From ae8b888a17a3fcc80c4d96bb4d03b1829a97c3ef Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Sat, 15 Mar 2014 14:26:30 -0700
Subject: [PATCH 12/17] Bug 981682 - Don't bother nulling dialog when its
 closed. r=bnicholson

---
 mobile/android/base/prompts/Prompt.java | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/mobile/android/base/prompts/Prompt.java b/mobile/android/base/prompts/Prompt.java
index d20c938d2b6..0e45333a1b4 100644
--- a/mobile/android/base/prompts/Prompt.java
+++ b/mobile/android/base/prompts/Prompt.java
@@ -392,7 +392,7 @@ public class Prompt implements OnClickListener, OnCancelListener, OnItemClickLis
             ret.put("button", -1);
         } catch(Exception ex) { }
         addInputValues(ret);
-        finishDialog(ret);
+        notifyClosing(ret);
     }
 
     /* Called any time we're closing the dialog to cleanup and notify listeners that the dialog
@@ -406,16 +406,13 @@ public class Prompt implements OnClickListener, OnCancelListener, OnItemClickLis
         addListResult(ret, which);
         addInputValues(ret);
 
-        finishDialog(ret);
+        notifyClosing(ret);
     }
 
     /* Called any time we're closing the dialog to cleanup and notify listeners that the dialog
      * is closing.
      */
-    public void finishDialog(JSONObject aReturn) {
-        mInputs = null;
-        mButtons = null;
-        mDialog = null;
+    private void notifyClosing(JSONObject aReturn) {
         try {
             aReturn.put("guid", mGuid);
         } catch(JSONException ex) { }
@@ -426,7 +423,6 @@ public class Prompt implements OnClickListener, OnCancelListener, OnItemClickLis
         if (mCallback != null) {
             mCallback.onPromptFinished(aReturn.toString());
         }
-        mGuid = null;
     }
 
     /* Handles parsing the initial JSON sent to show dialogs

From 1d1eed35a551ae32028e88918f0acc62f7d61872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Jim=C3=83=C2=A9nez?= <ferjmoreno@gmail.com>
Date: Thu, 13 Mar 2014 22:00:48 -0700
Subject: [PATCH 13/17] Bug 976002 - Build time flag to enable/disable FxA.
 r=markh

---
 b2g/app/b2g.js                        |  6 ++++++
 b2g/app/moz.build                     |  2 +-
 b2g/chrome/content/shell.js           |  3 +++
 b2g/components/B2GComponents.manifest |  2 ++
 b2g/components/moz.build              | 10 ++++++++--
 b2g/confvars.sh                       |  2 ++
 b2g/installer/package-manifest.in     |  8 +++++---
 browser/confvars.sh                   |  2 +-
 configure.in                          |  8 ++++++++
 services/moz.build                    |  4 +++-
 10 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
index ee8158c731c..116a4a0d0c6 100644
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -907,3 +907,9 @@ pref("browser.autofocus", false);
 
 // Enable wakelock
 pref("dom.wakelock.enabled", true);
+
+// Enable sync and mozId with Firefox Accounts.
+#ifdef MOZ_SERVICES_FXACCOUNTS
+pref("services.sync.fxaccounts.enabled", true);
+pref("identity.fxaccounts.enabled", true);
+#endif
diff --git a/b2g/app/moz.build b/b2g/app/moz.build
index 58c21fc4b22..d4802b0bfd2 100644
--- a/b2g/app/moz.build
+++ b/b2g/app/moz.build
@@ -22,7 +22,7 @@ if CONFIG['ENABLE_MARIONETTE']:
 
 DEFINES['XPCOM_GLUE'] = True
 
-for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION', 'MOZ_UPDATER'):
+for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION', 'MOZ_UPDATER', 'MOZ_SERVICES_FXACCOUNTS'):
     DEFINES[var] = CONFIG[var]
 
 GENERATED_INCLUDES += [
diff --git a/b2g/chrome/content/shell.js b/b2g/chrome/content/shell.js
index 20c08bf88ed..d1bfd1162d7 100644
--- a/b2g/chrome/content/shell.js
+++ b/b2g/chrome/content/shell.js
@@ -23,7 +23,10 @@ Cu.import('resource://gre/modules/NetworkStatsService.jsm');
 // Identity
 Cu.import('resource://gre/modules/SignInToWebsite.jsm');
 SignInToWebsiteController.init();
+
+#ifdef MOZ_SERVICES_FXACCOUNTS
 Cu.import('resource://gre/modules/FxAccountsMgmtService.jsm');
+#endif
 
 Cu.import('resource://gre/modules/DownloadsAPI.jsm');
 
diff --git a/b2g/components/B2GComponents.manifest b/b2g/components/B2GComponents.manifest
index 56fbcdcca9c..491cf788149 100644
--- a/b2g/components/B2GComponents.manifest
+++ b/b2g/components/B2GComponents.manifest
@@ -72,9 +72,11 @@ component {637b0f77-2429-49a0-915f-abf5d0db8b9a} WebappsUpdateTimer.js
 contract @mozilla.org/b2g/webapps-update-timer;1 {637b0f77-2429-49a0-915f-abf5d0db8b9a}
 category update-timer WebappsUpdateTimer @mozilla.org/b2g/webapps-update-timer;1,getService,background-update-timer,webapps.update.interval,86400
 
+#ifdef MOZ_SERVICES_FXACCOUNTS
 # FxAccountsUIGlue.js
 component {51875c14-91d7-4b8c-b65d-3549e101228c} FxAccountsUIGlue.js
 contract @mozilla.org/fxaccounts/fxaccounts-ui-glue;1 {51875c14-91d7-4b8c-b65d-3549e101228c}
+#endif
 
 # HelperAppDialog.js
 component {710322af-e6ae-4b0c-b2c9-1474a87b077e} HelperAppDialog.js
diff --git a/b2g/components/moz.build b/b2g/components/moz.build
index 331b6b1111c..4955c45caa6 100644
--- a/b2g/components/moz.build
+++ b/b2g/components/moz.build
@@ -13,7 +13,6 @@ EXTRA_COMPONENTS += [
     'ContentHandler.js',
     'ContentPermissionPrompt.js',
     'FilePicker.js',
-    'FxAccountsUIGlue.js',
     'HelperAppDialog.js',
     'MailtoProtocolHandler.js',
     'PaymentGlue.js',
@@ -37,8 +36,15 @@ if CONFIG['MOZ_UPDATER']:
 
 EXTRA_JS_MODULES += [
     'ErrorPage.jsm',
-    'FxAccountsMgmtService.jsm',
     'SignInToWebsite.jsm',
     'TelURIParser.jsm',
     'WebappsUpdater.jsm',
 ]
+
+if CONFIG['MOZ_SERVICES_FXACCOUNTS']:
+    EXTRA_COMPONENTS += [
+        'FxAccountsUIGlue.js'
+    ]
+    EXTRA_JS_MODULES += [
+        'FxAccountsMgmtService.jsm'
+    ]
diff --git a/b2g/confvars.sh b/b2g/confvars.sh
index 543f5f7f140..96f6e331702 100644
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -63,3 +63,5 @@ fi
 MOZ_FOLD_LIBS=1
 
 MOZ_JSDOWNLOADS=1
+
+MOZ_SERVICES_FXACCOUNTS=1
diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
index 9fa8a099894..e63d78ab0fa 100644
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -783,16 +783,18 @@ bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
 @BINPATH@/components/TelProtocolHandler.js
 @BINPATH@/components/B2GAboutRedirector.js
 @BINPATH@/components/FilePicker.js
-@BINPATH@/components/FxAccountsUIGlue.js
 @BINPATH@/components/HelperAppDialog.js
 @BINPATH@/components/DownloadsUI.js
 
+#ifdef MOZ_SERVICES_FXACCOUNTS
+@BINPATH@/components/FxAccountsUIGlue.js
+@BINPATH@/components/services_fxaccounts.xpt
+#endif
+
 @BINPATH@/components/DataStore.manifest
 @BINPATH@/components/DataStoreService.js
 @BINPATH@/components/dom_datastore.xpt
 
-@BINPATH@/components/services_fxaccounts.xpt
-
 #ifdef MOZ_WEBSPEECH
 @BINPATH@/components/dom_webspeechsynth.xpt
 #endif
diff --git a/browser/confvars.sh b/browser/confvars.sh
index 403b0201a74..478b70bd079 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -28,6 +28,7 @@ MOZ_DISABLE_EXPORT_JS=1
 MOZ_SAFE_BROWSING=1
 MOZ_SERVICES_COMMON=1
 MOZ_SERVICES_CRYPTO=1
+MOZ_SERVICES_FXACCOUNTS=1
 MOZ_SERVICES_HEALTHREPORT=1
 MOZ_SERVICES_METRICS=1
 MOZ_SERVICES_SYNC=1
@@ -67,4 +68,3 @@ MOZ_JSDOWNLOADS=1
 MOZ_WEBM_ENCODER=1
 # Enable exact rooting on desktop.
 JSGC_USE_EXACT_ROOTING=1
-
diff --git a/configure.in b/configure.in
index 1408b8beb30..c382ebae230 100644
--- a/configure.in
+++ b/configure.in
@@ -7409,6 +7409,14 @@ if test -n "$MOZ_AUDIO_CHANNEL_MANAGER"; then
 fi
 AC_SUBST(MOZ_AUDIO_CHANNEL_MANAGER)
 
+dnl ========================================================
+dnl = Enable Support for Firefox Accounts in B2G
+dnl ========================================================
+if test -n "$MOZ_SERVICES_FXACCOUNTS"; then
+    AC_DEFINE(MOZ_SERVICES_FXACCOUNTS)
+fi
+AC_SUBST(MOZ_SERVICES_FXACCOUNTS)
+
 dnl ========================================================
 dnl = Support for demangling undefined symbols
 dnl ========================================================
diff --git a/services/moz.build b/services/moz.build
index e57f15d1f69..a5d07d71b78 100644
--- a/services/moz.build
+++ b/services/moz.build
@@ -7,7 +7,6 @@
 PARALLEL_DIRS += [
     'common',
     'crypto',
-    'fxaccounts',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
@@ -22,6 +21,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
 if CONFIG['MOZ_SERVICES_METRICS']:
     PARALLEL_DIRS += ['metrics']
 
+if CONFIG['MOZ_SERVICES_FXACCOUNTS']:
+    PARALLEL_DIRS += ['fxaccounts']
+
 if CONFIG['MOZ_SERVICES_SYNC']:
     PARALLEL_DIRS += ['sync']
 

From 3eec9738d0412ac809b06c4f0eac5c8c67dceafc Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Sat, 15 Mar 2014 17:38:42 -0400
Subject: [PATCH 14/17] Bug 983657 - Update gamepad joystick dead zone to be
 larger based on user feedback. r=Cwiiis

---
 mobile/android/app/mobile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index c0720cd6bb7..49aef04a30d 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -674,7 +674,7 @@ pref("ui.scrolling.axis_lock_mode", "standard");
 pref("ui.scrolling.negate_wheel_scrollY", true);
 // Determine the dead zone for gamepad joysticks. Higher values result in larger dead zones; use a negative value to
 // auto-detect based on reported hardware values
-pref("ui.scrolling.gamepad_dead_zone", 10);
+pref("ui.scrolling.gamepad_dead_zone", 115);
 
 
 // Enable accessibility mode if platform accessibility is enabled.

From 0c80674197fd54a4c472c30a0c861af425c26199 Mon Sep 17 00:00:00 2001
From: Asaf Romano <aromano@mozilla.com>
Date: Sat, 15 Mar 2014 23:49:07 +0200
Subject: [PATCH 15/17] Bug 983623 - Async transactions: Add a preference for
 turning it, implement undo & redo commands. r=mak

---
 .../components/places/content/controller.js   | 31 ++++++++++++-
 .../components/places/src/PlacesUIUtils.jsm   |  8 ++++
 .../components/places/PlacesTransactions.jsm  | 28 +++++++++++-
 .../tests/unit/test_async_transactions.js     | 45 ++++++++++++++-----
 4 files changed, 99 insertions(+), 13 deletions(-)

diff --git a/browser/components/places/content/controller.js b/browser/components/places/content/controller.js
index 8d7c0dcfe3e..570296abcdb 100644
--- a/browser/components/places/content/controller.js
+++ b/browser/components/places/content/controller.js
@@ -124,11 +124,38 @@ PlacesController.prototype = {
   },
 
   isCommandEnabled: function PC_isCommandEnabled(aCommand) {
+    if (PlacesUIUtils.useAsyncTransactions) {
+      switch (aCommand) {
+      case "cmd_cut":
+      case "placesCmd_cut":
+      case "cmd_copy":
+      case "cmd_paste":
+      case "cmd_delete":
+      case "placesCmd_delete":
+      case "placesCmd_moveBookmarks":
+      case "cmd_paste":
+      case "placesCmd_paste":
+      case "placesCmd_new:folder":
+      case "placesCmd_new:livemark":
+      case "placesCmd_new:bookmark":
+      case "placesCmd_new:separator":
+      case "placesCmd_sortBy:name":
+      case "placesCmd_createBookmark":
+        return false;
+      }
+    }
+
     switch (aCommand) {
     case "cmd_undo":
-      return PlacesUtils.transactionManager.numberOfUndoItems > 0;
+      if (!PlacesUIUtils.useAsyncTransactions)
+        return PlacesUtils.transactionManager.numberOfUndoItems > 0;
+
+      return PlacesTransactions.topUndoEntry != null;
     case "cmd_redo":
-      return PlacesUtils.transactionManager.numberOfRedoItems > 0;
+      if (!PlacesUIUtils.useAsyncTransactions)
+        return PlacesUtils.transactionManager.numberOfRedoItems > 0;
+
+      return PlacesTransactions.topRedoEntry != null;
     case "cmd_cut":
     case "placesCmd_cut":
       var nodes = this._view.selectedNodes;
diff --git a/browser/components/places/src/PlacesUIUtils.jsm b/browser/components/places/src/PlacesUIUtils.jsm
index 16d8c3ff8db..a9d510e0528 100644
--- a/browser/components/places/src/PlacesUIUtils.jsm
+++ b/browser/components/places/src/PlacesUIUtils.jsm
@@ -1022,6 +1022,14 @@ XPCOMUtils.defineLazyGetter(PlacesUIUtils, "ellipsis", function() {
                                         Ci.nsIPrefLocalizedString).data;
 });
 
+XPCOMUtils.defineLazyGetter(PlacesUIUtils, "useAsyncTransactions", function() {
+  try {
+    return Services.prefs.getBoolPref("browser.places.useAsyncTransactions");
+  }
+  catch(ex) { }
+  return false;
+});
+
 XPCOMUtils.defineLazyServiceGetter(this, "URIFixup",
                                    "@mozilla.org/docshell/urifixup;1",
                                    "nsIURIFixup");
diff --git a/toolkit/components/places/PlacesTransactions.jsm b/toolkit/components/places/PlacesTransactions.jsm
index dffc9e42331..a7f18c3d9de 100644
--- a/toolkit/components/places/PlacesTransactions.jsm
+++ b/toolkit/components/places/PlacesTransactions.jsm
@@ -121,6 +121,7 @@ this.EXPORTED_SYMBOLS = ["PlacesTransactions"];
  */
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+Components.utils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Promise",
                                   "resource://gre/modules/Promise.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Task",
@@ -132,6 +133,18 @@ XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
 XPCOMUtils.defineLazyModuleGetter(this, "console",
                                   "resource://gre/modules/devtools/Console.jsm");
 
+// Updates commands in the undo group of the active window commands.
+// Inactive windows commands will be updated on focus.
+function updateCommandsOnActiveWindow() {
+  // Updating "undo" will cause a group update including "redo".
+  try {
+    let win = Services.focus.activeWindow;
+    if (win)
+      win.updateCommands("undo");
+  }
+  catch(ex) { console.error(ex, "Couldn't update undo commands"); }
+}
+
 // The internal object for managing the transactions history.
 // The public API is included in PlacesTransactions.
 // TODO bug 982099: extending the array "properly" makes it painful to implement
@@ -173,6 +186,7 @@ TransactionsHistory.__proto__ = {
       }
     }
     this._undoPosition++;
+    updateCommandsOnActiveWindow();
   },
 
   /**
@@ -201,6 +215,7 @@ TransactionsHistory.__proto__ = {
       }
     }
     this._undoPosition--;
+    updateCommandsOnActiveWindow();
   },
 
   /**
@@ -222,6 +237,7 @@ TransactionsHistory.__proto__ = {
     else {
       this[this.undoPosition].unshift(aTransaction);
     }
+    updateCommandsOnActiveWindow();
   },
 
   /**
@@ -411,7 +427,7 @@ let PlacesTransactions = {
    * @note the returned array is a clone of the history entry and is not
    * kept in sync with the original entry if it changes.
    */
-  item: function (aIndex) {
+  entry: function (aIndex) {
     if (!Number.isInteger(aIndex) || aIndex < 0 || aIndex >= this.length)
       throw new Error("Invalid index");
 
@@ -425,6 +441,16 @@ let PlacesTransactions = {
    * Entries at and past this point are redo entries.
    */
   get undoPosition() TransactionsHistory.undoPosition,
+
+  /**
+   * Shortcut for accessing the top undo entry in the transaction history.
+   */
+  get topUndoEntry() TransactionsHistory.topUndoEntry,
+
+  /**
+   * Shortcut for accessing the top redo entry in the transaction history.
+   */
+  get topRedoEntry() TransactionsHistory.topRedoEntry
 };
 
 /**
diff --git a/toolkit/components/places/tests/unit/test_async_transactions.js b/toolkit/components/places/tests/unit/test_async_transactions.js
index d7e7703bee7..8e99a83ab6d 100644
--- a/toolkit/components/places/tests/unit/test_async_transactions.js
+++ b/toolkit/components/places/tests/unit/test_async_transactions.js
@@ -116,18 +116,43 @@ function run_test() {
   run_next_test();
 }
 
-function ensureUndoState(aEntries = [], aUndoPosition = 0) {
-  do_check_eq(PT.length, aEntries.length);
-  do_check_eq(PT.undoPosition, aUndoPosition);
+function sanityCheckTransactionHistory() {
+  do_check_true(PT.undoPosition <= PT.length);
 
-  for (let i = 0; i < aEntries.length; i++) {
-    let testEntry = aEntries[i];
-    let undoEntry = PT.item(i);
-    do_check_eq(testEntry.length, undoEntry.length);
-    for (let j = 0; j < testEntry.length; j++) {
-      do_check_eq(testEntry[j], undoEntry[j]);
-    }
+  let check_entry_throws = f => {
+    try {
+      f();
+      do_throw("PT.entry should throw for invalid input");
+    } catch(ex) {}
+  };
+  check_entry_throws( () => PT.entry(-1) );
+  check_entry_throws( () => PT.entry({}) );
+  check_entry_throws( () => PT.entry(PT.length) );
+
+  if (PT.undoPosition < PT.length)
+    do_check_eq(PT.topUndoEntry, PT.entry(PT.undoPosition));
+  else
+    do_check_null(PT.topUndoEntry);
+  if (PT.undoPosition > 0)
+    do_check_eq(PT.topRedoEntry, PT.entry(PT.undoPosition - 1));
+  else
+    do_check_null(PT.topRedoEntry);
+}
+
+function ensureUndoState(aExpectedEntries = [], aExpectedUndoPosition = 0) {
+  // ensureUndoState is called in various places during this test, so it's
+  // a good places to sanity-check the transaction-history APIs in all
+  // cases.
+  sanityCheckTransactionHistory();
+
+  do_check_eq(PT.length, aExpectedEntries.length);
+  do_check_eq(PT.undoPosition, aExpectedUndoPosition);
+
+  function checkEqualEntries(aExpectedEntry, aActualEntry) {
+    do_check_eq(aExpectedEntry.length, aActualEntry.length);
+    aExpectedEntry.forEach( (t, i) => do_check_eq(t, aActualEntry[i]) );
   }
+  aExpectedEntries.forEach( (e, i) => checkEqualEntries(e, PT.entry(i)) );
 }
 
 function ensureItemsAdded(...items) {

From 7b155083f505d97361f1533106037516fae17b52 Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Sat, 15 Mar 2014 15:45:23 +0100
Subject: [PATCH 16/17] [Australis] Bug 983732: Put sync promo footer back in
 the right place. r=MattN

---
 browser/themes/windows/browser.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 3a008d758de..059694c76f1 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2194,6 +2194,10 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   margin-top: -10px;
 }
 
+#notification-popup .panel-promo-box {
+  margin: 10px -10px -10px;
+}
+
 #notification-popup-box {
   position: relative;
   background-color: #fff;

From 22d8c115f3e04a84d25fbcd4e0a10936ba969b7a Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Sat, 15 Mar 2014 19:50:09 -0400
Subject: [PATCH 17/17] Backed out changeset a1d95da23e97 (bug 976002) for
 Android xpcshell failures.

---
 b2g/app/b2g.js                        |  6 ------
 b2g/app/moz.build                     |  2 +-
 b2g/chrome/content/shell.js           |  3 ---
 b2g/components/B2GComponents.manifest |  2 --
 b2g/components/moz.build              | 10 ++--------
 b2g/confvars.sh                       |  2 --
 b2g/installer/package-manifest.in     |  8 +++-----
 browser/confvars.sh                   |  2 +-
 configure.in                          |  8 --------
 services/moz.build                    |  4 +---
 10 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
index 116a4a0d0c6..ee8158c731c 100644
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -907,9 +907,3 @@ pref("browser.autofocus", false);
 
 // Enable wakelock
 pref("dom.wakelock.enabled", true);
-
-// Enable sync and mozId with Firefox Accounts.
-#ifdef MOZ_SERVICES_FXACCOUNTS
-pref("services.sync.fxaccounts.enabled", true);
-pref("identity.fxaccounts.enabled", true);
-#endif
diff --git a/b2g/app/moz.build b/b2g/app/moz.build
index d4802b0bfd2..58c21fc4b22 100644
--- a/b2g/app/moz.build
+++ b/b2g/app/moz.build
@@ -22,7 +22,7 @@ if CONFIG['ENABLE_MARIONETTE']:
 
 DEFINES['XPCOM_GLUE'] = True
 
-for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION', 'MOZ_UPDATER', 'MOZ_SERVICES_FXACCOUNTS'):
+for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION', 'MOZ_UPDATER'):
     DEFINES[var] = CONFIG[var]
 
 GENERATED_INCLUDES += [
diff --git a/b2g/chrome/content/shell.js b/b2g/chrome/content/shell.js
index d1bfd1162d7..20c08bf88ed 100644
--- a/b2g/chrome/content/shell.js
+++ b/b2g/chrome/content/shell.js
@@ -23,10 +23,7 @@ Cu.import('resource://gre/modules/NetworkStatsService.jsm');
 // Identity
 Cu.import('resource://gre/modules/SignInToWebsite.jsm');
 SignInToWebsiteController.init();
-
-#ifdef MOZ_SERVICES_FXACCOUNTS
 Cu.import('resource://gre/modules/FxAccountsMgmtService.jsm');
-#endif
 
 Cu.import('resource://gre/modules/DownloadsAPI.jsm');
 
diff --git a/b2g/components/B2GComponents.manifest b/b2g/components/B2GComponents.manifest
index 491cf788149..56fbcdcca9c 100644
--- a/b2g/components/B2GComponents.manifest
+++ b/b2g/components/B2GComponents.manifest
@@ -72,11 +72,9 @@ component {637b0f77-2429-49a0-915f-abf5d0db8b9a} WebappsUpdateTimer.js
 contract @mozilla.org/b2g/webapps-update-timer;1 {637b0f77-2429-49a0-915f-abf5d0db8b9a}
 category update-timer WebappsUpdateTimer @mozilla.org/b2g/webapps-update-timer;1,getService,background-update-timer,webapps.update.interval,86400
 
-#ifdef MOZ_SERVICES_FXACCOUNTS
 # FxAccountsUIGlue.js
 component {51875c14-91d7-4b8c-b65d-3549e101228c} FxAccountsUIGlue.js
 contract @mozilla.org/fxaccounts/fxaccounts-ui-glue;1 {51875c14-91d7-4b8c-b65d-3549e101228c}
-#endif
 
 # HelperAppDialog.js
 component {710322af-e6ae-4b0c-b2c9-1474a87b077e} HelperAppDialog.js
diff --git a/b2g/components/moz.build b/b2g/components/moz.build
index 4955c45caa6..331b6b1111c 100644
--- a/b2g/components/moz.build
+++ b/b2g/components/moz.build
@@ -13,6 +13,7 @@ EXTRA_COMPONENTS += [
     'ContentHandler.js',
     'ContentPermissionPrompt.js',
     'FilePicker.js',
+    'FxAccountsUIGlue.js',
     'HelperAppDialog.js',
     'MailtoProtocolHandler.js',
     'PaymentGlue.js',
@@ -36,15 +37,8 @@ if CONFIG['MOZ_UPDATER']:
 
 EXTRA_JS_MODULES += [
     'ErrorPage.jsm',
+    'FxAccountsMgmtService.jsm',
     'SignInToWebsite.jsm',
     'TelURIParser.jsm',
     'WebappsUpdater.jsm',
 ]
-
-if CONFIG['MOZ_SERVICES_FXACCOUNTS']:
-    EXTRA_COMPONENTS += [
-        'FxAccountsUIGlue.js'
-    ]
-    EXTRA_JS_MODULES += [
-        'FxAccountsMgmtService.jsm'
-    ]
diff --git a/b2g/confvars.sh b/b2g/confvars.sh
index 96f6e331702..543f5f7f140 100644
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -63,5 +63,3 @@ fi
 MOZ_FOLD_LIBS=1
 
 MOZ_JSDOWNLOADS=1
-
-MOZ_SERVICES_FXACCOUNTS=1
diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
index e63d78ab0fa..9fa8a099894 100644
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -783,18 +783,16 @@ bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
 @BINPATH@/components/TelProtocolHandler.js
 @BINPATH@/components/B2GAboutRedirector.js
 @BINPATH@/components/FilePicker.js
+@BINPATH@/components/FxAccountsUIGlue.js
 @BINPATH@/components/HelperAppDialog.js
 @BINPATH@/components/DownloadsUI.js
 
-#ifdef MOZ_SERVICES_FXACCOUNTS
-@BINPATH@/components/FxAccountsUIGlue.js
-@BINPATH@/components/services_fxaccounts.xpt
-#endif
-
 @BINPATH@/components/DataStore.manifest
 @BINPATH@/components/DataStoreService.js
 @BINPATH@/components/dom_datastore.xpt
 
+@BINPATH@/components/services_fxaccounts.xpt
+
 #ifdef MOZ_WEBSPEECH
 @BINPATH@/components/dom_webspeechsynth.xpt
 #endif
diff --git a/browser/confvars.sh b/browser/confvars.sh
index 478b70bd079..403b0201a74 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -28,7 +28,6 @@ MOZ_DISABLE_EXPORT_JS=1
 MOZ_SAFE_BROWSING=1
 MOZ_SERVICES_COMMON=1
 MOZ_SERVICES_CRYPTO=1
-MOZ_SERVICES_FXACCOUNTS=1
 MOZ_SERVICES_HEALTHREPORT=1
 MOZ_SERVICES_METRICS=1
 MOZ_SERVICES_SYNC=1
@@ -68,3 +67,4 @@ MOZ_JSDOWNLOADS=1
 MOZ_WEBM_ENCODER=1
 # Enable exact rooting on desktop.
 JSGC_USE_EXACT_ROOTING=1
+
diff --git a/configure.in b/configure.in
index c382ebae230..1408b8beb30 100644
--- a/configure.in
+++ b/configure.in
@@ -7409,14 +7409,6 @@ if test -n "$MOZ_AUDIO_CHANNEL_MANAGER"; then
 fi
 AC_SUBST(MOZ_AUDIO_CHANNEL_MANAGER)
 
-dnl ========================================================
-dnl = Enable Support for Firefox Accounts in B2G
-dnl ========================================================
-if test -n "$MOZ_SERVICES_FXACCOUNTS"; then
-    AC_DEFINE(MOZ_SERVICES_FXACCOUNTS)
-fi
-AC_SUBST(MOZ_SERVICES_FXACCOUNTS)
-
 dnl ========================================================
 dnl = Support for demangling undefined symbols
 dnl ========================================================
diff --git a/services/moz.build b/services/moz.build
index a5d07d71b78..e57f15d1f69 100644
--- a/services/moz.build
+++ b/services/moz.build
@@ -7,6 +7,7 @@
 PARALLEL_DIRS += [
     'common',
     'crypto',
+    'fxaccounts',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
@@ -21,9 +22,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
 if CONFIG['MOZ_SERVICES_METRICS']:
     PARALLEL_DIRS += ['metrics']
 
-if CONFIG['MOZ_SERVICES_FXACCOUNTS']:
-    PARALLEL_DIRS += ['fxaccounts']
-
 if CONFIG['MOZ_SERVICES_SYNC']:
     PARALLEL_DIRS += ['sync']
 
