From 88e1b58dfb6d23068a4c5157f8251d4ef3219d30 Mon Sep 17 00:00:00 2001
From: Blair McBride <bmcbride@mozilla.com>
Date: Mon, 15 Apr 2013 10:52:24 +1200
Subject: [PATCH 1/9] Bug 861092 - When in customization mode, widgets aren't
 re-wrapped when dragging to the same position in an area. r=jaws.

---
 browser/modules/CustomizeMode.jsm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/browser/modules/CustomizeMode.jsm b/browser/modules/CustomizeMode.jsm
index 115abbd7a51..d1ee9ccd54a 100644
--- a/browser/modules/CustomizeMode.jsm
+++ b/browser/modules/CustomizeMode.jsm
@@ -531,6 +531,12 @@ CustomizeMode.prototype = {
       return;
     }
 
+    // Do nothing if the target was dropped onto itself (ie, no change in area
+    // or position).
+    if (draggedWrapper == targetNode) {
+      return;
+    }
+
     // Is the target area the customization palette? If so, we have two cases -
     // either the originArea was the palette, or a customizable area.
     if (targetArea.id == kPaletteId) {

From 70325929e1d30980ad0aa71582ce6b97d0b9cf61 Mon Sep 17 00:00:00 2001
From: Blair McBride <bmcbride@mozilla.com>
Date: Mon, 15 Apr 2013 13:35:16 +1200
Subject: [PATCH 2/9] Bug 861702 - PanelUI sub-view container can end up
 showing multiple views. r=jaws.

---
 browser/base/content/panelUI.inc   | 2 +-
 browser/modules/CustomizableUI.jsm | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/panelUI.inc b/browser/base/content/panelUI.inc
index 26f09b560fe..11515c4b263 100644
--- a/browser/base/content/panelUI.inc
+++ b/browser/base/content/panelUI.inc
@@ -67,7 +67,7 @@
            whether or not it is shown. That's not good for our case, since we
            want to allow each subview to be uniquely sized. -->
       <box id="PanelUI-subViews">
-        <vbox id="PanelUI-bookmarks" class="PanelUI-subView" flex="1">
+        <vbox id="PanelUI-bookmarks" flex="1">
           <label value="&appMenuBookmarks.label;"/>
           <vbox flex="1">
             <toolbarbutton label="&bookmarkThisPageCmd.label;"/>
diff --git a/browser/modules/CustomizableUI.jsm b/browser/modules/CustomizableUI.jsm
index eb6d65605a8..baf71bda40a 100644
--- a/browser/modules/CustomizableUI.jsm
+++ b/browser/modules/CustomizableUI.jsm
@@ -729,6 +729,10 @@ let CustomizableUIInternal = {
         throw new Error("Could not find the view node with id: " + aWidget.viewId);
       }
 
+      // PanelUI relies on the .PanelUI-subView class to be able to show only
+      // one sub-view at a time.
+      viewNode.classList.add("PanelUI-subView");
+
       for (let eventName of kSubviewEvents) {
         let handler = "on" + eventName;
         if (typeof aWidget[handler] == "function") {

From f1af47f61002a540e7bf9c3613bb7dd3a7789c17 Mon Sep 17 00:00:00 2001
From: Jared Wein <jaws@mozilla.com>
Date: Fri, 19 Apr 2013 17:06:53 -0400
Subject: [PATCH 3/9] Bug 861087 - Resize the subview when the subview
 overflows. r=Unfocused.

---
 browser/base/content/panelUI.js              | 7 +++++++
 browser/modules/CustomizableUI.jsm           | 2 +-
 browser/themes/shared/panelUIOverlay.inc.css | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/panelUI.js b/browser/base/content/panelUI.js
index f0527a16088..373c5cd71de 100644
--- a/browser/base/content/panelUI.js
+++ b/browser/base/content/panelUI.js
@@ -56,6 +56,13 @@ const PanelUI = {
     this.clickCapturer.addEventListener("click", this._onCapturerClick,
                                         true);
 
+    var self = this;
+    this.subViews.addEventListener("overflow", function() {
+      // Resize the subview on the next tick.
+      Services.tm.currentThread.dispatch(self._syncContainerWithSubView.bind(self),
+        Ci.nsIThread.DISPATCH_NORMAL);
+    });
+
     // Get a MutationObserver ready to react to subview size changes. We
     // only attach this MutationObserver when a subview is being displayed.
     this._subViewObserver = new MutationObserver(function(aMutations) {
diff --git a/browser/modules/CustomizableUI.jsm b/browser/modules/CustomizableUI.jsm
index baf71bda40a..da5ce0f734d 100644
--- a/browser/modules/CustomizableUI.jsm
+++ b/browser/modules/CustomizableUI.jsm
@@ -123,7 +123,7 @@ XPCOMUtils.defineLazyGetter(this, "gBuiltInWidgets", function() {
     },
     onViewShowing: function(aEvent) {
       // Populate our list of history
-      const kMaxResults = 10;
+      const kMaxResults = 15;
       let doc = aEvent.detail.ownerDocument;
 
       let options = PlacesUtils.history.getNewQueryOptions();
diff --git a/browser/themes/shared/panelUIOverlay.inc.css b/browser/themes/shared/panelUIOverlay.inc.css
index 5866971c83a..0f99f41113c 100644
--- a/browser/themes/shared/panelUIOverlay.inc.css
+++ b/browser/themes/shared/panelUIOverlay.inc.css
@@ -84,6 +84,7 @@
   margin-left: 38px;
   transform: translateX(@menuPanelWidth@);
   transition: transform 150ms;
+  overflow-y: hidden;
 }
 
 #PanelUI-subViews > .PanelUI-subView:not([current]) {

From 4f2ccf3a071a5788d404bcfecd8859de630f6f18 Mon Sep 17 00:00:00 2001
From: Blair McBride <bmcbride@mozilla.com>
Date: Mon, 15 Apr 2013 17:34:52 +1200
Subject: [PATCH 4/9] Bug 858196 - Move all customization code to be under
 browser/components/customizableui/. r=jaws.

--HG--
rename : browser/base/content/customizing.xhtml => browser/components/customizableui/content/aboutCustomizing.xhtml
rename : browser/base/content/customize.inc => browser/components/customizableui/content/customizeMode.inc.xul
rename : browser/base/content/panelUI.inc => browser/components/customizableui/content/panelUI.inc.xul
rename : browser/base/content/panelUI.js => browser/components/customizableui/content/panelUI.js
rename : browser/base/content/panelUI.xml => browser/components/customizableui/content/panelUI.xml
rename : browser/base/content/panelUIOverlay.js => browser/components/customizableui/content/panelUIOverlay.js
rename : browser/base/content/panelUIOverlay.xul => browser/components/customizableui/content/panelUIOverlay.xul
rename : browser/base/content/toolbar.xml => browser/components/customizableui/content/toolbar.xml
rename : browser/modules/CustomizableUI.jsm => browser/components/customizableui/src/CustomizableUI.jsm
rename : browser/modules/CustomizeMode.jsm => browser/components/customizableui/src/CustomizeMode.jsm
rename : browser/themes/linux/customization/customization-mode-background.jpg => browser/themes/linux/customizableui/customization-mode-background.jpg
rename : browser/themes/linux/panelUIOverlay.css => browser/themes/linux/customizableui/panelUIOverlay.css
rename : browser/themes/osx/customization/customization-mode-background.jpg => browser/themes/osx/customizableui/customization-mode-background.jpg
rename : browser/themes/osx/panelUIOverlay.css => browser/themes/osx/customizableui/panelUIOverlay.css
rename : browser/themes/shared/customization.inc.css => browser/themes/shared/customizableui/customizeMode.inc.css
rename : browser/themes/shared/panelUIOverlay.inc.css => browser/themes/shared/customizableui/panelUIOverlay.inc.css
rename : browser/themes/windows/customization/customization-mode-background.jpg => browser/themes/windows/customizableui/customization-mode-background.jpg
rename : browser/themes/windows/panelUIOverlay.css => browser/themes/windows/customizableui/panelUIOverlay.css
---
 browser/base/content/browser.css              |   2 +-
 browser/base/content/browser.js               |   3 ++-
 browser/base/content/browser.xul              |   6 +++---
 browser/base/content/global-scripts.inc       |   2 +-
 browser/base/jar.mn                           |  13 ------------
 browser/components/about/AboutRedirector.cpp  |   2 +-
 .../content/aboutCustomizing.xhtml}           |   0
 .../content/customizeMode.inc.xul}            |   0
 .../components/customizableui/content/jar.mn  |  19 ++++++++++++++++++
 .../customizableui/content/moz.build          |   6 ++++++
 .../customizableui/content/panelUI.inc.xul}   |   0
 .../customizableui}/content/panelUI.js        |   0
 .../customizableui}/content/panelUI.xml       |   0
 .../customizableui}/content/panelUIOverlay.js |   0
 .../content/panelUIOverlay.xul                |   4 ++--
 .../customizableui}/content/toolbar.xml       |   0
 browser/components/customizableui/moz.build   |  10 +++++++++
 .../customizableui/src}/CustomizableUI.jsm    |   0
 .../customizableui/src}/CustomizeMode.jsm     |   0
 .../components/customizableui/src/Makefile.in |  17 ++++++++++++++++
 .../components/customizableui/src/moz.build   |   6 ++++++
 browser/components/moz.build                  |   1 +
 browser/modules/Makefile.in                   |   2 --
 browser/themes/linux/browser.css              |   2 +-
 .../customization-mode-background.jpg         | Bin
 .../{ => customizableui}/panelUIOverlay.css   |   2 +-
 browser/themes/linux/jar.mn                   |   4 ++--
 browser/themes/osx/browser.css                |   2 +-
 .../customization-mode-background.jpg         | Bin
 .../{ => customizableui}/panelUIOverlay.css   |   2 +-
 browser/themes/osx/jar.mn                     |   4 ++--
 .../customizeMode.inc.css}                    |   2 +-
 .../panelUIOverlay.inc.css                    |   0
 browser/themes/windows/browser.css            |   2 +-
 .../customization-mode-background.jpg         | Bin
 .../{ => customizableui}/panelUIOverlay.css   |   2 +-
 browser/themes/windows/jar.mn                 |   8 ++++----
 37 files changed, 84 insertions(+), 39 deletions(-)
 rename browser/{base/content/customizing.xhtml => components/customizableui/content/aboutCustomizing.xhtml} (100%)
 rename browser/{base/content/customize.inc => components/customizableui/content/customizeMode.inc.xul} (100%)
 create mode 100644 browser/components/customizableui/content/jar.mn
 create mode 100644 browser/components/customizableui/content/moz.build
 rename browser/{base/content/panelUI.inc => components/customizableui/content/panelUI.inc.xul} (100%)
 rename browser/{base => components/customizableui}/content/panelUI.js (100%)
 rename browser/{base => components/customizableui}/content/panelUI.xml (100%)
 rename browser/{base => components/customizableui}/content/panelUIOverlay.js (100%)
 rename browser/{base => components/customizableui}/content/panelUIOverlay.xul (86%)
 rename browser/{base => components/customizableui}/content/toolbar.xml (100%)
 create mode 100644 browser/components/customizableui/moz.build
 rename browser/{modules => components/customizableui/src}/CustomizableUI.jsm (100%)
 rename browser/{modules => components/customizableui/src}/CustomizeMode.jsm (100%)
 create mode 100644 browser/components/customizableui/src/Makefile.in
 create mode 100644 browser/components/customizableui/src/moz.build
 rename browser/themes/linux/{customization => customizableui}/customization-mode-background.jpg (100%)
 rename browser/themes/linux/{ => customizableui}/panelUIOverlay.css (95%)
 rename browser/themes/osx/{customization => customizableui}/customization-mode-background.jpg (100%)
 rename browser/themes/osx/{ => customizableui}/panelUIOverlay.css (94%)
 rename browser/themes/shared/{customization.inc.css => customizableui/customizeMode.inc.css} (95%)
 rename browser/themes/shared/{ => customizableui}/panelUIOverlay.inc.css (100%)
 rename browser/themes/windows/{customization => customizableui}/customization-mode-background.jpg (100%)
 rename browser/themes/windows/{ => customizableui}/panelUIOverlay.css (93%)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 14615818af4..3822ef1bd56 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -10,7 +10,7 @@ searchbar {
 }
 
 #nav-bar {
-  -moz-binding: url("chrome://browser/content/toolbar.xml#toolbar");
+  -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar");
 }
 
 tabbrowser {
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 63a7d376e30..373c7707dbf 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -3502,7 +3502,8 @@ var XULBrowserWindow = {
   statusText: "",
   isBusy: false,
   // The pages in this array should be kept in sync with what pages that
-  // panelUIOverlay.xul is set to overlay in /browser/base/jar.mn
+  // panelUIOverlay.xul is set to overlay in
+  // browser/components/customizableui/content/jar.mn
   inContentWhitelist: ["about:addons", "about:downloads", "about:permissions",
                        "about:sync-progress", "about:preferences"],
 
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index fe552474265..3b1c24e7058 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -9,7 +9,7 @@
 <?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/devtools/common.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/panelUIOverlay.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUIOverlay.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
@@ -467,7 +467,7 @@
       </popupnotificationcontent>
     </popupnotification>
 
-#include panelUI.inc
+#include ../../components/customizableui/content/panelUI.inc.xul
   </popupset>
 
 #ifdef CAN_DRAW_IN_TITLEBAR
@@ -1135,7 +1135,7 @@
       </vbox>
       <vbox id="browser-border-end" hidden="true" layer="true"/>
     </hbox>
-#include customize.inc
+#include ../../components/customizableui/content/customizeMode.inc.xul
   </deck>
 
   <hbox id="full-screen-warning-container" hidden="true" fadeout="true">
diff --git a/browser/base/content/global-scripts.inc b/browser/base/content/global-scripts.inc
index a02805edaba..22b61aeae84 100755
--- a/browser/base/content/global-scripts.inc
+++ b/browser/base/content/global-scripts.inc
@@ -9,6 +9,6 @@
 <script type="application/javascript" src="chrome://browser/content/browser.js"/>
 <script type="application/javascript" src="chrome://browser/content/downloads/downloads.js"/>
 <script type="application/javascript" src="chrome://browser/content/downloads/indicator.js"/>
-<script type="application/javascript" src="chrome://browser/content/panelUI.js"/>
+<script type="application/javascript" src="chrome://browser/content/customizableui/panelUI.js"/>
 <script type="application/javascript" src="chrome://global/content/inlineSpellCheckUI.js"/>
 <script type="application/javascript" src="chrome://global/content/viewSourceUtils.js"/>
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index f9cac5b2df3..6e3c97e2c4b 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -14,13 +14,6 @@ browser.jar:
 %  overlay chrome://global/content/viewSource.xul chrome://browser/content/viewSourceOverlay.xul
 %  overlay chrome://global/content/viewPartialSource.xul chrome://browser/content/viewSourceOverlay.xul
 
-# These overlays should be kept in sync with what pages are in 
-# XULBrowserWindow.inContentWhitelist in browser.js
-% overlay about:addons                                chrome://browser/content/panelUIOverlay.xul
-% overlay about:preferences                           chrome://browser/content/panelUIOverlay.xul
-% overlay about:permissions                           chrome://browser/content/panelUIOverlay.xul
-% overlay about:sync-progress                         chrome://browser/content/panelUIOverlay.xul
-
 *       content/browser/aboutDialog.xul               (content/aboutDialog.xul)
 *       content/browser/aboutDialog.js                (content/aboutDialog.js)
         content/browser/aboutDialog.css               (content/aboutDialog.css)
@@ -66,7 +59,6 @@ browser.jar:
 *       content/browser/browser.xul                   (content/browser.xul)
 *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
         content/browser/content.js                    (content/content.js)
-        content/browser/customizing.xhtml             (content/customizing.xhtml)
         content/browser/newtab/newTab.xul             (content/newtab/newTab.xul)
 *       content/browser/newtab/newTab.js              (content/newtab/newTab.js)
         content/browser/newtab/newTab.css             (content/newtab/newTab.css)
@@ -79,9 +71,6 @@ browser.jar:
         content/browser/pageinfo/feeds.xml            (content/pageinfo/feeds.xml)
         content/browser/pageinfo/permissions.js       (content/pageinfo/permissions.js)
         content/browser/pageinfo/security.js          (content/pageinfo/security.js)
-        content/browser/panelUI.js                    (content/panelUI.js)
-        content/browser/panelUIOverlay.xul            (content/panelUIOverlay.xul)
-        content/browser/panelUIOverlay.js             (content/panelUIOverlay.js)
 #ifdef MOZ_SERVICES_SYNC
         content/browser/sync/aboutSyncTabs.xul        (content/sync/aboutSyncTabs.xul)
         content/browser/sync/aboutSyncTabs.js         (content/sync/aboutSyncTabs.js)
@@ -101,8 +90,6 @@ browser.jar:
         content/browser/sync/progress.js              (content/sync/progress.js)
         content/browser/sync/progress.xhtml           (content/sync/progress.xhtml)
 #endif
-        content/browser/panelUI.xml                   (content/panelUI.xml)
-        content/browser/toolbar.xml                   (content/toolbar.xml)
         content/browser/openLocation.js               (content/openLocation.js)
         content/browser/openLocation.xul              (content/openLocation.xul)
         content/browser/safeMode.css                  (content/safeMode.css)
diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp
index ec843c4cc84..1151ae43aee 100644
--- a/browser/components/about/AboutRedirector.cpp
+++ b/browser/components/about/AboutRedirector.cpp
@@ -84,7 +84,7 @@ static RedirEntry kRedirMap[] = {
   { "healthreport", "chrome://browser/content/abouthealthreport/abouthealth.xhtml",
     nsIAboutModule::ALLOW_SCRIPT },
 #endif
-  { "customizing", "chrome://browser/content/customizing.xhtml",
+  { "customizing", "chrome://browser/content/customizableui/aboutCustomizing.xhtml",
     nsIAboutModule::ALLOW_SCRIPT },
 };
 static const int kRedirTotal = NS_ARRAY_LENGTH(kRedirMap);
diff --git a/browser/base/content/customizing.xhtml b/browser/components/customizableui/content/aboutCustomizing.xhtml
similarity index 100%
rename from browser/base/content/customizing.xhtml
rename to browser/components/customizableui/content/aboutCustomizing.xhtml
diff --git a/browser/base/content/customize.inc b/browser/components/customizableui/content/customizeMode.inc.xul
similarity index 100%
rename from browser/base/content/customize.inc
rename to browser/components/customizableui/content/customizeMode.inc.xul
diff --git a/browser/components/customizableui/content/jar.mn b/browser/components/customizableui/content/jar.mn
new file mode 100644
index 00000000000..e2b78b4b66b
--- /dev/null
+++ b/browser/components/customizableui/content/jar.mn
@@ -0,0 +1,19 @@
+# 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/customizableui/aboutCustomizing.xhtml
+  content/browser/customizableui/panelUI.js
+  content/browser/customizableui/panelUI.xml
+  content/browser/customizableui/panelUIOverlay.xul
+  content/browser/customizableui/panelUIOverlay.js
+  content/browser/customizableui/toolbar.xml
+
+
+# These overlays should be kept in sync with what pages are in
+# XULBrowserWindow.inContentWhitelist in browser.js
+% overlay about:addons               chrome://browser/content/customizableui/panelUIOverlay.xul
+% overlay about:preferences          chrome://browser/content/customizableui/panelUIOverlay.xul
+% overlay about:permissions          chrome://browser/content/customizableui/panelUIOverlay.xul
+% overlay about:sync-progress        chrome://browser/content/customizableui/panelUIOverlay.xul
diff --git a/browser/components/customizableui/content/moz.build b/browser/components/customizableui/content/moz.build
new file mode 100644
index 00000000000..895d11993cf
--- /dev/null
+++ b/browser/components/customizableui/content/moz.build
@@ -0,0 +1,6 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
diff --git a/browser/base/content/panelUI.inc b/browser/components/customizableui/content/panelUI.inc.xul
similarity index 100%
rename from browser/base/content/panelUI.inc
rename to browser/components/customizableui/content/panelUI.inc.xul
diff --git a/browser/base/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
similarity index 100%
rename from browser/base/content/panelUI.js
rename to browser/components/customizableui/content/panelUI.js
diff --git a/browser/base/content/panelUI.xml b/browser/components/customizableui/content/panelUI.xml
similarity index 100%
rename from browser/base/content/panelUI.xml
rename to browser/components/customizableui/content/panelUI.xml
diff --git a/browser/base/content/panelUIOverlay.js b/browser/components/customizableui/content/panelUIOverlay.js
similarity index 100%
rename from browser/base/content/panelUIOverlay.js
rename to browser/components/customizableui/content/panelUIOverlay.js
diff --git a/browser/base/content/panelUIOverlay.xul b/browser/components/customizableui/content/panelUIOverlay.xul
similarity index 86%
rename from browser/base/content/panelUIOverlay.xul
rename to browser/components/customizableui/content/panelUIOverlay.xul
index b8245cff180..8f49fa9b081 100644
--- a/browser/base/content/panelUIOverlay.xul
+++ b/browser/components/customizableui/content/panelUIOverlay.xul
@@ -10,11 +10,11 @@
   %browserDTD;
 ]>
 
-<?xml-stylesheet href="chrome://browser/skin/panelUIOverlay.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUIOverlay.css" type="text/css"?>
 
 <overlay id="panelUIOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/javascript" src="chrome://browser/content/panelUIOverlay.js"/>
+  <script type="application/javascript" src="chrome://browser/content/customizableui/panelUIOverlay.js"/>
 
   <hbox id="app-extension-point-end">
     <toolbarbutton id="PanelUI-menu-button"
diff --git a/browser/base/content/toolbar.xml b/browser/components/customizableui/content/toolbar.xml
similarity index 100%
rename from browser/base/content/toolbar.xml
rename to browser/components/customizableui/content/toolbar.xml
diff --git a/browser/components/customizableui/moz.build b/browser/components/customizableui/moz.build
new file mode 100644
index 00000000000..ecda062b999
--- /dev/null
+++ b/browser/components/customizableui/moz.build
@@ -0,0 +1,10 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+PARALLEL_DIRS += [
+		'content',
+		'src',
+]
diff --git a/browser/modules/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
similarity index 100%
rename from browser/modules/CustomizableUI.jsm
rename to browser/components/customizableui/src/CustomizableUI.jsm
diff --git a/browser/modules/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
similarity index 100%
rename from browser/modules/CustomizeMode.jsm
rename to browser/components/customizableui/src/CustomizeMode.jsm
diff --git a/browser/components/customizableui/src/Makefile.in b/browser/components/customizableui/src/Makefile.in
new file mode 100644
index 00000000000..1509df58348
--- /dev/null
+++ b/browser/components/customizableui/src/Makefile.in
@@ -0,0 +1,17 @@
+# 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/.
+
+DEPTH     = @DEPTH@
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+EXTRA_JS_MODULES = \
+  CustomizableUI.jsm \
+  CustomizeMode.jsm \
+  $(NULL)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/customizableui/src/moz.build b/browser/components/customizableui/src/moz.build
new file mode 100644
index 00000000000..895d11993cf
--- /dev/null
+++ b/browser/components/customizableui/src/moz.build
@@ -0,0 +1,6 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
diff --git a/browser/components/moz.build b/browser/components/moz.build
index a781c598826..52f479ff697 100644
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -7,6 +7,7 @@
 PARALLEL_DIRS += [
     'about',
     'certerror',
+    'customizableui',
     'dirprovider',
     'downloads',
     'feeds',
diff --git a/browser/modules/Makefile.in b/browser/modules/Makefile.in
index a713c35844d..983a3c91e56 100644
--- a/browser/modules/Makefile.in
+++ b/browser/modules/Makefile.in
@@ -13,8 +13,6 @@ include $(topsrcdir)/config/config.mk
 
 EXTRA_JS_MODULES = \
 	BrowserNewTabPreloader.jsm \
-	CustomizableUI.jsm \
-	CustomizeMode.jsm \
 	openLocationLastURL.jsm \
 	NetworkPrioritizer.jsm \
 	offlineAppCache.jsm \
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 054cbe48f15..873e2484d5f 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -2168,7 +2168,7 @@ chatbox {
 
 /* Customization mode */
 
-%include ../shared/customization.inc.css
+%include ../shared/customizableui/customizeMode.inc.css
 
 /* End customization mode */
 
diff --git a/browser/themes/linux/customization/customization-mode-background.jpg b/browser/themes/linux/customizableui/customization-mode-background.jpg
similarity index 100%
rename from browser/themes/linux/customization/customization-mode-background.jpg
rename to browser/themes/linux/customizableui/customization-mode-background.jpg
diff --git a/browser/themes/linux/panelUIOverlay.css b/browser/themes/linux/customizableui/panelUIOverlay.css
similarity index 95%
rename from browser/themes/linux/panelUIOverlay.css
rename to browser/themes/linux/customizableui/panelUIOverlay.css
index 11e8c6c0be3..acf69a84fbb 100644
--- a/browser/themes/linux/panelUIOverlay.css
+++ b/browser/themes/linux/customizableui/panelUIOverlay.css
@@ -5,7 +5,7 @@
 %filter substitution
 %define menuPanelWidth 21em
 
-%include ../shared/panelUIOverlay.inc.css
+%include ../../shared/customizableui/panelUIOverlay.inc.css
 
 #PanelUI-cut-btn {
   list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar");
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index bedc616da93..ccb1ba5ec6a 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -21,7 +21,7 @@ browser.jar:
   skin/classic/browser/appmenu.png
 * skin/classic/browser/browser.css
   skin/classic/browser/click-to-play-warning-stripes.png
-  skin/classic/browser/customization/customization-mode-background.jpg (customization/customization-mode-background.jpg)
+  skin/classic/browser/customizableui/customization-mode-background.jpg (customizableui/customization-mode-background.jpg)
 * skin/classic/browser/engineManager.css
   skin/classic/browser/Geolocation-16.png
   skin/classic/browser/Geolocation-64.png
@@ -41,7 +41,6 @@ browser.jar:
 * skin/classic/browser/pageInfo.css
   skin/classic/browser/pageInfo.png
   skin/classic/browser/page-livemarks.png
-* skin/classic/browser/panelUIOverlay.css
   skin/classic/browser/pointerLock-16.png
   skin/classic/browser/pointerLock-64.png
   skin/classic/browser/Privacy-16.png
@@ -58,6 +57,7 @@ browser.jar:
   skin/classic/browser/webRTC-shareDevice-16.png
   skin/classic/browser/webRTC-shareDevice-64.png
   skin/classic/browser/webRTC-sharingDevice-16.png
+* skin/classic/browser/customizableui/panelUIOverlay.css (customizableui/panelUIOverlay.css)
   skin/classic/browser/downloads/buttons.png          (downloads/buttons.png)
   skin/classic/browser/downloads/download-glow.png    (downloads/download-glow.png)
   skin/classic/browser/downloads/download-glow-small.png (downloads/download-glow-small.png)
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index b4da79f7d6b..9410f7a2aee 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -3600,7 +3600,7 @@ chatbox {
 
 /* Customization mode */
 
-%include ../shared/customization.inc.css
+%include ../shared/customizableui/customizeMode.inc.css
 
 /* End customization mode */
 
diff --git a/browser/themes/osx/customization/customization-mode-background.jpg b/browser/themes/osx/customizableui/customization-mode-background.jpg
similarity index 100%
rename from browser/themes/osx/customization/customization-mode-background.jpg
rename to browser/themes/osx/customizableui/customization-mode-background.jpg
diff --git a/browser/themes/osx/panelUIOverlay.css b/browser/themes/osx/customizableui/panelUIOverlay.css
similarity index 94%
rename from browser/themes/osx/panelUIOverlay.css
rename to browser/themes/osx/customizableui/panelUIOverlay.css
index eccce5a230f..3d65a4a0391 100644
--- a/browser/themes/osx/panelUIOverlay.css
+++ b/browser/themes/osx/customizableui/panelUIOverlay.css
@@ -5,7 +5,7 @@
 %filter substitution
 %define menuPanelWidth 26em
 
-%include ../shared/panelUIOverlay.inc.css
+%include ../../shared/customizableui/panelUIOverlay.inc.css
 
 .PanelUI-pageControls toolbarbutton {
   list-style-image: url("chrome://browser/skin/Toolbar.png");
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index 7281146fd8e..aeab0d0dc4d 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -21,7 +21,7 @@ browser.jar:
   skin/classic/browser/appmenu.png
 * skin/classic/browser/browser.css                          (browser.css)
   skin/classic/browser/click-to-play-warning-stripes.png
-  skin/classic/browser/customization/customization-mode-background.jpg (customization/customization-mode-background.jpg)
+  skin/classic/browser/customizationui/customization-mode-background.jpg (customizationui/customization-mode-background.jpg)
 * skin/classic/browser/engineManager.css                    (engineManager.css)
   skin/classic/browser/Geolocation-16.png
   skin/classic/browser/Geolocation-16@2x.png
@@ -60,7 +60,6 @@ browser.jar:
   skin/classic/browser/page-livemarks.png
   skin/classic/browser/page-livemarks@2x.png
   skin/classic/browser/pageInfo.css
-* skin/classic/browser/panelUIOverlay.css
   skin/classic/browser/pointerLock-16.png
   skin/classic/browser/pointerLock-16@2x.png
   skin/classic/browser/pointerLock-64.png
@@ -93,6 +92,7 @@ browser.jar:
   skin/classic/browser/webRTC-shareDevice-64@2x.png
   skin/classic/browser/webRTC-sharingDevice-16.png
   skin/classic/browser/webRTC-sharingDevice-16@2x.png
+* skin/classic/browser/customizableui/panelUIOverlay.css    (customizableui/panelUIOverlay.css)
   skin/classic/browser/downloads/buttons.png                (downloads/buttons.png)
   skin/classic/browser/downloads/buttons@2x.png             (downloads/buttons@2x.png)
   skin/classic/browser/downloads/download-glow.png          (downloads/download-glow.png)
diff --git a/browser/themes/shared/customization.inc.css b/browser/themes/shared/customizableui/customizeMode.inc.css
similarity index 95%
rename from browser/themes/shared/customization.inc.css
rename to browser/themes/shared/customizableui/customizeMode.inc.css
index a6836c1cb9c..c315bbdfe2d 100644
--- a/browser/themes/shared/customization.inc.css
+++ b/browser/themes/shared/customizableui/customizeMode.inc.css
@@ -5,7 +5,7 @@
 /* Customization mode */
 
 #main-window[customizing] {
-  background-image: url("chrome://browser/skin/customization/customization-mode-background.jpg");
+  background-image: url("chrome://browser/skin/customizableui/customization-mode-background.jpg");
   background-size: 100% 100%;
   background-repeat: no-repeat;
 }
diff --git a/browser/themes/shared/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
similarity index 100%
rename from browser/themes/shared/panelUIOverlay.inc.css
rename to browser/themes/shared/customizableui/panelUIOverlay.inc.css
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 7cc9371f71e..6625499f317 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2931,7 +2931,7 @@ chatbox {
 
 /* Customization mode */
 
-%include ../shared/customization.inc.css
+%include ../shared/customizableui/customizeMode.inc.css
 
 /* End customization mode */
 
diff --git a/browser/themes/windows/customization/customization-mode-background.jpg b/browser/themes/windows/customizableui/customization-mode-background.jpg
similarity index 100%
rename from browser/themes/windows/customization/customization-mode-background.jpg
rename to browser/themes/windows/customizableui/customization-mode-background.jpg
diff --git a/browser/themes/windows/panelUIOverlay.css b/browser/themes/windows/customizableui/panelUIOverlay.css
similarity index 93%
rename from browser/themes/windows/panelUIOverlay.css
rename to browser/themes/windows/customizableui/panelUIOverlay.css
index 17989b9e90e..0afbeb7780d 100644
--- a/browser/themes/windows/panelUIOverlay.css
+++ b/browser/themes/windows/customizableui/panelUIOverlay.css
@@ -5,7 +5,7 @@
 %filter substitution
 %define menuPanelWidth 23em
 
-%include ../shared/panelUIOverlay.inc.css
+%include ../../shared/customizableui/panelUIOverlay.inc.css
 
 .PanelUI-pageControls toolbarbutton {
   list-style-image: url("chrome://browser/skin/Toolbar.png");
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index 3d58fa92a1c..89ddad456df 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -25,7 +25,7 @@ browser.jar:
         skin/classic/browser/appmenu-dropmarker.png
 *       skin/classic/browser/browser.css
         skin/classic/browser/click-to-play-warning-stripes.png
-        skin/classic/browser/customization/customization-mode-background.jpg (customization/customization-mode-background.jpg)
+        skin/classic/browser/customizableui/customization-mode-background.jpg (customizableui/customization-mode-background.jpg)
 *       skin/classic/browser/engineManager.css
         skin/classic/browser/Geolocation-16.png
         skin/classic/browser/Geolocation-64.png
@@ -49,7 +49,6 @@ browser.jar:
         skin/classic/browser/pageInfo.css
         skin/classic/browser/pageInfo.png
         skin/classic/browser/page-livemarks.png                      (feeds/feedIcon16.png)
-*       skin/classic/browser/panelUIOverlay.css
         skin/classic/browser/pointerLock-16.png
         skin/classic/browser/pointerLock-64.png
         skin/classic/browser/Privacy-16.png
@@ -75,6 +74,7 @@ browser.jar:
         skin/classic/browser/webRTC-shareDevice-16.png
         skin/classic/browser/webRTC-shareDevice-64.png
         skin/classic/browser/webRTC-sharingDevice-16.png
+*       skin/classic/browser/customizableui/panelUIOverlay.css       (customizableui/panelUIOverlay.css)
         skin/classic/browser/downloads/buttons.png                   (downloads/buttons.png)
         skin/classic/browser/downloads/download-glow.png             (downloads/download-glow.png)
         skin/classic/browser/downloads/download-notification-finish.png (downloads/download-notification-finish.png)
@@ -280,7 +280,7 @@ browser.jar:
         skin/classic/aero/browser/appmenu-icons.png
 *       skin/classic/aero/browser/browser.css                        (browser-aero.css)
         skin/classic/aero/browser/click-to-play-warning-stripes.png
-        skin/classic/aero/browser/customization/customization-mode-background.jpg (customization/customization-mode-background.jpg)
+        skin/classic/aero/browser/customizableui/customization-mode-background.jpg (customizableui/customization-mode-background.jpg)
 *       skin/classic/aero/browser/engineManager.css
         skin/classic/aero/browser/Geolocation-16.png
         skin/classic/aero/browser/Geolocation-64.png
@@ -304,7 +304,6 @@ browser.jar:
         skin/classic/aero/browser/pageInfo.css
         skin/classic/aero/browser/pageInfo.png                       (pageInfo-aero.png)
         skin/classic/aero/browser/page-livemarks.png                 (feeds/feedIcon16-aero.png)
-*       skin/classic/aero/browser/panelUIOverlay.css
         skin/classic/aero/browser/pointerLock-16.png                 (pointerLock-16.png)
         skin/classic/aero/browser/pointerLock-64.png                 (pointerLock-64.png)
         skin/classic/aero/browser/Privacy-16.png                     (Privacy-16-aero.png)
@@ -330,6 +329,7 @@ browser.jar:
         skin/classic/aero/browser/webRTC-shareDevice-16.png
         skin/classic/aero/browser/webRTC-shareDevice-64.png
         skin/classic/aero/browser/webRTC-sharingDevice-16.png
+*       skin/classic/aero/browser/customizableui/panelUIOverlay.css  (customizableui/panelUIOverlay.css)
         skin/classic/aero/browser/downloads/buttons.png              (downloads/buttons-aero.png)
         skin/classic/aero/browser/downloads/download-glow.png        (downloads/download-glow.png)
         skin/classic/aero/browser/downloads/download-notification-finish.png (downloads/download-notification-finish.png)

From baf5b9b233d53824d55ec02a41d83759cfdb57e5 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Mon, 22 Apr 2013 09:43:18 -0400
Subject: [PATCH 5/9] Follow-up for Bug 858196 - fix themes/osx/jar.mn to point
 to customization-mode-background correctly. r=trivial.

---
 browser/themes/osx/jar.mn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index aeab0d0dc4d..ba72245ce35 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -21,7 +21,7 @@ browser.jar:
   skin/classic/browser/appmenu.png
 * skin/classic/browser/browser.css                          (browser.css)
   skin/classic/browser/click-to-play-warning-stripes.png
-  skin/classic/browser/customizationui/customization-mode-background.jpg (customizationui/customization-mode-background.jpg)
+  skin/classic/browser/customizableui/customization-mode-background.jpg (customizableui/customization-mode-background.jpg)
 * skin/classic/browser/engineManager.css                    (engineManager.css)
   skin/classic/browser/Geolocation-16.png
   skin/classic/browser/Geolocation-16@2x.png

From 1ba5f638d016126573786875ff43c59431eeb7ab Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Wed, 24 Apr 2013 12:52:22 -0400
Subject: [PATCH 6/9] Bustage fix after bad merge in
 https://hg.mozilla.org/projects/jamun/rev/cff96d365fcd. r=bustage-fix

---
 browser/base/content/browser.xul | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 680be2456c9..b7afb1199fd 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -929,6 +929,13 @@
                      onclick="BrowserGoHome(event);"
                      aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
 
+      <toolbaritem id="social-toolbar-item"
+                   class="chromeclass-toolbar-additional"
+                   removable="false"
+                   title="&socialToolbar.title;"
+                   hidden="true"
+                   skipintoolbarset="true"
+                   observes="socialActiveBroadcaster">
         <toolbarbutton id="social-provider-button"
                        class="toolbarbutton-1"
                        type="menu">

From 40ca5ea733a10cc8725429154613ad2d4fcd16d2 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Wed, 24 Apr 2013 13:26:01 -0400
Subject: [PATCH 7/9] Bug 573329 - Remove 'text' and 'text&icons' mode for
 toolbar buttons. r=mconley

---
 browser/base/content/browser.css    |  17 +----
 browser/components/nsBrowserGlue.js |  21 ++++-
 browser/themes/linux/browser.css    |  15 +---
 browser/themes/osx/browser.css      | 114 ++++++++++------------------
 browser/themes/windows/browser.css  |  19 +----
 5 files changed, 69 insertions(+), 117 deletions(-)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index ac195e77040..2a04a2ac0c5 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -140,11 +140,10 @@ toolbar[printpreview="true"] {
 #urlbar-container:not([combined]) > #urlbar > toolbarbutton,
 #urlbar-container[combined] + #reload-button + #stop-button,
 #urlbar-container[combined] + #reload-button,
-toolbar:not([mode="icons"]) > #urlbar-container > #urlbar > toolbarbutton,
-toolbar[mode="icons"] > #urlbar-container > #urlbar > #urlbar-reload-button:not([displaystop]) + #urlbar-stop-button,
-toolbar[mode="icons"] > #urlbar-container > #urlbar > #urlbar-reload-button[displaystop],
-toolbar[mode="icons"] > #reload-button:not([displaystop]) + #stop-button,
-toolbar[mode="icons"] > #reload-button[displaystop] {
+#urlbar-reload-button:not([displaystop]) + #urlbar-stop-button,
+#urlbar-reload-button[displaystop],
+#reload-button:not([displaystop]) + #stop-button,
+#reload-button[displaystop] {
   visibility: collapse;
 }
 
@@ -439,14 +438,6 @@ window[chromehidden~="toolbar"] toolbar:not(.toolbar-primary):not(.chromeclass-m
   min-width: 1px;
 }
 
-#nav-bar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-icon {
-  display: -moz-box;
-}
-
-#nav-bar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-text {
-  display: none;
-}
-
 /* ::::: Ctrl-Tab Panel ::::: */
 
 .ctrlTab-preview > html|img,
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index 0dcda6248eb..229c04ceaa9 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -1170,7 +1170,7 @@ BrowserGlue.prototype = {
   },
 
   _migrateUI: function BG__migrateUI() {
-    const UI_VERSION = 12;
+    const UI_VERSION = 13;
     const BROWSER_DOCURL = "chrome://browser/content/browser.xul#";
     let currentUIVersion = 0;
     try {
@@ -1363,6 +1363,25 @@ BrowserGlue.prototype = {
       }
     }
 
+    if (currentUIVersion < 13) {
+      // Migrate users from text or text&icons mode to icons mode.
+      let toolbarResources = [this._rdf.GetResource(BROWSER_DOCURL + "navigator-toolbox"),
+                              this._rdf.GetResource(BROWSER_DOCURL + "nav-bar"),
+                              this._rdf.GetResource(BROWSER_DOCURL + "PersonalToolbar"),
+                              this._rdf.GetResource(BROWSER_DOCURL + "addon-bar")];
+      let modeResource = this._rdf.GetResource("mode");
+      let iconsizeResource = this._rdf.GetResource("iconsize");
+      for (let toolbarResource of toolbarResources) {
+        let toolbarMode = this._getPersist(toolbarResource, modeResource);
+        if (toolbarMode != "icons") {
+          this._setPersist(toolbarResource, modeResource, "icons");
+          // If the user wasn't previously using icons mode, switch
+          // them to the default (large icon mode).
+          this._setPersist(toolbarResource, iconsizeResource, "large");
+        }
+      }
+    }
+
     if (this._dirty)
       this._dataSource.QueryInterface(Ci.nsIRDFRemoteDataSource).Flush();
 
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 7e922ca6211..aa2ca8f959b 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -15,8 +15,8 @@
 %define fgTabTexture linear-gradient(transparent 0px, transparent 1px, hsla(0,0%,100%,0.35) 1px, hsla(0,0%,100%,0.35) 2px, hsla(0,0%,100%,0.65) 2px, hsla(0,0%,100%,0.65) 3px, @toolbarHighlight@)
 %define fgTabBackgroundMiddle @fgTabTexture@, linear-gradient(transparent 0px, transparent 2px, -moz-dialog 2px, -moz-dialog)
 %define forwardTransitionLength 150ms
-%define conditionalForwardWithUrlbar       window:not([chromehidden~=toolbar]) :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"][mode=icons],                #nav-bar:not([currentset])[mode=icons])                 > #unified-back-forward-button
-%define conditionalForwardWithUrlbar_small window:not([chromehidden~=toolbar]) :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"][mode=icons][iconsize=small],#nav-bar:not([currentset])[mode=icons][iconsize=small]) > #unified-back-forward-button
+%define conditionalForwardWithUrlbar       window:not([chromehidden~=toolbar]) :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],                #nav-bar:not([currentset]))                 > #unified-back-forward-button
+%define conditionalForwardWithUrlbar_small window:not([chromehidden~=toolbar]) :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"][iconsize=small],#nav-bar:not([currentset])[iconsize=small]) > #unified-back-forward-button
 %define conditionalForwardWithUrlbarWidth 32
 %define conditionalForwardWithUrlbarWidth_small 24
 
@@ -92,7 +92,7 @@ toolbarbutton.bookmark-item[open="true"] {
   height: 16px;
 }
 
-/* Prevent [mode="icons"] from hiding the label */
+/* Force the display of the label for bookmarks */
 .bookmark-item > .toolbarbutton-text {
   display: -moz-box !important;
 }
@@ -538,11 +538,6 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   -moz-margin-end: 0;
 }
 
-toolbar[mode="full"] .toolbarbutton-1:not([type="menu-button"]),
-toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
-  min-width: 57px;
-}
-
 .toolbarbutton-1:not([type="menu-button"]),
 .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   padding: 5px;
@@ -1792,10 +1787,6 @@ toolbarbutton.chevron > .toolbarbutton-icon {
   margin: 0;
 }
 
-toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
-  display: -moz-box; /* display chevron icon in text mode */
-}
-
 /* Ctrl-Tab */
 
 .ctrlTab-preview {
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index ec95861acac..6bb857bb26d 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -9,7 +9,7 @@
 %define fgTabTexture linear-gradient(hsla(0,0%,100%,0.6), hsla(0,0%,100%,0.6) 0px, hsl(0,0%,99%) 1px, hsl(0,0%,92%))
 %define fgTabBackgroundMiddle linear-gradient(transparent, transparent)
 %define forwardTransitionLength 150ms
-%define conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #unified-back-forward-button
+%define conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #unified-back-forward-button
 %define conditionalForwardWithUrlbarWidth 27
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@@ -78,11 +78,6 @@ toolbox[tabsontop=true] > toolbar:not(#TabsToolbar):not(#nav-bar):not(:-moz-lwth
   background: url(chrome://browser/skin/Toolbar-background-noise.png) hsl(0,0%,83%);
 }
 
-/* We need more height when toolbar buttons show both icon and text. */
-toolbar[mode="full"] toolbarseparator {
-  min-height: 36px;
-}
-
 #nav-bar {
   padding-bottom: 4px !important;
 }
@@ -139,10 +134,6 @@ toolbarbutton.chevron > .toolbarbutton-text {
   display: none;
 }
 
-toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
-  display: -moz-box; /* display chevron icon in text mode */
-}
-
 toolbarbutton.chevron:-moz-locale-dir(rtl) > .toolbarbutton-icon {
   transform: scaleX(-1);
 }
@@ -188,7 +179,7 @@ toolbarbutton.bookmark-item {
 }
 
 .bookmark-item > .toolbarbutton-text {
-  display: -moz-box !important; /* prevent [mode="icons"] from hiding the label */
+  display: -moz-box !important; /* Force the display of the label for bookmarks */
   margin: 0 !important;
 }
 
@@ -444,30 +435,12 @@ toolbarbutton.bookmark-item > menupopup {
   }
 }
 
-toolbar:not([mode="icons"]) .toolbarbutton-1:not([type="menu-button"]),
-toolbar:not([mode="icons"]) .toolbarbutton-1 > .toolbarbutton-menubutton-button,
-toolbar:not([mode="icons"]) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker,
-toolbar:not([mode="icons"]) #restore-button {
-  -moz-appearance: none;
-  padding: 0;
-  height: auto;
-  border: none;
-  box-shadow: none;
-  background: none;
-}
-
 .toolbarbutton-1:not([type="menu-button"]),
 .toolbarbutton-1 > .toolbarbutton-menubutton-button,
 #restore-button {
   min-width: 28px;
 }
 
-toolbar:not([mode="icons"]) .toolbarbutton-1:not([type="menu-button"]),
-toolbar:not([mode="icons"]) .toolbarbutton-1 > .toolbarbutton-menubutton-button,
-toolbar:not([mode="icons"]) #restore-button {
-  min-width: 0;
-}
-
 .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-icon,
 .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
   margin: 2px;
@@ -530,11 +503,6 @@ toolbar:not([mode="icons"]) #restore-button {
   -moz-border-start: none !important;
 }
 
-toolbar:not([mode="icons"]) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-  width: auto;
-  padding-top: 0;
-}
-
 .toolbarbutton-1 > .toolbarbutton-menubutton-button:-moz-locale-dir(rtl),
 .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-locale-dir(ltr) {
   border-top-left-radius: 0;
@@ -547,36 +515,32 @@ toolbar:not([mode="icons"]) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmar
   border-bottom-right-radius: 0;
 }
 
-toolbar:not([mode="icons"]) .toolbarbutton-1:not([open="true"]) > .toolbarbutton-menubutton-dropmarker {
-  opacity: .7;
-}
-
 .toolbarbutton-1 > .toolbarbutton-text,
 .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-text {
   margin: 2px 0 0;
 }
 
-toolbar[mode="icons"] .toolbarbutton-1:not([type="menu-button"]):not([disabled="true"]):active:hover:-moz-lwtheme,
-toolbar[mode="icons"] .toolbarbutton-1:not([type="menu-button"])[open="true"]:-moz-lwtheme,
-toolbar[mode="icons"] .toolbarbutton-1:not([disabled="true"]) > .toolbarbutton-menubutton-button:active:hover:-moz-lwtheme,
-toolbar[mode="icons"] .toolbarbutton-1[open="true"] > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme,
-toolbar[mode="icons"] #restore-button:not([disabled="true"]):active:hover:-moz-lwtheme {
+.toolbarbutton-1:not([type="menu-button"]):not([disabled="true"]):active:hover:-moz-lwtheme,
+.toolbarbutton-1:not([type="menu-button"])[open="true"]:-moz-lwtheme,
+.toolbarbutton-1:not([disabled="true"]) > .toolbarbutton-menubutton-button:active:hover:-moz-lwtheme,
+.toolbarbutton-1[open="true"] > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme,
+#restore-button:not([disabled="true"]):active:hover:-moz-lwtheme {
   text-shadow: @loweredShadow@;
   background-color: rgba(0,0,0,0.2);
   box-shadow: inset 0 2px 5px rgba(0,0,0,0.6), 0 1px rgba(255,255,255,0.2);
 }
 
-toolbar[mode="icons"] .toolbarbutton-1:not([type="menu-button"]):not(#fullscreen-button)[checked="true"]:-moz-lwtheme {
+.toolbarbutton-1:not([type="menu-button"]):not(#fullscreen-button)[checked="true"]:-moz-lwtheme {
   background-color: rgba(0,0,0,0.4);
   box-shadow: inset 0 2px 5px rgba(0,0,0,0.7), 0 1px rgba(255,255,255,0.2);
 }
 
-toolbar[mode="icons"] .toolbarbutton-1:not([type="menu-button"]):not(#fullscreen-button)[checked="true"]:not([disabled="true"]):active:hover:-moz-lwtheme {
+.toolbarbutton-1:not([type="menu-button"]):not(#fullscreen-button)[checked="true"]:not([disabled="true"]):active:hover:-moz-lwtheme {
   background-color: rgba(0, 0, 0, 0.6);
   box-shadow: inset 0 2px 5px rgba(0, 0, 0, 0.8), 0 1px rgba(255, 255, 255, 0.2);
 }
 
-toolbar[mode="icons"] .toolbarbutton-1 > menupopup {
+.toolbarbutton-1 > menupopup {
   margin-top: 1px;
 }
 
@@ -593,42 +557,42 @@ toolbar[mode="icons"] .toolbarbutton-1 > menupopup {
 
 #back-button,
 #forward-button:-moz-locale-dir(rtl),
-toolbar[mode="icons"] #back-button:-moz-locale-dir(rtl):-moz-lwtheme {
+#back-button:-moz-locale-dir(rtl):-moz-lwtheme {
   -moz-image-region: rect(0, 40px, 20px, 20px);
 }
 
 @media (min-resolution: 2dppx) {
   #back-button,
   #forward-button:-moz-locale-dir(rtl),
-  toolbar[mode="icons"] #back-button:-moz-locale-dir(rtl):-moz-lwtheme {
+  #back-button:-moz-locale-dir(rtl):-moz-lwtheme {
     -moz-image-region: rect(0, 80px, 40px, 40px);
   }
 }
 
 #forward-button,
 #back-button:-moz-locale-dir(rtl),
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button:-moz-locale-dir(rtl),
-toolbar[mode="icons"] #forward-button:-moz-locale-dir(rtl):-moz-lwtheme {
+#navigator-toolbox[iconsize="large"] > #nav-bar #forward-button:-moz-locale-dir(rtl),
+#forward-button:-moz-locale-dir(rtl):-moz-lwtheme {
   -moz-image-region: rect(0, 60px, 20px, 40px);
 }
 
 @media (min-resolution: 2dppx) {
   #forward-button,
   #back-button:-moz-locale-dir(rtl),
-  #navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button:-moz-locale-dir(rtl),
-  toolbar[mode="icons"] #forward-button:-moz-locale-dir(rtl):-moz-lwtheme {
+  #navigator-toolbox[iconsize="large"] > #nav-bar #forward-button:-moz-locale-dir(rtl),
+  #forward-button:-moz-locale-dir(rtl):-moz-lwtheme {
     -moz-image-region: rect(0, 120px, 40px, 80px);
   }
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:-moz-locale-dir(rtl),
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button:-moz-locale-dir(rtl),
-toolbar[mode="icons"] #back-button:-moz-locale-dir(rtl):-moz-lwtheme,
-toolbar[mode="icons"] #forward-button:-moz-locale-dir(rtl):-moz-lwtheme {
+#navigator-toolbox[iconsize="large"] > #nav-bar #back-button:-moz-locale-dir(rtl),
+#navigator-toolbox[iconsize="large"] > #nav-bar #forward-button:-moz-locale-dir(rtl),
+#back-button:-moz-locale-dir(rtl):-moz-lwtheme,
+#forward-button:-moz-locale-dir(rtl):-moz-lwtheme {
   transform: scaleX(-1);
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button {
+#navigator-toolbox[iconsize="large"] > #nav-bar #back-button {
   -moz-appearance: none;
   -moz-margin-end: -7px;
   position: relative;
@@ -641,12 +605,12 @@ toolbar[mode="icons"] #forward-button:-moz-locale-dir(rtl):-moz-lwtheme {
 }
 
 @media (min-resolution: 2dppx) {
-  #navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button {
+  #navigator-toolbox[iconsize="large"] > #nav-bar #back-button {
     -moz-image-region: rect(0, 40px, 40px, 0);
   }
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:not(:-moz-lwtheme) {
+#navigator-toolbox[iconsize="large"] > #nav-bar #back-button:not(:-moz-lwtheme) {
   height: 31px;
   padding: 4px 5px 5px 3px;
   margin-bottom: -1px;
@@ -655,32 +619,32 @@ toolbar[mode="icons"] #forward-button:-moz-locale-dir(rtl):-moz-lwtheme {
 }
 
 @media (min-resolution: 2dppx) {
-  #navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:not(:-moz-lwtheme) {
+  #navigator-toolbox[iconsize="large"] > #nav-bar #back-button:not(:-moz-lwtheme) {
     background-image: url(chrome://browser/skin/keyhole-circle@2x.png);
     background-size: 90px;
   }
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:-moz-window-inactive:not(:-moz-lwtheme) {
+#navigator-toolbox[iconsize="large"] > #nav-bar #back-button:-moz-window-inactive:not(:-moz-lwtheme) {
   background-position: -60px 0;
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:not([disabled="true"]):active:hover:not(:-moz-lwtheme),
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button[open="true"]:not(:-moz-lwtheme) {
+#navigator-toolbox[iconsize="large"] > #nav-bar #back-button:not([disabled="true"]):active:hover:not(:-moz-lwtheme),
+#navigator-toolbox[iconsize="large"] > #nav-bar #back-button[open="true"]:not(:-moz-lwtheme) {
   background-position: -30px 0;
 }
 
-toolbar[mode="icons"] #forward-button {
+#forward-button {
   -moz-margin-start: 0;
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button > .toolbarbutton-icon {
+#navigator-toolbox[iconsize="large"] > #nav-bar #forward-button > .toolbarbutton-icon {
   /* shift the icon away from the back button */
   margin-left: 3px;
   margin-right: -1px;
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button {
+#navigator-toolbox[iconsize="large"] > #nav-bar #forward-button {
   clip-path: url(chrome://browser/content/browser.xul#osx-keyhole-forward-clip-path);
 }
 
@@ -749,25 +713,25 @@ toolbar[mode="icons"] #forward-button {
   }
 }
 
-#navigator-toolbox[iconsize="small"][mode="icons"] > #nav-bar #forward-button {
+#navigator-toolbox[iconsize="small"] > #nav-bar #forward-button {
   width: 27px;
 }
 
-#navigator-toolbox[iconsize="small"][mode="icons"] > #nav-bar #forward-button:-moz-lwtheme {
+#navigator-toolbox[iconsize="small"] > #nav-bar #forward-button:-moz-lwtheme {
   padding-left: 2px;
 }
 
-toolbar[mode="icons"] #forward-button:-moz-lwtheme {
+#forward-button:-moz-lwtheme {
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
 }
 
-#navigator-toolbox[iconsize="small"][mode="icons"] > #nav-bar #back-button {
+#navigator-toolbox[iconsize="small"] > #nav-bar #back-button {
   -moz-margin-end: 0;
   width: 26px;
 }
 
-#navigator-toolbox[iconsize="small"][mode="icons"] > #nav-bar #back-button:-moz-lwtheme {
+#navigator-toolbox[iconsize="small"] > #nav-bar #back-button:-moz-lwtheme {
   padding-right: 2px;
   border-right-width: 0;
   border-top-right-radius: 0;
@@ -1065,11 +1029,11 @@ toolbar[mode="icons"] #forward-button:-moz-lwtheme {
   }
 }
 
-toolbar[mode="icons"] #zoom-out-button {
+#zoom-out-button {
   -moz-margin-end: 0;
 }
 
-toolbar[mode="icons"] #zoom-in-button {
+#zoom-in-button {
   -moz-border-start: none;
   -moz-margin-start: 0;
 }
@@ -3495,11 +3459,11 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   right: auto;
 }
 
-toolbar[mode="icons"] > *|* > .toolbarbutton-badge[badge]:not([badge=""])::after {
+.toolbarbutton-badge[badge]:not([badge=""])::after {
   right: -2px;
 }
 
-toolbar[mode="icons"] > *|* > .toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
+.toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
   left: -2px;
 }
 
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 7fc509f66a1..017248b50fa 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -13,9 +13,9 @@
 %define toolbarShadowColor hsla(209,67%,12%,0.35)
 %define fgTabBackgroundMiddle linear-gradient(transparent, transparent 2px, -moz-dialog 2px, -moz-dialog)
 %define navbarTextboxCustomBorder border-color: rgba(0,0,0,.32);
-%define navbarLargeIcons #navigator-toolbox[iconsize=large][mode=icons] > #nav-bar
+%define navbarLargeIcons #navigator-toolbox[iconsize=large] > #nav-bar
 %define forwardTransitionLength 150ms
-%define conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #unified-back-forward-button
+%define conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #unified-back-forward-button
 %define conditionalForwardWithUrlbarWidth 27
 
 %ifdef MOZ_OFFICIAL_BRANDING
@@ -652,7 +652,7 @@ toolbarbutton.bookmark-item[open="true"] {
   height: 16px;
 }
 
-/* Prevent [mode="icons"] from hiding the label */
+/* Force the display of the label for bookmarks */
 .bookmark-item > .toolbarbutton-text {
   display: -moz-box !important;
 }
@@ -784,15 +784,6 @@ menuitem.bookmark-item {
   -moz-margin-end: 0;
 }
 
-toolbar[mode=full] .toolbarbutton-1:not([type=menu-button]) {
-  -moz-box-orient: vertical;
-}
-
-toolbar[mode=full] .toolbarbutton-1,
-toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
-  min-width: 57px;
-}
-
 #nav-bar {
   /* force iconsize="small" on this toolbar */
   counter-reset: smallicons;
@@ -2181,10 +2172,6 @@ toolbarbutton.chevron > .toolbarbutton-icon {
   margin: 0;
 }
 
-toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
-  display: -moz-box; /* display chevron icon in text mode */
-}
-
 #sidebar-throbber[loading="true"] {
   list-style-image: url("chrome://global/skin/icons/loading_16.png");
   -moz-margin-end: 4px;

From e726c5305682ce5457d2d1e918330fb30ec8c1c2 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Wed, 24 Apr 2013 13:32:10 -0400
Subject: [PATCH 8/9] Bug 862886 - The toolbarbutton that spawns the subview in
 the menu panel should have a blue background. r=dao

---
 browser/components/customizableui/content/panelUI.js  | 11 ++++++++++-
 .../shared/customizableui/panelUIOverlay.inc.css      |  7 +++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
index 373c5cd71de..7558637459f 100644
--- a/browser/components/customizableui/content/panelUI.js
+++ b/browser/components/customizableui/content/panelUI.js
@@ -256,6 +256,11 @@ const PanelUI = {
                            this.panel.state == "showing";
   },
 
+  /**
+   * Used to keep a reference to the toolbarbutton that the subview spawned from.
+   */
+  anchorElement: null,
+
   /**
    * If aAnchor is not null, this shifts the main view content so that it is
    * partially clipped by the panel boundaries, placing the center of aAnchor
@@ -270,12 +275,16 @@ const PanelUI = {
       let anchorRect = aAnchor.getBoundingClientRect();
       let mainViewRect = this.mainView.getBoundingClientRect();
       let leftEdge = anchorRect.left - mainViewRect.left;
-      let center = (anchorRect.width / 2);
+      let center = aAnchor.clientWidth / 2;
       let target = leftEdge + center;
       this.mainView.style.transform = "translateX(-" + target + "px)";
+      aAnchor.classList.add("panelui-mainview-anchor");
     } else {
       this.mainView.style.transform = "";
+      if (this.anchorElement)
+        this.anchorElement.classList.remove("panelui-mainview-anchor");
     }
+    this.anchorElement = aAnchor;
   },
 
   /**
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index 0f99f41113c..ebe3e95ceed 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -227,3 +227,10 @@
 #PanelUI-historyItems > toolbarbutton {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
+
+#PanelUI-contents > toolbarbutton.panelui-mainview-anchor {
+  background-color: Highlight;
+  background-image: linear-gradient(rgba(255,255,255,0.3), rgba(255,255,255,0));
+  background-repeat: repeat-x;
+  color: HighlightText;
+}

From 8038a550f964dc46122415ac1828671d446f7fc7 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Wed, 24 Apr 2013 15:36:02 -0400
Subject: [PATCH 9/9] Backout changeset 26a1f3c5c785 so that we can land it on
 UX and merge it in instead.

---
 browser/base/content/browser.xul | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index b7afb1199fd..680be2456c9 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -929,13 +929,6 @@
                      onclick="BrowserGoHome(event);"
                      aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
 
-      <toolbaritem id="social-toolbar-item"
-                   class="chromeclass-toolbar-additional"
-                   removable="false"
-                   title="&socialToolbar.title;"
-                   hidden="true"
-                   skipintoolbarset="true"
-                   observes="socialActiveBroadcaster">
         <toolbarbutton id="social-provider-button"
                        class="toolbarbutton-1"
                        type="menu">