From 08378b4ad315549f14504d280cc1ad7f59a39177 Mon Sep 17 00:00:00 2001
From: Gavin Sharp <gavin@gavinsharp.com>
Date: Fri, 15 Jul 2011 12:52:41 -0700
Subject: [PATCH 001/230] Change UX branch branding to be "UX" instead of
 "Nightly", a=limi

---
 browser/branding/nightly/branding.nsi                   | 2 +-
 browser/branding/nightly/configure.sh                   | 2 +-
 browser/branding/nightly/locales/en-US/brand.dtd        | 4 ++--
 browser/branding/nightly/locales/en-US/brand.properties | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/browser/branding/nightly/branding.nsi b/browser/branding/nightly/branding.nsi
index 3776cbff4746..b7f0919e72a0 100644
--- a/browser/branding/nightly/branding.nsi
+++ b/browser/branding/nightly/branding.nsi
@@ -8,7 +8,7 @@
 
 # BrandFullNameInternal is used for some registry and file system values
 # instead of BrandFullName and typically should not be modified.
-!define BrandFullNameInternal "Nightly"
+!define BrandFullNameInternal "UX"
 !define CompanyName           "mozilla.org"
 !define URLInfoAbout          "http://www.mozilla.org"
 !define URLUpdateInfo         "http://www.mozilla.org/projects/firefox"
diff --git a/browser/branding/nightly/configure.sh b/browser/branding/nightly/configure.sh
index edd3bd3e86e5..e9d6a11e3363 100644
--- a/browser/branding/nightly/configure.sh
+++ b/browser/branding/nightly/configure.sh
@@ -2,4 +2,4 @@
 # 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/.
 
-MOZ_APP_DISPLAYNAME=Nightly
+MOZ_APP_DISPLAYNAME=UX
diff --git a/browser/branding/nightly/locales/en-US/brand.dtd b/browser/branding/nightly/locales/en-US/brand.dtd
index 0eaf44da6ddf..cb4b55f16145 100644
--- a/browser/branding/nightly/locales/en-US/brand.dtd
+++ b/browser/branding/nightly/locales/en-US/brand.dtd
@@ -2,7 +2,7 @@
    - 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/. -->
 
-<!ENTITY  brandShortName        "Nightly">
-<!ENTITY  brandFullName         "Nightly">
+<!ENTITY  brandShortName        "UX">
+<!ENTITY  brandFullName         "UX">
 <!ENTITY  vendorShortName       "Mozilla">
 <!ENTITY  trademarkInfo.part1   " ">
diff --git a/browser/branding/nightly/locales/en-US/brand.properties b/browser/branding/nightly/locales/en-US/brand.properties
index 11ca95f6aa07..3736fafab0cc 100644
--- a/browser/branding/nightly/locales/en-US/brand.properties
+++ b/browser/branding/nightly/locales/en-US/brand.properties
@@ -2,8 +2,8 @@
 # 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/.
 
-brandShortName=Nightly
-brandFullName=Nightly
+brandShortName=UX
+brandFullName=UX
 vendorShortName=Mozilla
 
 syncBrandShortName=Sync

From bc15095d29eb9ac745b93005352ad95526298db4 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Fri, 8 Jun 2012 11:05:00 -0700
Subject: [PATCH 002/230] Bug 738491 - Implement the Australis tab shape for
 Windows. r=dao,mconley

---
 browser/base/content/browser.xul              |  12 +
 browser/themes/windows/browser-aero.css       |  96 +++---
 browser/themes/windows/browser.css            | 289 ++++++++++++------
 browser/themes/windows/jar.mn                 |  12 +
 .../windows/tabbrowser/tab-active-middle.png  | Bin 0 -> 438 bytes
 .../windows/tabbrowser/tab-background-end.png | Bin 0 -> 837 bytes
 .../tabbrowser/tab-background-middle.png      | Bin 0 -> 157 bytes
 .../tabbrowser/tab-background-start.png       | Bin 0 -> 811 bytes
 .../windows/tabbrowser/tab-stroke-end.png     | Bin 0 -> 439 bytes
 .../windows/tabbrowser/tab-stroke-start.png   | Bin 0 -> 433 bytes
 toolkit/themes/windows/global/icons/close.png | Bin 1963 -> 1149 bytes
 toolkit/themes/windows/global/inContentUI.css |   2 +-
 12 files changed, 285 insertions(+), 126 deletions(-)
 create mode 100644 browser/themes/windows/tabbrowser/tab-active-middle.png
 create mode 100644 browser/themes/windows/tabbrowser/tab-background-end.png
 create mode 100644 browser/themes/windows/tabbrowser/tab-background-middle.png
 create mode 100644 browser/themes/windows/tabbrowser/tab-background-start.png
 create mode 100644 browser/themes/windows/tabbrowser/tab-stroke-end.png
 create mode 100644 browser/themes/windows/tabbrowser/tab-stroke-start.png

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 47e32ac80d6f..9213120854cc 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1192,6 +1192,18 @@
     <svg:clipPath id="windows-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
       <svg:path d="M 0,0 0,7.8 C 2.5,11 4,14 4,18 4,22 2.5,25 0,28 l 0,22 10000,0 0,-50 L 0,0 z"/>
     </svg:clipPath>
+    <svg:clipPath id="windows-tab-curve-clip-path-start" clipPathUnits="userSpaceOnUse">
+      <svg:path d="M30,2.005C17.049,2.104,15.508,11.669,14.511,17c-1.565,8.376-4.276,13-13,13L0.34,31H30V2.005z"
+                stroke-width="1px" />
+    </svg:clipPath>
+    <svg:clipPath id="windows-tab-curve-clip-path-end" clipPathUnits="userSpaceOnUse">
+      <svg:path d="M-1,2.005L0,2.005C12.951,2.104,14.492,11.669,15.489,17c1.565,8.376,4.276,13,13,13l1.171,1H-1V2.005z"
+                stroke-width="1px" />
+    </svg:clipPath>
+    <svg:clipPath id="windows-tab-clip-path-outer" clipPathUnits="userSpaceOnUse">
+      <svg:path d="m 0,28 c 7.75,0 10.5,-5 12,-13 0.5,-5.5 2.5,-15 15.5,-15 l 10,0 c 13,0 15,9.5 15.5,15 1.5,8 4.25,13 13,13 z"
+                stroke-width="1px" stroke="black"/>
+    </svg:clipPath>
   </svg:svg>
 #endif
 #ifdef XP_MACOSX
diff --git a/browser/themes/windows/browser-aero.css b/browser/themes/windows/browser-aero.css
index 2368bd153f03..12ef18c94a03 100644
--- a/browser/themes/windows/browser-aero.css
+++ b/browser/themes/windows/browser-aero.css
@@ -47,27 +47,15 @@
     background-color: @customToolbarColor@;
   }
 
-  .tabbrowser-tab:not(:-moz-lwtheme),
-  .tabs-newtab-button:not(:-moz-lwtheme) {
-    background-image: @toolbarShadowOnTab@, @bgTabTexture@,
-                      linear-gradient(@customToolbarColor@, @customToolbarColor@);
+  .tab-background-start[selected=true]:not(:-moz-lwtheme)::before,
+  .tab-background-end[selected=true]:not(:-moz-lwtheme)::before {
+    background-color: @customToolbarColor@;
+    background-image: @fgTabTexture@;
   }
 
-  .tabbrowser-tab:not(:-moz-lwtheme):hover,
-  .tabs-newtab-button:not(:-moz-lwtheme):hover {
-    background-image: @toolbarShadowOnTab@, @bgTabTextureHover@,
-                      linear-gradient(@customToolbarColor@, @customToolbarColor@);
-  }
-
-  .tabbrowser-tab[selected="true"]:not(:-moz-lwtheme) {
-    background-image: linear-gradient(#fff, @toolbarHighlight@ 50%),
-                      linear-gradient(@customToolbarColor@, @customToolbarColor@);
-  }
-
-  #main-window[tabsontop=false]:not([disablechrome]) .tabbrowser-tab[selected=true]:not(:-moz-lwtheme) {
-    background-image: @toolbarShadowOnTab@,
-                      linear-gradient(#fff, @toolbarHighlight@ 50%),
-                      linear-gradient(@customToolbarColor@, @customToolbarColor@);
+  .tab-background-middle[selected=true]:not(:-moz-lwtheme) {
+    background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png),
+                      linear-gradient(transparent, transparent 2px, @customToolbarColor@ 2px, @customToolbarColor@);
   }
 
   #navigator-toolbox:not(:-moz-lwtheme)::after {
@@ -163,11 +151,6 @@
     margin-bottom: -1px; /* compensate white outer border */
   }
 
-  #main-window[sizemode=fullscreen]:not(:-moz-lwtheme) {
-    -moz-appearance: none;
-    background-color: #556;
-  }
-
   #toolbar-menubar:not(:-moz-lwtheme),
   #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme),
   #nav-bar[tabsontop=false]:not(:-moz-lwtheme),
@@ -179,14 +162,13 @@
     border-right-style: none !important;
   }
 
-  :-moz-any(#toolbar-menubar, #nav-bar[tabsontop=false]) :-moz-any(@primaryToolbarButtons@):not(:-moz-any(#alltabs-button,#tabview-button,#sync-button[status])) > .toolbarbutton-icon:not(:-moz-lwtheme),
-  #TabsToolbar[tabsontop=true] :-moz-any(@primaryToolbarButtons@):not(:-moz-any(#alltabs-button,#tabview-button,#new-tab-button,#sync-button[status])) > .toolbarbutton-icon:not(:-moz-lwtheme),
+  #navigator-toolbox[tabsontop=false] > :-moz-any(#toolbar-menubar, #nav-bar) :-moz-any(@primaryToolbarButtons@):not(:-moz-any(#alltabs-button,#tabview-button,#sync-button[status])) > .toolbarbutton-icon:not(:-moz-lwtheme),
   #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child :-moz-any(@primaryToolbarButtons@):not(:-moz-any(#alltabs-button,#tabview-button,#new-tab-button,#sync-button[status])) > .toolbarbutton-icon:not(:-moz-lwtheme) {
     list-style-image: url("chrome://browser/skin/Toolbar-inverted.png");
   }
 
-  :-moz-any(#toolbar-menubar, #TabsToolbar[tabsontop=true], #nav-bar[tabsontop=false]) .toolbarbutton-1 > .toolbarbutton-menu-dropmarker:not(:-moz-lwtheme),
-  :-moz-any(#toolbar-menubar, #TabsToolbar[tabsontop=true], #nav-bar[tabsontop=false]) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:not(:-moz-lwtheme),
+  #navigator-toolbox[tabsontop=false] > :-moz-any(#toolbar-menubar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menu-dropmarker:not(:-moz-lwtheme),
+  #navigator-toolbox[tabsontop=false] > :-moz-any(#toolbar-menubar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:not(:-moz-lwtheme),
   #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child .toolbarbutton-1 > .toolbarbutton-menu-dropmarker:not(:-moz-lwtheme),
   #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:not(:-moz-lwtheme) {
     list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png");
@@ -221,6 +203,16 @@
   }
 
   /* Toolbar shadow behind tabs */
+  #nav-bar[tabsontop=true]:not(:-moz-lwtheme),
+  #main-window[disablechrome] #navigator-toolbox[tabsontop=true]:not(:-moz-lwtheme)::after {
+    border-top: 1px solid @toolbarShadowColor@;
+    background-clip: padding-box;
+  }
+
+  #main-window[disablechrome] #navigator-toolbox[tabsontop=true]:not(:-moz-lwtheme)::after {
+    visibility: visible;
+  }
+
   /* This code is only needed for restored windows (i.e. sizemode=normal)
      because of the border radius on the toolbar below the tab bar. */
   #main-window[sizemode=normal] #nav-bar[tabsontop=true]:not(:-moz-lwtheme),
@@ -232,12 +224,9 @@
     border-top-right-radius: 2.5px;
     background-clip: padding-box;
   }
-  #main-window[sizemode=normal] #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme) {
+
+  #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme) {
     margin-bottom: -1px;
-    background-image: none !important;
-  }
-  #main-window[sizemode=normal] #tabbrowser-tabs[tabsontop=true] > .tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox > .scrollbox-innerbox:not(:-moz-lwtheme) {
-    position: relative;
   }
 
   #navigator-toolbox[tabsontop=false] > #PersonalToolbar {
@@ -280,7 +269,7 @@
     background-color: -moz-dialog;
   }
 
-  #main-menubar:not(:-moz-lwtheme):not(:-moz-window-inactive) {
+  #navigator-toolbox[tabsontop=false] > #toolbar-menubar > #menubar-items > #main-menubar:not(:-moz-lwtheme):not(:-moz-window-inactive) {
     background-color: rgba(255,255,255,.5);
     border-radius: 4px;
   }
@@ -335,6 +324,45 @@
   }
 }
 
+@media (-moz-windows-glass) {
+  #main-window[sizemode=fullscreen]:not(:-moz-lwtheme) {
+    -moz-appearance: none;
+    background-color: #556;
+  }
+
+  /* Glass Fog */
+  #main-window[tabsintitlebar] #appmenu-button-container,
+  #main-window[tabsintitlebar] #titlebar-buttonbox {
+    z-index: 1; /* These elements need to appear above the glass fog */
+  }
+
+  #TabsToolbar:not(:-moz-lwtheme) {
+    background-image: none;
+    position: relative;
+  }
+
+  #TabsToolbar:not(:-moz-lwtheme)::before {
+    box-shadow: 0 0 30px 30px rgb(174,189,204);
+    content: "";
+    display: -moz-box;
+    height: 0;
+    margin: 0 60px; /* (30px + 30px) from box-shadow */
+    opacity: 0.85;
+    position: absolute;
+    pointer-events: none;
+    top: 50%;
+    width: -moz-available;
+    z-index: -1;
+  }
+
+  #main-window[sizemode=normal] #tabbrowser-tabs[tabsontop=true] > .tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox > .scrollbox-innerbox:not(:-moz-lwtheme) {
+    position: relative;
+  }
+
+  /* End Glass Fog */
+}
+
+
 @media not all and (-moz-windows-compositor) {
   @media (-moz-windows-default-theme) {
     #main-window {
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 8d9f9e68ad5b..1a71346e4a92 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -9,12 +9,10 @@
 
 %include ../shared/browser.inc
 %filter substitution
-%define toolbarHighlight rgba(255,255,255,.5)
-%define selectedTabHighlight rgba(255,255,255,.7)
-%define toolbarShadowColor rgba(10%,10%,10%,.4)
-%define toolbarShadowOnTab linear-gradient(to top, rgba(10%,10%,10%,.4) 1px, transparent 1px)
-%define bgTabTexture linear-gradient(transparent, hsla(0,0%,45%,.1) 1px, hsla(0,0%,32%,.2) 80%, hsla(0,0%,0%,.2))
-%define bgTabTextureHover linear-gradient(hsla(0,0%,100%,.3) 1px, hsla(0,0%,75%,.2) 80%, hsla(0,0%,60%,.2))
+%define toolbarHighlight rgba(253,253,253,0.45)
+%define toolbarShadowColor hsla(209,67%,12%,0.35)
+%define fgTabTexture linear-gradient(rgba(254,254,254,0.72), rgba(254,254,254,0.72) 0px, rgba(250,250,250,0.88) 1px, rgba(250,250,250,0.88) 1px, rgba(254,254,254,0.72) 2px, @toolbarHighlight@)
+%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 forwardTransitionLength 150ms
@@ -1145,10 +1143,6 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   list-style-image: url(chrome://browser/skin/tabview/tabview.png);
 }
 
-%ifdef WINDOWS_AERO
-:-moz-any(#TabsToolbar, #nav-bar[tabsontop=false], #toolbar-menubar) > #tabview-button:-moz-system-metric(windows-compositor):not(:-moz-lwtheme),
-:-moz-any(#TabsToolbar, #nav-bar[tabsontop=false], #toolbar-menubar) > toolbarpaletteitem > #tabview-button:-moz-system-metric(windows-compositor):not(:-moz-lwtheme),
-%endif
 #tabview-button:-moz-lwtheme-brighttext {
   list-style-image: url(chrome://browser/skin/tabview/tabview-inverted.png);
 }
@@ -1877,6 +1871,15 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 /* Tabstrip */
 
+/*
+ Tab background pseudo-elements which are positioned above .tab-background-start/end:
+   - ::before - provides the fill of the tab curve and is clipped to the tab shape. This is where
+                pointer events go for the curve.
+   - ::after  - provides the border/stroke of the tab curve and is overlayed on ::before.  Pointer
+                events go through to ::before to get the proper shape. For now, no borders are
+                shown for lightweight themes.
+ */
+
 #TabsToolbar {
   min-height: 0;
   padding: 0;
@@ -1899,96 +1902,211 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 .tabbrowser-tab,
 .tabs-newtab-button {
   -moz-appearance: none;
-  background: @toolbarShadowOnTab@, @bgTabTexture@,
-              linear-gradient(-moz-dialog, -moz-dialog);
-  background-origin: border-box;
-  background-position: 1px 2px;
-  background-size: calc(100% - 2px) calc(100% - 2px);
-  background-repeat: no-repeat;
-  margin: 0;
-  padding: 2px 0 4px;
-  border-width: 4px 3px 0;
-  border-style: solid;
-  border-image: url(tabbrowser/tab.png) 4 3 0 fill repeat stretch;
+  background-color: transparent;
   border-radius: 0;
+  border-width: 0;
+  margin: 0;
+  padding: 0;
 }
 
-.tabbrowser-tab:hover,
+/* The selected tab should appear above adjacent tabs and .tabs-newtab-button */
+.tabbrowser-tab[selected=true] {
+  position: relative;
+  z-index: 1;
+}
+
+.tab-background,
+.tabs-newtab-button {
+  /* overlap the tab curves */
+  -moz-margin-end: -14px;
+  -moz-margin-start: -14px;
+}
+
+/* Background tab separators (1px wide).
+   Also show separators beside the selected tab when dragging it. */
+#tabbrowser-tabs[movingtab] > .tabbrowser-tab[beforeselected]:not([last-visible-tab])::after,
+.tabbrowser-tab:not([selected]):not([afterselected-visible]):not([afterhovered]):not([first-visible-tab]):not(:hover)::before,
+#tabbrowser-tabs:not([overflow]) > .tabbrowser-tab[last-visible-tab]:not([selected]):not([beforehovered]):not(:hover)::after {
+  -moz-margin-start: -1px;
+  background-image: linear-gradient(rgba(10,31,51,0), rgba(10,31,51,0.3));
+  background-position: left bottom;
+  background-repeat: no-repeat;
+  background-size: 1px 100%;
+  content: '';
+  display: -moz-box;
+  height: 29px;
+  width: 1px;
+}
+
+/* pinned tabs need position: fixed for separator when overflowing */
+#tabbrowser-tabs[positionpinnedtabs] > .tabbrowser-tab[pinned]::before {
+  position: fixed;
+}
+
+.tab-background-start[selected=true]::after,
+.tab-background-start[selected=true]::before,
+.tab-background-start,
+.tab-background-end,
+.tab-background-end[selected=true]::after,
+.tab-background-end[selected=true]::before {
+  min-height: 29px;
+  width: 29px;
+}
+
+.tab-background-start[selected=true]::after,
+.tab-background-end[selected=true]::after {
+  /* position ::after on top of its parent */
+  content: "";
+  display: -moz-box;
+  -moz-margin-start: -29px;
+}
+
+.tab-background-start[selected=true]::before,
+.tab-background-end[selected=true]::before {
+  /* all ::before pseudo elements */
+  content: "";
+  display: -moz-box;
+}
+
+.tab-background-start[selected=true]::before {
+  clip-path: url(chrome://browser/content/browser.xul#windows-tab-curve-clip-path-start);
+}
+
+.tab-background-end[selected=true]::before {
+  clip-path: url(chrome://browser/content/browser.xul#windows-tab-curve-clip-path-end);
+}
+
+/* new tab button border and gradient on hover */
+.tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected=true]),
 .tabs-newtab-button:hover {
-  background-image: @toolbarShadowOnTab@, @bgTabTextureHover@,
-                    linear-gradient(-moz-dialog, -moz-dialog);
+  background-image: url(chrome://browser/skin/tabbrowser/tab-background-start.png),
+                    url(chrome://browser/skin/tabbrowser/tab-background-middle.png),
+                    url(chrome://browser/skin/tabbrowser/tab-background-end.png);
+  background-position: 0px, 29px, right 0;
+  background-size: 29px 100%, calc(100% - 58px) 100%, 29px 100%;
+  background-repeat: no-repeat;
+}
+
+.tab-background-start[selected=true]:not(:-moz-lwtheme)::after,
+.tab-background-end[selected=true]:not(:-moz-lwtheme)::after {
+  background-repeat: no-repeat;
+}
+
+.tab-background-start[selected=true]:not(:-moz-lwtheme)::after {
+  background-image: url(chrome://browser/skin/tabbrowser/tab-stroke-start.png);
+}
+
+.tab-background-end[selected=true]:not(:-moz-lwtheme)::after {
+  background-image: url(chrome://browser/skin/tabbrowser/tab-stroke-end.png);
+}
+
+.tab-background-start[selected=true]::before,
+.tab-background-end[selected=true]::before {
+  background-color: -moz-dialog;
+  background-image: @fgTabTexture@;
+  background-repeat: no-repeat;
+}
+
+.tab-background-middle[selected=true] {
+  background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png),
+                    @fgTabBackgroundMiddle@;
+  background-color: transparent;
+  background-repeat: repeat-x;
+}
+
+/* Same as above but without border or -moz-dialog background */
+.tab-background-start[selected=true]:-moz-lwtheme::before,
+.tab-background-end[selected=true]:-moz-lwtheme::before,
+.tab-background-middle[selected=true]:-moz-lwtheme {
+  background-image: @fgTabTexture@;
+  background-color: transparent;
+  background-position: left 0 top 2px;
+}
+
+.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) > .tab-stack > .tab-content {
+  background-image: radial-gradient(farthest-corner at center bottom, rgb(255,255,255) 3%, rgba(186,221,251,0.75) 20%, rgba(127,179,255,0.25) 40%, rgba(127,179,255,0) 70%);
+  background-repeat: no-repeat;
+  background-position: center bottom 1px;
+  background-size: 85% 100%;
 }
 
 %ifndef WINDOWS_AERO
+/* Use lighter colors of buttons and text in the titlebar on luna-blue */
 @media (-moz-windows-theme: luna-blue) {
-  .tabbrowser-tab,
-  .tabs-newtab-button {
-    background-image: @toolbarShadowOnTab@,
-                      linear-gradient(hsla(51,34%,89%,.9), hsla(51,15%,79%,.9) 1px, hsla(51,9%,68%,.9));
+  #main-window[tabsintitlebar] .tabbrowser-tab:not([selected]):not(:-moz-lwtheme) {
+    color: CaptionText;
   }
 
-  .tabbrowser-tab:hover,
-  .tabs-newtab-button:hover {
-    background-image: @toolbarShadowOnTab@,
-                      linear-gradient(hsla(51,34%,100%,.9), hsla(51,15%,94%,.9) 1px, hsla(51,9%,83%,.9));
+  #main-window[tabsintitlebar] .tabbrowser-arrowscrollbox > .scrollbutton-up,
+  #main-window[tabsintitlebar] .tabbrowser-arrowscrollbox > .scrollbutton-down {
+    list-style-image: url(chrome://browser/skin/tabbrowser/tab-arrow-left-inverted.png);
+  }
+
+  #main-window[tabsintitlebar] .tabs-newtab-button,
+  #main-window[tabsintitlebar] #TabsToolbar > #new-tab-button,
+  #main-window[tabsintitlebar] #TabsToolbar > toolbarpaletteitem > #new-tab-button {
+    list-style-image: url(chrome://browser/skin/tabbrowser/newtab-inverted.png);
+  }
+
+  #main-window[tabsintitlebar] #TabsToolbar > #alltabs-button {
+    list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png");
+  }
+
+  #main-window[tabsintitlebar] #TabsToolbar > #tabview-button {
+    list-style-image: url(chrome://browser/skin/tabview/tabview-inverted.png);
+  }
+
+  #main-window[tabsintitlebar] .tab-close-button:not(:hover):not([selected="true"]) {
+    -moz-image-region: rect(0, 64px, 16px, 48px);
   }
 }
 %endif
 
-.tabbrowser-tab[selected="true"] {
-  background-image: linear-gradient(@selectedTabHighlight@, @toolbarHighlight@ 50%),
-                    linear-gradient(-moz-dialog, -moz-dialog);
+.tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox {
+  -moz-padding-start: 14px;
+  -moz-padding-end: 14px;
 }
 
-#main-window[tabsontop=false]:not([disablechrome]) .tabbrowser-tab[selected=true]:not(:-moz-lwtheme) {
-  background-image: @toolbarShadowOnTab@,
-                    linear-gradient(@selectedTabHighlight@, @toolbarHighlight@ 50%),
-                    linear-gradient(-moz-dialog, -moz-dialog);
+.tabbrowser-tab,
+.tab-background,
+.tab-background-start[selected=true],
+.tab-background-end[selected=true],
+.tab-background-start[selected=true]::after,
+.tab-background-end[selected=true]::after,
+.tab-content {
+  pointer-events: none;
+}
+
+.tab-background-start[selected=true]::before,
+.tab-background-end[selected=true]::before,
+.tab-background-middle,
+.tabs-newtab-button,
+.tab-close-button {
+  pointer-events: auto;
+}
+
+.tab-background-middle {
+  -moz-box-flex: 1;
+  background-clip: padding-box;
+  border-left: 15px solid transparent;
+  border-right: 15px solid transparent;
+  margin: 0 -15px;
+}
+
+.tab-content {
+  -moz-padding-start: 10px;
+  -moz-padding-end: 10px;
 }
 
 .tabbrowser-tab:-moz-lwtheme {
   color: inherit;
 }
 
-.tabbrowser-tab[selected="true"]:-moz-lwtheme {
-  background-image: linear-gradient(@selectedTabHighlight@, @toolbarHighlight@ 50%);
-}
-
-.tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]),
-.tabs-newtab-button:-moz-lwtheme-brighttext {
-  background-image: linear-gradient(hsla(0,0%,40%,.6), hsla(0,0%,30%,.6) 80%);
-}
-
-.tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]):hover,
-.tabs-newtab-button:-moz-lwtheme-brighttext:hover {
-  background-image: linear-gradient(hsla(0,0%,60%,.6), hsla(0,0%,45%,.6) 80%);
-}
-
-.tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]),
-.tabs-newtab-button:-moz-lwtheme-darktext {
-  background-image: linear-gradient(hsla(0,0%,60%,.5), hsla(0,0%,45%,.5) 80%);
-}
-
-.tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]):hover,
-.tabs-newtab-button:-moz-lwtheme-darktext:hover {
-  background-image: linear-gradient(hsla(0,0%,80%,.5), hsla(0,0%,60%,.5) 80%);
-}
-
-.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) {
-  background-image: radial-gradient(circle farthest-corner at 50% 3px, rgba(255,255,255,1) 3%, rgba(186,221,251,.75) 40%, rgba(127,179,255,.5) 80%, rgba(127,179,255,.25));
-}
-.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):hover {
-  background-image: linear-gradient(hsla(0,0%,100%,.4), hsla(0,0%,75%,.4) 80%),
-                    radial-gradient(circle farthest-corner at 50% 3px, rgba(255,255,255,1) 3%, rgba(186,221,251,.75) 40%, rgba(127,179,255,.5) 80%, rgba(127,179,255,.25));
-}
-
 .tab-throbber,
 .tab-icon-image {
   width: 16px;
   height: 16px;
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-  -moz-margin-start: 2px;
-  -moz-margin-end: 3px;
 }
 
 .tab-throbber {
@@ -1999,10 +2117,9 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   list-style-image: url("chrome://browser/skin/tabbrowser/loading.png");
 }
 
-.tab-throbber[pinned],
-.tab-icon-image[pinned] {
-  -moz-margin-start: 5px;
-  -moz-margin-end: 5px;
+.tab-throbber:not([pinned]),
+.tab-icon-image:not([pinned]) {
+  -moz-margin-end: 6px;
 }
 
 /* tabbrowser-tab focus ring */
@@ -2019,7 +2136,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 /* Tab close button */
 .tab-close-button {
   -moz-appearance: none;
-  -moz-image-region: rect(0, 64px, 16px, 48px);
+  -moz-image-region: rect(0, 16px, 16px, 0);
+  -moz-margin-start: 6px;
   border: none;
   padding: 0px;
   list-style-image: url("chrome://global/skin/icons/close.png");
@@ -2050,10 +2168,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   background-origin: border-box;
 }
 
-%ifdef WINDOWS_AERO
-.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-system-metric(windows-compositor):not(:-moz-lwtheme),
-.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-system-metric(windows-compositor):not(:-moz-lwtheme),
-%endif
 .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-lwtheme-brighttext,
 .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-lwtheme-brighttext {
   list-style-image: url(chrome://browser/skin/tabbrowser/tab-arrow-left-inverted.png);
@@ -2097,10 +2211,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   -moz-image-region: auto;
 }
 
-%ifdef WINDOWS_AERO
-#TabsToolbar > #new-tab-button:-moz-system-metric(windows-compositor):not(:-moz-lwtheme),
-#TabsToolbar > toolbarpaletteitem > #new-tab-button:-moz-system-metric(windows-compositor):not(:-moz-lwtheme),
-%endif
 .tabs-newtab-button:-moz-lwtheme-brighttext,
 #TabsToolbar > #new-tab-button:-moz-lwtheme-brighttext,
 #TabsToolbar > toolbarpaletteitem > #new-tab-button:-moz-lwtheme-brighttext {
@@ -2108,7 +2218,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 
 .tabs-newtab-button {
-  width: 28px;
+  clip-path: url(chrome://browser/content/browser.xul#windows-tab-clip-path-outer);
+  width: 66px;
 }
 
 #TabsToolbar > #new-tab-button {
@@ -2119,10 +2230,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");
 }
 
-%ifdef WINDOWS_AERO
-:-moz-any(#TabsToolbar, #nav-bar[tabsontop=false], #toolbar-menubar) > #alltabs-button:-moz-system-metric(windows-compositor):not(:-moz-lwtheme),
-:-moz-any(#TabsToolbar, #nav-bar[tabsontop=false], #toolbar-menubar) > toolbarpaletteitem > #alltabs-button:-moz-system-metric(windows-compositor):not(:-moz-lwtheme),
-%endif
 #alltabs-button:-moz-lwtheme-brighttext {
   list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png");
 }
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index 843a66a7e925..cd94d096ec64 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -130,9 +130,15 @@ browser.jar:
         skin/classic/browser/tabbrowser/connecting.png               (tabbrowser/connecting.png)
         skin/classic/browser/tabbrowser/loading.png                  (tabbrowser/loading.png)
         skin/classic/browser/tabbrowser/tab.png                      (tabbrowser/tab.png)
+        skin/classic/browser/tabbrowser/tab-active-middle.png        (tabbrowser/tab-active-middle.png)
         skin/classic/browser/tabbrowser/tab-arrow-left.png           (tabbrowser/tab-arrow-left.png)
         skin/classic/browser/tabbrowser/tab-arrow-left-inverted.png  (tabbrowser/tab-arrow-left-inverted.png)
+        skin/classic/browser/tabbrowser/tab-background-start.png     (tabbrowser/tab-background-start.png)
+        skin/classic/browser/tabbrowser/tab-background-middle.png    (tabbrowser/tab-background-middle.png)
+        skin/classic/browser/tabbrowser/tab-background-end.png       (tabbrowser/tab-background-end.png)
         skin/classic/browser/tabbrowser/tab-overflow-border.png      (tabbrowser/tab-overflow-border.png)
+        skin/classic/browser/tabbrowser/tab-stroke-end.png           (tabbrowser/tab-stroke-end.png)
+        skin/classic/browser/tabbrowser/tab-stroke-start.png         (tabbrowser/tab-stroke-start.png)
         skin/classic/browser/tabbrowser/tabDragIndicator.png         (tabbrowser/tabDragIndicator.png)
         skin/classic/browser/tabview/close.png                      (tabview/close.png)
         skin/classic/browser/tabview/edit-light.png                 (tabview/edit-light.png)
@@ -374,9 +380,15 @@ browser.jar:
         skin/classic/aero/browser/tabbrowser/connecting.png          (tabbrowser/connecting.png)
         skin/classic/aero/browser/tabbrowser/loading.png             (tabbrowser/loading.png)
         skin/classic/aero/browser/tabbrowser/tab.png                 (tabbrowser/tab.png)
+        skin/classic/aero/browser/tabbrowser/tab-active-middle.png   (tabbrowser/tab-active-middle.png)
         skin/classic/aero/browser/tabbrowser/tab-arrow-left.png      (tabbrowser/tab-arrow-left.png)
         skin/classic/aero/browser/tabbrowser/tab-arrow-left-inverted.png (tabbrowser/tab-arrow-left-inverted.png)
+        skin/classic/aero/browser/tabbrowser/tab-background-start.png    (tabbrowser/tab-background-start.png)
+        skin/classic/aero/browser/tabbrowser/tab-background-middle.png   (tabbrowser/tab-background-middle.png)
+        skin/classic/aero/browser/tabbrowser/tab-background-end.png      (tabbrowser/tab-background-end.png)
         skin/classic/aero/browser/tabbrowser/tab-overflow-border.png (tabbrowser/tab-overflow-border.png)
+        skin/classic/aero/browser/tabbrowser/tab-stroke-end.png      (tabbrowser/tab-stroke-end.png)
+        skin/classic/aero/browser/tabbrowser/tab-stroke-start.png    (tabbrowser/tab-stroke-start.png)
         skin/classic/aero/browser/tabbrowser/tabDragIndicator.png    (tabbrowser/tabDragIndicator.png)
         skin/classic/aero/browser/tabview/close.png                  (tabview/close.png)
         skin/classic/aero/browser/tabview/edit-light.png             (tabview/edit-light.png)
diff --git a/browser/themes/windows/tabbrowser/tab-active-middle.png b/browser/themes/windows/tabbrowser/tab-active-middle.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad7909399b0b0c1ebf0a40075953fc69d71fb7ce
GIT binary patch
literal 438
zcmV;n0ZIOeP)<h;3K|Lk000e1NJLTq000I60018d1^@s6#1*_700001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9
za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0003cNkl<ZI8SYl;bsF-5Js>4Q~DBph`vCd
zDJ-Fc5NcUUgjgb$s)$Cl@>+d^WOsYcaIez*IGOL8Z|2S>RaJF&i**0+_;iajj^oc?
zrfG_r5NE*@hG94-e!ek<?A`dn1nTU)@hO<#dc8(Xh!erdN+Y!R)CY|M15rJGWa3C8
zYR2F|^ME<1bM^Q;qM#Qy-Vg=0qZ;&>9@Fz7p{;(^o@PN$xOZcR*wGBK_YZb7IvO3*
zUG{#}mS&JO;ns}}W<#^U=Emb|f;9uBipO7t$%5V+EnDs7a%t5<&>A!}8%)C!0fUWC
zy<h@0gMq<HFe}2)R-an3y5zYf&A^@;3t=j%5G)LyGi()|FmuG5sX1Fw#h^yi+^HF;
g38VVd>_5Zo7aP@ZovSN%DF6Tf07*qoM6N<$f;>C5d;kCd

literal 0
HcmV?d00001

diff --git a/browser/themes/windows/tabbrowser/tab-background-end.png b/browser/themes/windows/tabbrowser/tab-background-end.png
new file mode 100644
index 0000000000000000000000000000000000000000..adbecd9d40cc06fae56abcbdda7ab74ae291098f
GIT binary patch
literal 837
zcmV-L1G@Z)P)<h;3K|Lk000e1NJLTq0015U0018d1^@s6@N9ht0009FNkl<Zc-qC5
zOGp%P9LKj@b+z(^=K6kX>myfJw_W$)tL!BTSy&<1DT1&%L{Vf!1c7w%P;}_fsY6jW
zivq<cvVy`wQpqf_gNJ;syR-9J`%eA`Mp4I^S?KUtSeW^J{=dinKYv|hh9#0<0O24M
z=)qRP7J@DqEG;elL-<nyOdua*0VCKB3}g`@;sWLuDV+i~7JIz@wx5$ztwW>Z$6oah
zG+pny>yF>$*o}vBKs;H1UYdPS#2m-fFbunwX4ric%`|!`y5-Nz!pZ)3pPEmcxn#q`
z*&rH(N#&ZwJkPsV!?Jv>pJ5N;<<_S?y@ybNQoNKbl`nYxIvHfe&h_9p-c9+L#?kS~
zqouVi<#;h^g&bLJfUMXdgOf%phQI$hVl1vUlfH+FaxJB{Z-Oe6zW&XJ!6q{O5kRk1
zY}+Jul>NYk&Mp@Mq)1DyR&3oYEXUbL#wHr0bM}-W$TpzYBCb$CrJrVMI<DRpvNlS4
ztwvm~1eWEj&wJlCAV>i)Xc3nx#5^<SsWTQ;SCFGML=ew;DBVir#U)C?_OiB}z2ZQi
zM6ujz#6?PBShnom!^d^xI1Lxetw<aQ1WZc7iB|mb^*}8G6-oO%hrUXX6&EN4S(_$)
zPgNn11w@K{o<)`tWW~8^p!}>k-+tJRU@;(6jW}Bk7_h=q=R22AF*0CE#hGegST3*o
z!J}&7?3NDL?1E26kQJw^0Rxux{_~J+b)RP-B*=<W)WGwB)J2LeG&!4u{TwHjdm2K5
ztT;(6=yS&9TitF1%md+K*3<J4137V`T3C)x9{e_DiORMLTWg1y^|IW%u^2xITJX_K
z#_5YU-Q=SYA!aQgCyv(w$McCJKPJo4%=JzLP8CZoy^*dbj?)URMM+P3`W&(Oc41$q
zt#ub)OB|~e^gC|RN2fn~(O;EN=n~|)r0ikR1*{fF2LnD3i1GO7l#gFWD%(4*333}*
zz)lba3@gOAcqa!Fd=4`)(dIA1<E|Tb?z@`X&$%o2A9rV38eD?>zl;9@0H)cU2m=U$
P00000NkvXXu0mjfpACmL

literal 0
HcmV?d00001

diff --git a/browser/themes/windows/tabbrowser/tab-background-middle.png b/browser/themes/windows/tabbrowser/tab-background-middle.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c7c951bf77c892245234c29a73bc3eadaee22f9
GIT binary patch
literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol}0V0ox?vVykk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5X>^)r^Lo_BPKb&O#Ea?DKL_>t+>LaJK-M?=1D%iBy=9t#O
z6DNMiPnWe&{l~k6Z<aShb4yp*pQZBxnO}Wo^yXoBb4|W;V$-EypivB-u6{1-oD!M<
D9qTqN

literal 0
HcmV?d00001

diff --git a/browser/themes/windows/tabbrowser/tab-background-start.png b/browser/themes/windows/tabbrowser/tab-background-start.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e7690eb0d2c1bde3423f9d7635d11515d8ce9df
GIT binary patch
literal 811
zcmV+`1JwM9P)<h;3K|Lk000e1NJLTq0015U0018d1^@s6@N9ht0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!%}GQ-R7l6gmrG9*Q5c5b?>lFv(@tAz
z?-vR!hymmh5KtRX69|!DP)SVH7>p*~cW&KjTw-*I345b|!@uA^P;q0dK!KLaxS7#X
zd!g+Zzs)pl&Ux~j?>%QurC}HV06jGZn~KVwY<@0%Le`pL?bFAGh_RECWKM1YgvoFN
zZ~{=Q@1z}yCJ-e+3)bdxYWm~5H+_>6qrP}7;?P|#4*GqHv>7T*v%uxK>F|T4Y-FIf
zM|V0M1!gKRQH}tEnf7XeiKvmjN&rEZQwyyuKTph@&v+cFTo=Ua%-Am<P}|rHUbTw;
z>8S(|=;=yD-><&z>WD{n6e-q-a8PY*O|WsaAPE3oug4vE_jWmzYLDim;GH_d(Q1#a
zAo)M6zUfGJCVoo6+x4JLgG+1~fdBqdHZnHcUsMEd9R=E|F#}K(DZ>wMXWOLY@4(+7
zvJG5zNO+dASKO&&Y?F!hj%wSgu>jCEH$CMP%(+Hv>!;eNy>Gp4x97~M;XP(5He%bX
zu@x$P=0e7yyR^+lZ5sy12PRA3IC^G$#6g5Dp!z}49GGhU;_OZ*4JO_tB74DAdTcGV
z*4v#f5Mkeb<LdiYZI4IQa4@h%M7zywiAKTJ;_I1-QOS&AGq&}?C2O4+oH`V&k-<JT
zZS4mem5l`e&*{;jf_Yl~bMWs_btV(qKwr-f)7Y>bY)zRQnks!81r{z&3q^3=Of>8V
z!$5NATq#tQLWFKC&gYrA>HgLQn^0?+C4l(##Y^%;cgGhgco!{{tg~$n-Khe{e4(e0
z?rf-1)V<m?1Fm#O4mliZ>eb6<2dQNAo8Z=LD}hV<Y5fyO=(;PmvixFy_Waq;suYD*
zZ7YEt08{`P055>xwS_t5$-P@UeaF*Zotly-qL!iMU@aUBjE91Libum38SFQ%&d;Jf
p9@!AgIm0lF{C3d=n@Zw8)i1k~mzp<|=lTEu002ovPDHLkV1n;}dB6Yw

literal 0
HcmV?d00001

diff --git a/browser/themes/windows/tabbrowser/tab-stroke-end.png b/browser/themes/windows/tabbrowser/tab-stroke-end.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1b7cc0145523cc8141b939a10b34fe8dda1a445
GIT binary patch
literal 439
zcmeAS@N?(olHy`uVBq!ia0vp^azHH4!3-piZ|XG#QjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`djotzT!AzggfcMLGiYfs$lEiB>j?|13#ph1DjD<3>GDdM@~9YaE9r5`
z8F9+!b4r_WC>XNK>$A(5@yQzTDwy!d8F0%OaVr`E6@b;4a4H&eDj4y~8}i5+^C%ke
zD424~0~Hu^DHw6dn{vq;LsbIxDj4&~15GgDRxsk0H~uo&G6v`x{gNQRU<O8J7B&uU
zUOs+7VNo$jX&HG1MP+p@T|FaXQ!{f*8(TX^S9cFDZy!JZpy05`1$#cv25Rl~ba4!k
zkZe8J&D3bXz<Oc#wkdKQSt+)<rpNx*&(nWl#a?e=J<IBt*jD=~XHSQ5x!l{OJfkF2
zwc~*um%t+PgeAHMQuG*%LlQQruP|j?yguO*yTs3l3D0<XRvwrlJEMZ}spyP%Jj)~w
zc*r+pn#_11+jLP`!cdY?>BVxEmK|$?=e`r!)^Rzv>|b<q=NtYF-#Lnf6+bKig|Mfq
KpUXO@geCyxC2@EF

literal 0
HcmV?d00001

diff --git a/browser/themes/windows/tabbrowser/tab-stroke-start.png b/browser/themes/windows/tabbrowser/tab-stroke-start.png
new file mode 100644
index 0000000000000000000000000000000000000000..08941c8a783419fd8c0e743c3cafbfaaf6b43ea5
GIT binary patch
literal 433
zcmeAS@N?(olHy`uVBq!ia0vp^azHH4!3-piZ|XG#QjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`+XH+;T!AzggfcMLGiYfssHiZA>j?|13o04&%jxn;nR3aSa>*HS%II@S
zo3YF5^T`_V$r$n~nDEFO^T-)+%NPM=K?)R&ITeg}<qdh|On79Cc@#{!<&C-Jjkx6u
zx#di_6^*$Rj6g=o8$;CtO;9lAkvHN2s+TiP>d&?Xx<j`l$S;_Ik(q^!otu|mP*_4z
zT1G)xMO{Nn*T~q++|tU%&cV^y#ns)z%iG7#KQK6y+xp!MpvHbr7sn6@$+-u!nVcLX
zSTFoG{KTQ?TbUB1nfU*8HnZ{f_Tmk}75nbaH(nEBsdwF|TO?=GPD?JCB|lXPUR(3$
z-Qu`&>16wCAIXkKjA=fOE%uCo*#^#hY1|Gj@dnG~de$A-BP4K7O`(W+nXbbMQ-;8;
z3Ri@hUzpr+>1SGggU4>o6~&cjgE-gdz5a7;XS?mcXlM5NHYGtbP}q99`njxgN@xNA
DZ)t5t

literal 0
HcmV?d00001

diff --git a/toolkit/themes/windows/global/icons/close.png b/toolkit/themes/windows/global/icons/close.png
index e559a7003923cba3b85c4e659de29abbac4408da..bfd53d29df60f20cf646447ce81478d6f1e819e8 100644
GIT binary patch
delta 1129
zcmV-v1eW`&5B&&`BYy-$Nkl<Zc-qaEZA_JA9L8yDZT2NZ*zig44UXUrdJczq28e)f
zC5$%}$fZOvWN54xEnBr_t5(BoZ8mZ(q*{U?NZFdMDYJ&FP0sPe%L><)%LD_ptxqM`
z)&1+!^WmIlXPrL4_T&EF|NnJ;xUX}b`<xReDJJ-nWc?TL#((I?8x#DC73*MGS>s->
zcW`%RrlJ8Y9=z~ec6Q@q2?>Kc=FL+ypv8lCP6V*W;~Bj4;sM<{d`LInZgm6=T0D4x
z12tQgURk+P2i<N*(4fULX98$&xitOyYns@<UlaTGIf4c)9=yP-dMGDHJzKV@x3ts|
zG-&b6nE;+hPk-0s%P;9_ON+*vn>Etd$jUx!4=o;h0PpAL>r7RZzO1a&>GE>1p53|?
z>^(GS!v=7FvhM*yn!(4)K3vZ+fD~(f$C8wUD=81oKbE#6DGsRVF$)(!{qp7d<-qeA
zZ)(!*(J}pbXGT-Q!wS^b3#jQaLxUENJ%F~{Tzz2<d4Hw<GfiF&>BqiP>MJP$YI@Aj
zpp6tj+VsuaUrG9dm3_FLQvi^)F3;1M=~{Tv9R59^rpGK?0Ch{3>gQ*l(GLv`I=_9p
zehpqW2cFe$q3;FM^q8SRi^m?oku_^{+8p-N4I4CivR9MAkjBgk)byC4K^q}}c*6>F
z(6f?$XMeTV%+N&h2xL99G54r9Yw_nm9pUg`?MzM8c*~O-t*g`Uu3b7~UZrb+p#GYf
z6;RV-h6XJjdjRkHeCpr4S*JE_QpdV=8t(4aL@)@{^q8SR8!3Q$3=0eylQ*XOB~1f0
zJ!WVe14vuEATHg!?F;ifNAhx3bOALzX5j+Zv43chMw@mkSX-;1ni>sMROosjpgXg7
z1=RGIp+Sqs9>C$%tJPCntnQ*BeNs@M;S(n`5eNb`J!WXoMhXDp4K8!&laj6jH9cl%
zq6y#wuRHZZ*~9rqftp^V0BS8up~vg>t+}MmnVb4XFsK=G@M}W>0X02lXwc%Z2hi$v
ztABItT78t4r;#pmc;gFob^<j$W@yklUV>B8xB4VqWwqDQT!IA9?shE<Z7lM2@wNwQ
zdd$KFP@SBtOFJLc1@jR#WuEofyMK#=_Y@WisOd37gBFiHfVVO-^s(Qsk$(?7q|ou>
zYV-MknjSMWXd?x{;d><g#A^1LVDCkB34a=jSRHzHtZhk2`tFfh4VY)N*F3B3em^Vw
zusyVR>;b&ta;YOHM{ORD-dVMZm3_D#TE|P!;4@?x5`mhY!zCCKR#jr6F4k1*{QC7e
zS6u7}8nk%q0ld0wnLacJZ1;MdK!eul61>-NA1nKCz5hLcYRekvDlO4BRh9a>qGH?;
zG-&bIz6uZQHG#aDmZsM9bVtyj#WQEV2|iU&P~ViDJysqcuV_Gv2QR$f_t!t|c8^8-
vV+bvtxe$Q;=j=Aao+v?U;f>LcHzxi8Y~%!UV2Dyt00000NkvXXu0mjf=MXJr

delta 1950
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

diff --git a/toolkit/themes/windows/global/inContentUI.css b/toolkit/themes/windows/global/inContentUI.css
index 94b959815bf7..cc9dbeee3d66 100644
--- a/toolkit/themes/windows/global/inContentUI.css
+++ b/toolkit/themes/windows/global/inContentUI.css
@@ -17,7 +17,7 @@
   color: -moz-dialogText;
   background-color: -moz-dialog;
   background-image: /* Fade-out texture at the top, and blend with browser tab */
-                    linear-gradient(rgba(255,255,255,0.5), rgba(255,255,255,0) 30%),
+                    linear-gradient(rgba(255,255,255,0.45), rgba(255,255,255,0) 30%),
                     /* Texture */
                     url("chrome://global/skin/inContentUI/background-texture.png");
 }

From 4159335be7ea06592f4720d57c4c47b26d1d1f2e Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Fri, 8 Mar 2013 02:57:00 -0800
Subject: [PATCH 003/230] Bug 738491 - Move common tab styles to
 themes/shared/. r=dao,mconley

---
 browser/base/content/browser.xul   |  31 +++--
 browser/themes/shared/tabs.inc.css | 199 +++++++++++++++++++++++++++++
 browser/themes/windows/browser.css | 181 +-------------------------
 3 files changed, 215 insertions(+), 196 deletions(-)
 create mode 100644 browser/themes/shared/tabs.inc.css

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 9213120854cc..c730b7ee6628 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1184,30 +1184,29 @@
     </toolbar>
   </vbox>
 
-#ifndef XP_UNIX
   <svg:svg height="0">
+    <svg:clipPath id="tab-curve-clip-path-start" clipPathUnits="userSpaceOnUse">
+      <svg:path d="M30,2.005C17.049,2.104,15.508,11.669,14.511,17c-1.565,8.376-4.276,13-13,13L0.34,31H30V2.005z"
+                stroke-width="1px" />
+    </svg:clipPath>
+    <svg:clipPath id="tab-curve-clip-path-end" clipPathUnits="userSpaceOnUse">
+      <svg:path d="M-1,2.005L0,2.005C12.951,2.104,14.492,11.669,15.489,17c1.565,8.376,4.276,13,13,13l1.171,1H-1V2.005z"
+                stroke-width="1px" />
+    </svg:clipPath>
+    <svg:clipPath id="tab-clip-path-outer" clipPathUnits="userSpaceOnUse">
+      <svg:path d="M 30,0 C 24,0 17.78,2.58 15.10,8.09 12.05,13.46 13.14,20.37 9.18,25.3 7.1,27.7 3.8,28 0.8,28 c -0.4,0.6 -2.09,1.11 -1.46,1.80 l 2.45,2.72 61.60,0 2.59,-3.06 C 65.15,28.96 64.57,27.80 63.5,28 60.13,28.13 56.33,27.03 54.74,23.78 51.85,18.44 52.65,11.81 49.09,6.73 45.88,1.65 39.54,-0.26 33.8,0 32.5,0 31.7,0 30,0 z"
+                stroke-width="1px" stroke="black"/>
+    </svg:clipPath>
+
+#ifndef XP_UNIX
     <svg:clipPath id="windows-keyhole-forward-clip-path" clipPathUnits="objectBoundingBox">
       <svg:path d="M 0,0 C 0.16,0.11 0.28,0.29 0.28,0.5 0.28,0.71 0.16,0.89 0,1 L 1,1 1,0 0,0 z"/>
     </svg:clipPath>
     <svg:clipPath id="windows-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
       <svg:path d="M 0,0 0,7.8 C 2.5,11 4,14 4,18 4,22 2.5,25 0,28 l 0,22 10000,0 0,-50 L 0,0 z"/>
     </svg:clipPath>
-    <svg:clipPath id="windows-tab-curve-clip-path-start" clipPathUnits="userSpaceOnUse">
-      <svg:path d="M30,2.005C17.049,2.104,15.508,11.669,14.511,17c-1.565,8.376-4.276,13-13,13L0.34,31H30V2.005z"
-                stroke-width="1px" />
-    </svg:clipPath>
-    <svg:clipPath id="windows-tab-curve-clip-path-end" clipPathUnits="userSpaceOnUse">
-      <svg:path d="M-1,2.005L0,2.005C12.951,2.104,14.492,11.669,15.489,17c1.565,8.376,4.276,13,13,13l1.171,1H-1V2.005z"
-                stroke-width="1px" />
-    </svg:clipPath>
-    <svg:clipPath id="windows-tab-clip-path-outer" clipPathUnits="userSpaceOnUse">
-      <svg:path d="m 0,28 c 7.75,0 10.5,-5 12,-13 0.5,-5.5 2.5,-15 15.5,-15 l 10,0 c 13,0 15,9.5 15.5,15 1.5,8 4.25,13 13,13 z"
-                stroke-width="1px" stroke="black"/>
-    </svg:clipPath>
-  </svg:svg>
 #endif
 #ifdef XP_MACOSX
-  <svg:svg height="0">
     <svg:clipPath id="osx-keyhole-forward-clip-path" clipPathUnits="objectBoundingBox">
       <svg:path d="M 0,0 C 0.15,0.12 0.25,0.3 0.25,0.5 0.25,0.7 0.15,0.88 0,1 L 1,1 1,0 0,0 z"/>
     </svg:clipPath>
@@ -1226,8 +1225,8 @@
     <svg:clipPath id="osx-tab-onbottom-right-curve-clip-path" clipPathUnits="userSpaceOnUse">
       <svg:path d="m 0,0 0,1 0,19 0,3 3,0 c 1.7,0 3,-1 3,-3 L 6,6 C 6,3.2 8.2,1 11,1 L 12,1 12,0 0,0 z"/>
     </svg:clipPath>
-  </svg:svg>
 #endif
+  </svg:svg>
 
 </vbox>
 # <iframe id="tab-view"> is dynamically appended as the 2nd child of #tab-view-deck.
diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
new file mode 100644
index 000000000000..8f82ae7673f9
--- /dev/null
+++ b/browser/themes/shared/tabs.inc.css
@@ -0,0 +1,199 @@
+%if 0
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+%endif
+
+%define tabHeight 30px
+%define tabCurveWidth 30px
+%define tabCurveHalfWidth 15px
+
+.tabbrowser-tab,
+.tabs-newtab-button {
+  -moz-appearance: none;
+  background-color: transparent;
+  border-radius: 0;
+  border-width: 0;
+  margin: 0;
+  padding: 0;
+}
+
+/* The selected tab should appear above adjacent tabs and .tabs-newtab-button */
+.tabbrowser-tab[selected=true] {
+  position: relative;
+  z-index: 1;
+}
+
+.tab-background-middle {
+  -moz-box-flex: 1;
+  background-clip: padding-box;
+  border-left: @tabCurveHalfWidth@ solid transparent;
+  border-right: @tabCurveHalfWidth@ solid transparent;
+  margin: 0 -@tabCurveHalfWidth@;
+}
+
+.tab-content {
+  -moz-padding-end: 10px;
+  -moz-padding-start: 10px;
+}
+
+.tab-background,
+.tabs-newtab-button {
+  /* overlap the tab curves */
+  -moz-margin-end: -@tabCurveHalfWidth@;
+  -moz-margin-start: -@tabCurveHalfWidth@;
+}
+
+.tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox {
+  -moz-padding-end: @tabCurveHalfWidth@;
+  -moz-padding-start: @tabCurveHalfWidth@;
+}
+
+.tab-background-start[selected=true]::after,
+.tab-background-start[selected=true]::before,
+.tab-background-start,
+.tab-background-end,
+.tab-background-end[selected=true]::after,
+.tab-background-end[selected=true]::before {
+  min-height: @tabHeight@;
+  width: @tabCurveWidth@;
+}
+
+/* Selected tab */
+
+/*
+ Tab background pseudo-elements which are positioned above .tab-background-start/end:
+   - ::before - provides the fill of the tab curve and is clipped to the tab shape. This is where
+                pointer events go for the curve.
+   - ::after  - provides the border/stroke of the tab curve and is overlayed above ::before.  Pointer
+                events go through to ::before to get the proper shape.
+ */
+
+
+.tab-background-start[selected=true]::after,
+.tab-background-end[selected=true]::after {
+  /* position ::after on top of its parent */
+  -moz-margin-start: -@tabCurveWidth@;
+  content: "";
+  display: -moz-box;
+}
+
+.tab-background-start[selected=true]::before,
+.tab-background-end[selected=true]::before {
+  /* all ::before pseudo elements */
+  content: "";
+  display: -moz-box;
+}
+
+.tab-background-start[selected=true]:-moz-locale-dir(ltr)::before,
+.tab-background-end[selected=true]:-moz-locale-dir(rtl)::before {
+  clip-path: url(chrome://browser/content/browser.xul#tab-curve-clip-path-start);
+}
+
+.tab-background-end[selected=true]:-moz-locale-dir(ltr)::before,
+.tab-background-start[selected=true]:-moz-locale-dir(rtl)::before {
+  clip-path: url(chrome://browser/content/browser.xul#tab-curve-clip-path-end);
+}
+
+.tab-background-start[selected=true]:not(:-moz-lwtheme)::after,
+.tab-background-end[selected=true]:not(:-moz-lwtheme)::after {
+  background-repeat: no-repeat;
+}
+
+.tab-background-start[selected=true]:not(:-moz-lwtheme):-moz-locale-dir(ltr)::after,
+.tab-background-end[selected=true]:not(:-moz-lwtheme):-moz-locale-dir(rtl)::after {
+  background-image: url(chrome://browser/skin/tabbrowser/tab-stroke-start.png);
+}
+
+.tab-background-end[selected=true]:not(:-moz-lwtheme):-moz-locale-dir(ltr)::after,
+.tab-background-start[selected=true]:not(:-moz-lwtheme):-moz-locale-dir(rtl)::after {
+  background-image: url(chrome://browser/skin/tabbrowser/tab-stroke-end.png);
+}
+
+.tab-background-start[selected=true]::before,
+.tab-background-end[selected=true]::before {
+  background-color: -moz-dialog;
+  background-image: @fgTabTexture@;
+  background-repeat: no-repeat;
+}
+
+.tab-background-middle[selected=true] {
+  background-color: transparent;
+  background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png),
+                    @fgTabBackgroundMiddle@;
+  background-repeat: repeat-x;
+}
+
+/* Same as above but without border or -moz-dialog background */
+.tab-background-start[selected=true]:-moz-lwtheme::before,
+.tab-background-end[selected=true]:-moz-lwtheme::before,
+.tab-background-middle[selected=true]:-moz-lwtheme {
+  background-color: transparent;
+  background-image: @fgTabTexture@;
+  background-position: left 0 top 2px;
+}
+
+/* End selected tab */
+
+/* new tab button border and gradient on hover */
+.tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected=true]),
+.tabs-newtab-button:hover {
+  background-image: url(chrome://browser/skin/tabbrowser/tab-background-start.png),
+                    url(chrome://browser/skin/tabbrowser/tab-background-middle.png),
+                    url(chrome://browser/skin/tabbrowser/tab-background-end.png);
+  background-position: left bottom, @tabCurveWidth@ bottom, right bottom;
+  background-repeat: no-repeat;
+  background-size: @tabCurveWidth@ 100%, calc(100% - (2 * @tabCurveWidth@)) 100%, @tabCurveWidth@ 100%;
+}
+
+/* Tab pointer-events */
+.tabbrowser-tab {
+  pointer-events: none;
+}
+
+/* Allow pointer-events on ::before of the ends of selected tabs
+   since they are clipped to the curve shape. */
+.tab-background-start[selected=true]::before,
+.tab-background-end[selected=true]::before,
+.tab-background-middle,
+.tabs-newtab-button,
+.tab-close-button {
+  pointer-events: auto;
+}
+
+/* Pinned tabs */
+
+/* pinned tabs need position: fixed for separator when overflowing */
+#tabbrowser-tabs[positionpinnedtabs] > .tabbrowser-tab[pinned]::before {
+  position: fixed;
+}
+
+.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) > .tab-stack > .tab-content {
+  background-image: radial-gradient(farthest-corner at center bottom, rgb(255,255,255) 3%, rgba(186,221,251,0.75) 20%, rgba(127,179,255,0.25) 40%, rgba(127,179,255,0) 70%);
+  background-position: center bottom 1px;
+  background-repeat: no-repeat;
+  background-size: 85% 100%;
+}
+
+/* Background tab separators (1px wide).
+   Also show separators beside the selected tab when dragging it. */
+#tabbrowser-tabs[movingtab] > .tabbrowser-tab[beforeselected]:not([last-visible-tab])::after,
+.tabbrowser-tab:not([selected]):not([afterselected-visible]):not([afterhovered]):not([first-visible-tab]):not(:hover)::before,
+#tabbrowser-tabs:not([overflow]) > .tabbrowser-tab[last-visible-tab]:not([selected]):not([beforehovered]):not(:hover)::after {
+  -moz-margin-start: -1px;
+  background-image: linear-gradient(rgba(10,31,51,0), rgba(10,31,51,0.3));
+  background-position: left bottom;
+  background-repeat: no-repeat;
+  background-size: 1px 100%;
+  content: '';
+  display: -moz-box;
+  height: @tabHeight@;
+  width: 1px;
+}
+
+/* New tab button */
+
+.tabs-newtab-button {
+  clip-path: url(chrome://browser/content/browser.xul#tab-clip-path-outer);
+  width: 66px;
+}
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 1a71346e4a92..74a266290ef1 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1871,15 +1871,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 /* Tabstrip */
 
-/*
- Tab background pseudo-elements which are positioned above .tab-background-start/end:
-   - ::before - provides the fill of the tab curve and is clipped to the tab shape. This is where
-                pointer events go for the curve.
-   - ::after  - provides the border/stroke of the tab curve and is overlayed on ::before.  Pointer
-                events go through to ::before to get the proper shape. For now, no borders are
-                shown for lightweight themes.
- */
-
 #TabsToolbar {
   min-height: 0;
   padding: 0;
@@ -1899,136 +1890,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 %endif
 
-.tabbrowser-tab,
-.tabs-newtab-button {
-  -moz-appearance: none;
-  background-color: transparent;
-  border-radius: 0;
-  border-width: 0;
-  margin: 0;
-  padding: 0;
-}
-
-/* The selected tab should appear above adjacent tabs and .tabs-newtab-button */
-.tabbrowser-tab[selected=true] {
-  position: relative;
-  z-index: 1;
-}
-
-.tab-background,
-.tabs-newtab-button {
-  /* overlap the tab curves */
-  -moz-margin-end: -14px;
-  -moz-margin-start: -14px;
-}
-
-/* Background tab separators (1px wide).
-   Also show separators beside the selected tab when dragging it. */
-#tabbrowser-tabs[movingtab] > .tabbrowser-tab[beforeselected]:not([last-visible-tab])::after,
-.tabbrowser-tab:not([selected]):not([afterselected-visible]):not([afterhovered]):not([first-visible-tab]):not(:hover)::before,
-#tabbrowser-tabs:not([overflow]) > .tabbrowser-tab[last-visible-tab]:not([selected]):not([beforehovered]):not(:hover)::after {
-  -moz-margin-start: -1px;
-  background-image: linear-gradient(rgba(10,31,51,0), rgba(10,31,51,0.3));
-  background-position: left bottom;
-  background-repeat: no-repeat;
-  background-size: 1px 100%;
-  content: '';
-  display: -moz-box;
-  height: 29px;
-  width: 1px;
-}
-
-/* pinned tabs need position: fixed for separator when overflowing */
-#tabbrowser-tabs[positionpinnedtabs] > .tabbrowser-tab[pinned]::before {
-  position: fixed;
-}
-
-.tab-background-start[selected=true]::after,
-.tab-background-start[selected=true]::before,
-.tab-background-start,
-.tab-background-end,
-.tab-background-end[selected=true]::after,
-.tab-background-end[selected=true]::before {
-  min-height: 29px;
-  width: 29px;
-}
-
-.tab-background-start[selected=true]::after,
-.tab-background-end[selected=true]::after {
-  /* position ::after on top of its parent */
-  content: "";
-  display: -moz-box;
-  -moz-margin-start: -29px;
-}
-
-.tab-background-start[selected=true]::before,
-.tab-background-end[selected=true]::before {
-  /* all ::before pseudo elements */
-  content: "";
-  display: -moz-box;
-}
-
-.tab-background-start[selected=true]::before {
-  clip-path: url(chrome://browser/content/browser.xul#windows-tab-curve-clip-path-start);
-}
-
-.tab-background-end[selected=true]::before {
-  clip-path: url(chrome://browser/content/browser.xul#windows-tab-curve-clip-path-end);
-}
-
-/* new tab button border and gradient on hover */
-.tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected=true]),
-.tabs-newtab-button:hover {
-  background-image: url(chrome://browser/skin/tabbrowser/tab-background-start.png),
-                    url(chrome://browser/skin/tabbrowser/tab-background-middle.png),
-                    url(chrome://browser/skin/tabbrowser/tab-background-end.png);
-  background-position: 0px, 29px, right 0;
-  background-size: 29px 100%, calc(100% - 58px) 100%, 29px 100%;
-  background-repeat: no-repeat;
-}
-
-.tab-background-start[selected=true]:not(:-moz-lwtheme)::after,
-.tab-background-end[selected=true]:not(:-moz-lwtheme)::after {
-  background-repeat: no-repeat;
-}
-
-.tab-background-start[selected=true]:not(:-moz-lwtheme)::after {
-  background-image: url(chrome://browser/skin/tabbrowser/tab-stroke-start.png);
-}
-
-.tab-background-end[selected=true]:not(:-moz-lwtheme)::after {
-  background-image: url(chrome://browser/skin/tabbrowser/tab-stroke-end.png);
-}
-
-.tab-background-start[selected=true]::before,
-.tab-background-end[selected=true]::before {
-  background-color: -moz-dialog;
-  background-image: @fgTabTexture@;
-  background-repeat: no-repeat;
-}
-
-.tab-background-middle[selected=true] {
-  background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png),
-                    @fgTabBackgroundMiddle@;
-  background-color: transparent;
-  background-repeat: repeat-x;
-}
-
-/* Same as above but without border or -moz-dialog background */
-.tab-background-start[selected=true]:-moz-lwtheme::before,
-.tab-background-end[selected=true]:-moz-lwtheme::before,
-.tab-background-middle[selected=true]:-moz-lwtheme {
-  background-image: @fgTabTexture@;
-  background-color: transparent;
-  background-position: left 0 top 2px;
-}
-
-.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) > .tab-stack > .tab-content {
-  background-image: radial-gradient(farthest-corner at center bottom, rgb(255,255,255) 3%, rgba(186,221,251,0.75) 20%, rgba(127,179,255,0.25) 40%, rgba(127,179,255,0) 70%);
-  background-repeat: no-repeat;
-  background-position: center bottom 1px;
-  background-size: 85% 100%;
-}
+%include ../shared/tabs.inc.css
 
 %ifndef WINDOWS_AERO
 /* Use lighter colors of buttons and text in the titlebar on luna-blue */
@@ -2062,42 +1924,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 %endif
 
-.tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox {
-  -moz-padding-start: 14px;
-  -moz-padding-end: 14px;
-}
-
-.tabbrowser-tab,
-.tab-background,
-.tab-background-start[selected=true],
-.tab-background-end[selected=true],
-.tab-background-start[selected=true]::after,
-.tab-background-end[selected=true]::after,
-.tab-content {
-  pointer-events: none;
-}
-
-.tab-background-start[selected=true]::before,
-.tab-background-end[selected=true]::before,
-.tab-background-middle,
-.tabs-newtab-button,
-.tab-close-button {
-  pointer-events: auto;
-}
-
-.tab-background-middle {
-  -moz-box-flex: 1;
-  background-clip: padding-box;
-  border-left: 15px solid transparent;
-  border-right: 15px solid transparent;
-  margin: 0 -15px;
-}
-
-.tab-content {
-  -moz-padding-start: 10px;
-  -moz-padding-end: 10px;
-}
-
 .tabbrowser-tab:-moz-lwtheme {
   color: inherit;
 }
@@ -2217,11 +2043,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   list-style-image: url(chrome://browser/skin/tabbrowser/newtab-inverted.png);
 }
 
-.tabs-newtab-button {
-  clip-path: url(chrome://browser/content/browser.xul#windows-tab-clip-path-outer);
-  width: 66px;
-}
-
 #TabsToolbar > #new-tab-button {
   width: 26px;
 }

From 6d51374a0a930c610468631c890d5ee526bdab18 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Wed, 20 Mar 2013 11:01:00 -0700
Subject: [PATCH 004/230] Bug 823176 - Australis tabs styling for Linux.
 r=MattN

---
 browser/themes/linux/browser.css              |  82 ++----------------
 browser/themes/linux/jar.mn                   |  10 ++-
 .../linux/tabbrowser/tab-active-middle.png    | Bin 0 -> 96 bytes
 .../linux/tabbrowser/tab-background-end.png   | Bin 0 -> 721 bytes
 .../tabbrowser/tab-background-middle.png      | Bin 0 -> 161 bytes
 .../linux/tabbrowser/tab-background-start.png | Bin 0 -> 705 bytes
 .../linux/tabbrowser/tab-stroke-end.png       | Bin 0 -> 439 bytes
 .../linux/tabbrowser/tab-stroke-start.png     | Bin 0 -> 433 bytes
 8 files changed, 16 insertions(+), 76 deletions(-)
 create mode 100644 browser/themes/linux/tabbrowser/tab-active-middle.png
 create mode 100644 browser/themes/linux/tabbrowser/tab-background-end.png
 create mode 100644 browser/themes/linux/tabbrowser/tab-background-middle.png
 create mode 100644 browser/themes/linux/tabbrowser/tab-background-start.png
 create mode 100644 browser/themes/linux/tabbrowser/tab-stroke-end.png
 create mode 100644 browser/themes/linux/tabbrowser/tab-stroke-start.png

diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 52ea149e3ecd..7787ff156735 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -12,7 +12,8 @@
 %include ../shared/browser.inc
 %filter substitution
 %define toolbarHighlight rgba(255,255,255,.3)
-%define selectedTabHighlight rgba(255,255,255,.8) 1px, rgba(255,255,255,.5) 3px
+%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
@@ -1573,6 +1574,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 /* Tabstrip */
 
+%include ../shared/tabs.inc.css
+
 #TabsToolbar {
   min-height: 0;
   padding: 0;
@@ -1588,83 +1591,14 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-drag");
 }
 
+#TabsToolbar[tabsontop=true]:not(:-moz-lwtheme) > #tabbrowser-tabs > .tabbrowser-tab:not([selected]) {
+  color: -moz-menubartext;
+}
+
 #TabsToolbar[tabsontop=false] {
   background-image: linear-gradient(to top, rgba(0,0,0,.3) 1px, rgba(0,0,0,.05) 1px, transparent 50%);
 }
 
-.tabbrowser-tab,
-.tabs-newtab-button {
-  position: static;
-  -moz-appearance: none;
-  background: linear-gradient(hsla(0,0%,100%,.2), hsla(0,0%,45%,.2) 2px, hsla(0,0%,32%,.2) 80%);
-  background-origin: border-box;
-  background-position: 1px 2px;
-  background-size: 100% calc(100% - 2px);
-  background-repeat: no-repeat;
-  color: inherit;
-  margin: 0;
-  padding: 0;
-  border-width: 4px 5px 3px 6px;
-  border-style: solid;
-  border-image: url(tabbrowser/tab.png) 4 5 3 6 fill repeat stretch;
-  border-radius: 10px 8px 0 0;
-  min-height: 25px; /* reserve space for the sometimes hidden close button */
-}
-
-.tabbrowser-tab:hover,
-.tabs-newtab-button:hover {
-  background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.2) 4px, hsla(0,0%,75%,.2) 80%);
-}
-
-.tabbrowser-tab[selected="true"] {
-  background-image: linear-gradient(@selectedTabHighlight@, @toolbarHighlight@ 32%),
-                    linear-gradient(-moz-dialog, -moz-dialog);
-  color: -moz-dialogtext;
-}
-
-#main-window[tabsontop=false]:not([disablechrome]) .tabbrowser-tab[selected=true]:not(:-moz-lwtheme) {
-  background-image: linear-gradient(to top, rgba(0,0,0,.3) 1px, transparent 1px),
-                    linear-gradient(@selectedTabHighlight@, @toolbarHighlight@ 32%),
-                    linear-gradient(-moz-dialog, -moz-dialog);
-}
-
-.tabbrowser-tab[selected="true"]:-moz-lwtheme {
-  background-image: linear-gradient(@selectedTabHighlight@, @toolbarHighlight@ 32%);
-  color: inherit;
-}
-
-.tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]),
-.tabs-newtab-button:-moz-lwtheme-brighttext {
-  background-image: linear-gradient(hsla(0,0%,60%,.6), hsla(0,0%,40%,.6) 4px, hsla(0,0%,30%,.6) 80%);
-}
-
-.tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]):hover,
-.tabs-newtab-button:-moz-lwtheme-brighttext:hover {
-  background-image: linear-gradient(hsla(0,0%,80%,.6), hsla(0,0%,60%,.6) 4px, hsla(0,0%,45%,.6) 80%);
-}
-
-.tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]),
-.tabs-newtab-button:-moz-lwtheme-darktext {
-  background-image: linear-gradient(hsla(0,0%,100%,.5), hsla(0,0%,60%,.5) 4px, hsla(0,0%,45%,.5) 80%);
-}
-
-.tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]):hover,
-.tabs-newtab-button:-moz-lwtheme-darktext:hover {
-  background-image: linear-gradient(hsla(0,0%,100%,.5), hsla(0,0%,80%,.5) 4px, hsla(0,0%,60%,.5) 80%);
-}
-
-.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) {
-  background-image: radial-gradient(circle farthest-corner at 50% 3px, rgba(233,242,252,1) 3%, rgba(172,206,255,.75) 40%, rgba(87,151,201,.5) 80%, rgba(87,151,201,0));
-}
-.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):hover {
-  background-image: linear-gradient(hsla(0,0%,100%,.8), hsla(0,0%,100%,.6) 2px, hsla(0,0%,75%,.2) 80%),
-                    radial-gradient(circle farthest-corner at 50% 3px, rgba(233,242,252,1) 3%, rgba(172,206,255,.75) 40%, rgba(87,151,201,.5) 80%, rgba(87,151,201,0));
-}
-
-#tabbrowser-tabs[positionpinnedtabs] > .tabbrowser-tab > .tab-stack > .tab-content[pinned] {
-  min-height: 18px; /* corresponds to the max. height of non-textual tab contents, i.e. the tab close button */
-}
-
 .tabbrowser-tab:focus > .tab-stack {
   outline: 1px dotted;
 }
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index cf254d14c8f4..bc9a1190e4e1 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -108,8 +108,14 @@ browser.jar:
   skin/classic/browser/tabbrowser/connecting.png      (tabbrowser/connecting.png)
   skin/classic/browser/tabbrowser/loading.png         (tabbrowser/loading.png)
   skin/classic/browser/tabbrowser/tab.png             (tabbrowser/tab.png)
-  skin/classic/browser/tabbrowser/tab-overflow-border.png (tabbrowser/tab-overflow-border.png)
-  skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png)
+  skin/classic/browser/tabbrowser/tab-active-middle.png     (tabbrowser/tab-active-middle.png)
+  skin/classic/browser/tabbrowser/tab-background-end.png    (tabbrowser/tab-background-end.png)
+  skin/classic/browser/tabbrowser/tab-background-middle.png (tabbrowser/tab-background-middle.png)
+  skin/classic/browser/tabbrowser/tab-background-start.png  (tabbrowser/tab-background-start.png)
+  skin/classic/browser/tabbrowser/tab-overflow-border.png   (tabbrowser/tab-overflow-border.png)
+  skin/classic/browser/tabbrowser/tab-stroke-end.png        (tabbrowser/tab-stroke-end.png)
+  skin/classic/browser/tabbrowser/tab-stroke-start.png      (tabbrowser/tab-stroke-start.png)
+  skin/classic/browser/tabbrowser/tabDragIndicator.png      (tabbrowser/tabDragIndicator.png)
   skin/classic/browser/tabview/edit-light.png         (tabview/edit-light.png)
   skin/classic/browser/tabview/search.png             (tabview/search.png)
   skin/classic/browser/tabview/stack-expander.png     (tabview/stack-expander.png)
diff --git a/browser/themes/linux/tabbrowser/tab-active-middle.png b/browser/themes/linux/tabbrowser/tab-active-middle.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c903ae15688e88e50e9ce817afdc0cbab17ea24
GIT binary patch
literal 96
zcmeAS@N?(olHy`uVBq!ia0vp^j6f{U!3HGNPA*RZQtF;Ajv*Dd&K}>$$-uzDd~iL>
u_6>e-W!~-gWm&$#(jvz>jNhZM_7GE+SNM9@YkC<#EexKnelF{r5}E*7of}&K

literal 0
HcmV?d00001

diff --git a/browser/themes/linux/tabbrowser/tab-background-end.png b/browser/themes/linux/tabbrowser/tab-background-end.png
new file mode 100644
index 0000000000000000000000000000000000000000..78a4f1f1cbb8d9395750d1e2cef78ae9e82838b9
GIT binary patch
literal 721
zcmV;?0xtcDP)<h;3K|Lk000e1NJLTq0015U0018d1^@s6@N9ht0007*Nkl<Zc-pns
z+e?#i9LMoTx4DCdG`CrsJGi+y+M3!<Z93;{t5!Ol;*t@RL_!1+6?oxAH{Apg1YPtW
zL_r6lf-nk-4&+4?SW=NmRQ3-Tj2-%X;dx*eq3-uQUA%smdq2PL@8P$NlW7bZo(hzp
z06En1YIvNKXz_s;+~5EMG=K^eAQK*-R4Q>&q2=(e)!$Q}zkJO;e)4Q=cJ9KSMy)-7
zP#5Sy1#%%yBncM^g+WL_5{8S#;>6n8pWO2ouQQqKbd;Y$Gt@~L=MWnBhd8A2`TU`q
zx9+7IT5UnZOhR0$aC99p82PsHJ?n6XBM7!j6{m3j2BMI}J22VO*0q~IcZJwEg(I8L
z2Z@)j7BYx=Kn-%S;qWF!AT@LHTmnIh*pX8>RD}peKB{ao(|Ol}TueAng&@SIXHF*(
zG>SQE3j3-Qy8m$gAb;Db#DsTM$%hLjxkcxQ@mH&iHQd7>JT`fh#%&PB%@X!9@L#@i
z?Er!<P_m4h!X5_QkLI7!jsvXcOv?@io*zF~qlgWH24pN@7bCyb>EDN73n*B^4n{k(
zx#KAWtt>AXEp|q(i<hp_j=Nc2Fj_hob-r16JAhc6<(z4;FtUQz<_gj+rmc3|w3tM&
zpE@&_;;&Dou<LTU%x#3iMiI;(mp+B-8ck^g8!NvwHWN08)R{YSg2vqoYGK!8qwqG7
zjLXX_A$_}h6fs-H$ZOYo09y1CFkQcKXGq;_8Ar$g>dHR@yc&TJ)=EGJ*4uX<#PL&@
z;yus+YEV`_gb=52t3<S5dG~&?e`4y`Fg|<)0?-LYXsS4Wj>0VxYXj%vho!!=v*-5@
z?j28idSjXG7Vi*(Zm1W+&HsrGI=}@UaDo}ptrY$Xsi^vbGE;I800000NkvXXu0mjf
Dz`;ej

literal 0
HcmV?d00001

diff --git a/browser/themes/linux/tabbrowser/tab-background-middle.png b/browser/themes/linux/tabbrowser/tab-background-middle.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0b65dad63471961c4aa942a69f4733372c2c7cf
GIT binary patch
literal 161
zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol}0V0ox?vVykk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5XoIPC}Lp07OCqA3>DCq!GL_>t|>Lc&<{Wp03`ThO9VHl^I
z+p+&U-YCRAlK)!rN4lnr;c!>U;(wP8J~!dl-c;kaG=zyk^n_B^;swh4fW|R+y85}S
Ib4q9e0C=@I!T<mO

literal 0
HcmV?d00001

diff --git a/browser/themes/linux/tabbrowser/tab-background-start.png b/browser/themes/linux/tabbrowser/tab-background-start.png
new file mode 100644
index 0000000000000000000000000000000000000000..300dc1d757171af84e84267853aba9c450388b8f
GIT binary patch
literal 705
zcmV;y0zUnTP)<h;3K|Lk000e1NJLTq0015U0018d1^@s6@N9ht0007rNkl<Zc-pns
z-Ahwp90%~VIp^kPTh3XVdvSVnv~|?nW}D7!wq<KN-NYp$D2ap!A}a90i*C9JA_%(Z
zKZt@}hzi0;D0(3;qQH`hOd_>^z+mj9ukgrOLT%?cr;E?U9?tW8&+qqp7@I_<GKy^*
zAtkCn4hpCN)doqSP!LT?pbX?BNDW3{zzHmLix>!`LK0|zc8$KpGd**0|C6WBMn8Y~
znqFP|Ie|S##15?nEilRSWZ?OW*U9zuUzvP9KbFhoh9C+N2#FKSg__m%cJHm*_Y>J{
z_Amlt5QhG(#0+g>oId}z<?m@6JPbhy{EZl)axmx`+xKCH<2W=*4)6OHp}|$41lP+~
z^GO^SfnM;JBSwp@Q>V^H$UObvtAx;MYZY}CKUzFOLVGGDbhf6+sWVY>bG_iHl#t*W
zU>`i1jgu<6`JfG!fqHub6T}xplpMB~5B|Yin~kI6$D-u2bn->pW(7E|T)ln>hq!^|
zOUQgZk7wsLD((OmU$pa8LFmWIS^(=V*v%JBupD%@HuoUb+~A-=d$DZk%!wG*_5eeJ
z_F{Ehx_oVrynPD|+WCgx%)jl&dMh;3plP$-?(oL3#)1v3G$h4hv7FLs6~LZ8I};-<
zGt;Upl&e-#tuZG)E`IW1vjt4F%7=2*DxoWL^kkgO)+j`|Kxs*f?S>}j$kNhs4|(gI
zLU2JG>6RbmN??>)YwE_$y90RM3<jaN&_BZzBv1{V_{o~ObMIjo8*I=3dZ9}H@5rDI
zOwbA*7#^EAKJ@PWLLVNsl1=qu*bJ@(=PoNd;OYt{LkCicbJG_NE__(*#Y1h-2s$xs
n2JgTJ3kh+71DZ)&wg1C!qPhBl8*`*i00000NkvXXu0mjfgAqxS

literal 0
HcmV?d00001

diff --git a/browser/themes/linux/tabbrowser/tab-stroke-end.png b/browser/themes/linux/tabbrowser/tab-stroke-end.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1b7cc0145523cc8141b939a10b34fe8dda1a445
GIT binary patch
literal 439
zcmeAS@N?(olHy`uVBq!ia0vp^azHH4!3-piZ|XG#QjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`djotzT!AzggfcMLGiYfs$lEiB>j?|13#ph1DjD<3>GDdM@~9YaE9r5`
z8F9+!b4r_WC>XNK>$A(5@yQzTDwy!d8F0%OaVr`E6@b;4a4H&eDj4y~8}i5+^C%ke
zD424~0~Hu^DHw6dn{vq;LsbIxDj4&~15GgDRxsk0H~uo&G6v`x{gNQRU<O8J7B&uU
zUOs+7VNo$jX&HG1MP+p@T|FaXQ!{f*8(TX^S9cFDZy!JZpy05`1$#cv25Rl~ba4!k
zkZe8J&D3bXz<Oc#wkdKQSt+)<rpNx*&(nWl#a?e=J<IBt*jD=~XHSQ5x!l{OJfkF2
zwc~*um%t+PgeAHMQuG*%LlQQruP|j?yguO*yTs3l3D0<XRvwrlJEMZ}spyP%Jj)~w
zc*r+pn#_11+jLP`!cdY?>BVxEmK|$?=e`r!)^Rzv>|b<q=NtYF-#Lnf6+bKig|Mfq
KpUXO@geCyxC2@EF

literal 0
HcmV?d00001

diff --git a/browser/themes/linux/tabbrowser/tab-stroke-start.png b/browser/themes/linux/tabbrowser/tab-stroke-start.png
new file mode 100644
index 0000000000000000000000000000000000000000..08941c8a783419fd8c0e743c3cafbfaaf6b43ea5
GIT binary patch
literal 433
zcmeAS@N?(olHy`uVBq!ia0vp^azHH4!3-piZ|XG#QjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`+XH+;T!AzggfcMLGiYfssHiZA>j?|13o04&%jxn;nR3aSa>*HS%II@S
zo3YF5^T`_V$r$n~nDEFO^T-)+%NPM=K?)R&ITeg}<qdh|On79Cc@#{!<&C-Jjkx6u
zx#di_6^*$Rj6g=o8$;CtO;9lAkvHN2s+TiP>d&?Xx<j`l$S;_Ik(q^!otu|mP*_4z
zT1G)xMO{Nn*T~q++|tU%&cV^y#ns)z%iG7#KQK6y+xp!MpvHbr7sn6@$+-u!nVcLX
zSTFoG{KTQ?TbUB1nfU*8HnZ{f_Tmk}75nbaH(nEBsdwF|TO?=GPD?JCB|lXPUR(3$
z-Qu`&>16wCAIXkKjA=fOE%uCo*#^#hY1|Gj@dnG~de$A-BP4K7O`(W+nXbbMQ-;8;
z3Ri@hUzpr+>1SGggU4>o6~&cjgE-gdz5a7;XS?mcXlM5NHYGtbP}q99`njxgN@xNA
DZ)t5t

literal 0
HcmV?d00001


From 0a3bf3ab76884e937e309a62fe0c6caf8c592be9 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Fri, 8 Mar 2013 02:57:00 -0800
Subject: [PATCH 005/230] Bug 823180 - Australis tab styling for OS X.
 r=dao,mconley

---
 browser/base/content/browser.xul              |  12 -
 .../themes/osx/Toolbar-background-noise.png   | Bin 0 -> 15667 bytes
 browser/themes/osx/browser.css                | 287 +++---------------
 browser/themes/osx/jar.mn                     |  16 +-
 .../osx/tabbrowser/tab-active-middle.png      | Bin 0 -> 227 bytes
 .../osx/tabbrowser/tab-background-end.png     | Bin 0 -> 677 bytes
 .../osx/tabbrowser/tab-background-middle.png  | Bin 0 -> 153 bytes
 .../osx/tabbrowser/tab-background-start.png   | Bin 0 -> 657 bytes
 .../tabbrowser/tab-bottom-hover-active.png    | Bin 422 -> 0 bytes
 .../tabbrowser/tab-bottom-normal-active.png   | Bin 405 -> 0 bytes
 .../tabbrowser/tab-bottom-selected-active.png | Bin 487 -> 0 bytes
 .../themes/osx/tabbrowser/tab-stroke-end.png  | Bin 0 -> 932 bytes
 .../osx/tabbrowser/tab-stroke-start.png       | Bin 0 -> 903 bytes
 .../osx/tabbrowser/tab-top-hover-active.png   | Bin 466 -> 0 bytes
 .../tabbrowser/tab-top-hover-active@2x.png    | Bin 891 -> 0 bytes
 .../osx/tabbrowser/tab-top-normal-active.png  | Bin 520 -> 0 bytes
 .../tabbrowser/tab-top-normal-active@2x.png   | Bin 968 -> 0 bytes
 .../tabbrowser/tab-top-selected-active.png    | Bin 611 -> 0 bytes
 .../tabbrowser/tab-top-selected-active@2x.png | Bin 1098 -> 0 bytes
 browser/themes/shared/tabs.inc.css            |  10 +
 20 files changed, 61 insertions(+), 264 deletions(-)
 create mode 100644 browser/themes/osx/Toolbar-background-noise.png
 create mode 100644 browser/themes/osx/tabbrowser/tab-active-middle.png
 create mode 100644 browser/themes/osx/tabbrowser/tab-background-end.png
 create mode 100644 browser/themes/osx/tabbrowser/tab-background-middle.png
 create mode 100644 browser/themes/osx/tabbrowser/tab-background-start.png
 delete mode 100644 browser/themes/osx/tabbrowser/tab-bottom-hover-active.png
 delete mode 100644 browser/themes/osx/tabbrowser/tab-bottom-normal-active.png
 delete mode 100644 browser/themes/osx/tabbrowser/tab-bottom-selected-active.png
 create mode 100755 browser/themes/osx/tabbrowser/tab-stroke-end.png
 create mode 100755 browser/themes/osx/tabbrowser/tab-stroke-start.png
 delete mode 100644 browser/themes/osx/tabbrowser/tab-top-hover-active.png
 delete mode 100644 browser/themes/osx/tabbrowser/tab-top-hover-active@2x.png
 delete mode 100644 browser/themes/osx/tabbrowser/tab-top-normal-active.png
 delete mode 100644 browser/themes/osx/tabbrowser/tab-top-normal-active@2x.png
 delete mode 100644 browser/themes/osx/tabbrowser/tab-top-selected-active.png
 delete mode 100644 browser/themes/osx/tabbrowser/tab-top-selected-active@2x.png

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index c730b7ee6628..ac4b39138af7 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1213,18 +1213,6 @@
     <svg:clipPath id="osx-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
       <svg:path d="m 0,-5 0,4.03 C 3.6,1.8 6,6.1 6,11 6,16 3.6,20 0,23 l 0,27 10000,0 0,-55 L 0,-5 z"/>
     </svg:clipPath>
-    <svg:clipPath id="osx-tab-ontop-left-curve-clip-path" clipPathUnits="userSpaceOnUse">
-      <svg:path d="M 9,0 C 7.3,0 6,1.3 6,3 l 0,14 c 0,3 -2.2,5 -5,5 l -1,0 0,1 12,0 0,-1 0,-19 0,-3 -3,0 z"/>
-    </svg:clipPath>
-    <svg:clipPath id="osx-tab-ontop-right-curve-clip-path" clipPathUnits="userSpaceOnUse">
-      <svg:path d="m 0,0 0,3 0,19 0,1 12,0 0,-1 -1,0 C 8.2,22 6,20 6,17 L 6,3 C 6,1.3 4.7,0 3,0 L 0,0 z"/>
-    </svg:clipPath>
-    <svg:clipPath id="osx-tab-onbottom-left-curve-clip-path" clipPathUnits="userSpaceOnUse">
-      <svg:path d="m 0,0 0,1 1,0 c 2.8,0 5,2.2 5,5 l 0,14 c 0,2 1.3,3 3,3 l 3,0 0,-3 L 12,1 12,0 0,0 z"/>
-    </svg:clipPath>
-    <svg:clipPath id="osx-tab-onbottom-right-curve-clip-path" clipPathUnits="userSpaceOnUse">
-      <svg:path d="m 0,0 0,1 0,19 0,3 3,0 c 1.7,0 3,-1 3,-3 L 6,6 C 6,3.2 8.2,1 11,1 L 12,1 12,0 0,0 z"/>
-    </svg:clipPath>
 #endif
   </svg:svg>
 
diff --git a/browser/themes/osx/Toolbar-background-noise.png b/browser/themes/osx/Toolbar-background-noise.png
new file mode 100644
index 0000000000000000000000000000000000000000..aab0a02c84d63603ec1fc3a385a08c5cf5360fd2
GIT binary patch
literal 15667
zcmV-3J<P(1P)<h;3K|Lk000e1NJLTq0077U0077Y0{{R3Uv{&t0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy9#BkFMF0Q*0RaIB2nY`k4<jQZMMXt%
zadC`{jK{~v|Ns95ZD_Ut000VfQchC?0|NsC0|NsC1AU&EU;qF-l}SWFR2Ufq!8b!H
zO8^E?-ZfmeQ$cY%N#b;Zs7z<Z?G)p5ilpr>f?+xX0^9ARo%#OlJ10f_5dWUyh+IA3
z9P{fRVsY?WZ-t*j#nN^O>#jbyhi3HR2p2<N=Oey-@9UfL<6qs#f;Xr=&YlcEsUH$p
z3TF)NM#upLh<YG&$0sR464Xgx8gg(E&?bnlOa{?+=c`ruXz~o+4KdQYc%m45BJ$P0
z-EA;jbafQrx1q)pVAVxW2db#<t;Pcm<lAcqtDK&@tv9|Siqz9uH-M5A_`X)@k~AX1
z)026UzToNi#TkMRp~)LQh+o8py16io*Nh2&6_*o~W3x)`HyS8eVf$(~wvu$At@1h3
zYBxm9Vn6vWWmmTz#3W9xIHsRpJSss<=9aafp5u5Q{UD7~@h<_kmH02m{J88`{4Z$1
z*XkF9MG4t6n+^I^y!JtVaJnY2<q%mf0>wQ6o5@tGUad>RhR+9WK@b^LOv;IB2A8~j
zn(YUKsi(XoZ&7k{8?wOd6JLniacB)^$>lhygu9#-<^p!4X&%BqT@lgH4UoxEI=uah
z*;hcqRM~#H@S+Vuzd8@a(FQpWe)WjNZ`PN#_jHLZd#e21<CeyI+W8LVHZ7<vM9Dng
zlL+Dc{P_Pe1w5e!JkNy#XP`pzWrZyPEb!Svs%Y{35(GD$BvPEQ{4N=7Pvi3{ETRIR
z>jYNlU}p4frf0KPK@b|_vo5F?CaS=O!EYzbCJ@?}ihs<o3z-fby-TX2!R+^KuI(ow
zPYnvU;q5{e+~YFR!9f{O?7|#Qlc(m%pH1fEA4*_iz_-(nD3q?8_xd3tlv5TtlZnsu
zF+f6X{P4ds2v&vvJAYO|cSrb3YyRYAFZF(mHlD5iF+<o^*v%wbDEos7cz;){-nyu~
z9dd!h&wQg=n)J3O)r8@j-hM`z(41e*m5vQrny!jv!h`k4<>)e~mzfzk{BA}rxckLU
zs<3maT8I>4jq@*Ib6<W(ILoJh1?Z{#S=(abs_xNbKTL@)KX#J*(&M<wJX#Cr^W?Qr
zy8xe2tO9yOMZ04igV=dDEMYXHdH6pmUJ^=Br@UY4O4OM<GvPp8{zS^&-!UJ*7VFlL
zcg6yUaMvg6jZ(0(9aS$@w-BrXd;w%eP6jJkVX$4MqmxNhVT+9ewNCud*^d-_&LrsO
zfbXt`AG;6f!;cG01|KZqLwU5dbd*Ur5~|MQ7!e*(Tw#NsN$_ubs}LAau`^^}xAdf&
zdmv={zWRD9koLSLrfW0c+}e*k{8XhjiZHEy4HAv($vvm{fIrIys|RpHlIymj%IgUZ
z=V<P*W=OtJMIk_7zsph<@9jM-+}<NZ5GzATqrS87{Zvz7Ci52^6ECjn`)d4<ioXQ%
zN&HeiN3tHBgxFZ_CC;t6uX@caK1Lt>O8Tck`El`gVQ~Q2>OhtIvNuLGGV{p)c>;E|
zZ<d@3JdoTq*MQ#lo=`i&;mqU<^f&byLT-(#IC?<xHKoA|x4vx#F$d>rZD;mns#reQ
z4ZHx<(Z*S7+oLz9e~3+>EnL}PA`oBs`?rJ0{jB`F%Od4UzLIeH{EV62ia$gOCL+db
z`PW%oP*L4f;!97$s(QCdoZs>%G4m>2c`(gWW(<o*I#uP)NeA_w2N}RyWu%%II+9}=
zos=Zn4-aN_MX&brDmrVn$x1>~k;<rpno9z{lpqKXf`i+I%{4q|PaBtuuJ(M~G5>X2
z%hFx41@w#URPzd!2jiy$g6nj3e?jQCaAPJKQSvg94#7s~?}q;9(d^sOs8X=0WxNe$
z7ik>H-MS?hNl7E#4gxe`+x+9DTuClmu(rl_gXoR>e?DT^o}sFJx{mq=MXp^9uT_+&
zQ>f&=x>W}`-P-~W`IVvdN{2yusblG3{&xEGl-KZPprgB6DYZc_b9I^FS7<%>$Bk|=
z1pda$LO+L?VeJK-5M-91&#U@<dPVnoS(>3rhBEGp`|FDIa*5>Vy+bCLrowk?zvQ?n
zf6Ww@eMFDu^AROq(b%mV1tJ`%U<miLTYmuLGTnUzy$P@1QGsR7-G=<++qk>F{>nW7
zM^FEiDgsits3gz6NZI0e6{%Si{q_&YR5Xqf^8VAKWp_-eDJ6d;ZnCXHO&P8)az|3U
zWv|QRaXB3_mIO7<ZXS(%;6g&97Gx@IuNN<BHjXzw!qRDKZh%`s?IC{Fk@{mYRadA5
z=f|I;`k|_X4>NHOu}4DryA4pmP+F^BCtn^HSCL0k19K2`hQHtd37hNc8o1ad$2~1y
z<Zn|L{2)60>qe*A7*~Qc2~uCNXJ-)!8DJ@q2-(VHQ3c&+GmD}Gga-{Oek1NUzG5ao
z|2iAUiZL=+)wei%bVG{R2EPRHqt<Ogm-NX+jch$&mGv#4f+Q6eF(|~k8e|nV)9$@N
z@A)ZV!h?cX?Ya}dA(6qmz@~c<o{+24R+a~kmom?FQu#t{aphT8#jfC0jP$|c*#m+i
zD|y=*hMw95B&iERIxYR9idi7IHUTLiz9=kzf^MZuqQTIt2fZd!{JGIMS+8VfrEBCT
zHbeEX%vdq-{G*VNt=cIW6kX`psYo0be0G$)u55IUgS&7)HA%RPJMAEwq)ar&pL|li
z%f|_tvBbO(N}Kh&r_3J8C!Mn~qF4R5bv14bdHfY%M*81(BvbmE-~b%^tnFYg&%5wX
zRdg2T+q^@nt2C98Rz@cHN=kBufd2avv}}|O>v72G+MYE9W#>Qc_1hOwBIlB5t?yEp
z>xTIFpaCIU?5KYiOV33fZn%H<g5%vvo_KC0*bBt+=1}U&Ly$6jy3Wqhy!$y0+RJ$#
zWSysty1mc@=H16l{~EOQxK%O!e4ZQuoxjnX89qc*Ge#Y|BczdTw{9GsO(PVzO(q52
z`G6=-;O*HyJnt+8{=S=kU;8*g-3#JS;lu?;KamAg6w&J)(Fth!ZQ~(SOB=8KAM&2O
ztwP|tgcHk0o|V<MQz7*H_Ek)=>A}8ss-Ij{4j}JvNNreMNI@eAc7&c>y-?M7IU5)L
zdX~qBCg>LD;qOQzJRf|Z7V%Kka0lzU`nbbD9=>aabV4qk86)SG6!$fB{i}-oqw|qu
zZXjk2RQI9s)6^{&*GrvM7xiZARR3Z*@pVSsC0wl9zcKw&yspwfx+HPP1#YQdXkvep
z_NK`nFW9QxXq~Cih|l^ZlcSt9CTvfMc@}@&Tx4Joy_i*dmI}c6<q10ui4{>Kt9M&-
z0Ozyc47$Qd#XrJz6O0VqM_0*X{T6Gwu~?06FbNVBTkOj&;IAHb4@?E43%0)I-CZ1l
z@lc(F>W+4hO^F1E^zU@%)s=G53Us8sCPJiJN%#IW<fMu3?bq}By#~1_Hr`?p*q)pU
zkk*x~=EY<;sibSb%Uoj8%8BRjz4*pBY<~-?Fcw(qla!4bPPLHCiSj3wf%LwYI7gcP
z%BkL%*)~o5rDVn$nRECDC4>$Dm`oF?_+xnH8b=t0PJVBx*BMPjBKc_mBb7<BFy{qX
zY4~pnfz!r(ZJ~zxoUeRrFrSztn)pW+Askxbz9UqmNh#j$tS!+2Wih1yovvWkj{L}r
zc6k@uQdrFGZL!|zOTuj&P12QQnH)6t>^L>^7`EN)g+?*?K_B+m_kZyo&4o!Ivd1?D
z*2IQPT6?R^7k}_5)<-V^GCxP<v`Cy<A{YkoZ(U|r$kJ6MygijZb@i}JXD9Ld2Ax)M
zl<MQ6>uh1yo`%<k;PG@R5LZcfeehI?f?pFQ-#ol}_Sjk9ZRG?A*1Caj4--(%O+f3E
z{5SHRrxY?(0|5lFCb760D2v+Deu$*1QzMH1guj16u0>Y${-F0jWoIR+K9YCTC|<ym
z@V^uFr$5&}e1D?ZjqNx2;*KIqH0;{Oo(A5U=qK^Hy?F}0)j`0S{Lyw5q`x@_DcJQ!
z%IK(l4+7ta=c(ED7{~kOPcN_IWEI%B=qQmOYRwYAjH5t}&G{8kK~k(2GYJBw6<iYH
znAxFr%Y@Q%n}7a2J%Oe@fd;I_{X=S++1-fVBt>Cq5MDk6IetC3cS&%S+h<$L9y&_9
z?Jvrfgu?Ls#Ix_@HPTRF>;0o!z88tt=I=`sBJ!9v^P7#Y=)%jitzPrJCWE8R04e1n
z2=#d$W{V%J0_|RueqczLQ~oix5l#^&$9sXxuD*sR+lOo`v7wah*)j_o#$SEVH52*I
zbj5`IZf4D$_%&O=wZ8b3!00r_7Skz(WbfDK!6x`y^c;o?6Ht{%(@w9w@?0+%s^b6=
z3iRtw-du_qv7eUSU!gRL;K^0xmEPiD*^FXV9$odDulwunkZeax9m~@=e)ejSOuaO2
z#Se3b4%?dKCZmM#qVI>Nf4H8a@hxwYCR$<ljrS8KNGgcNbR0##-o({^A~+#@zvT}c
znY16=bJ{%UQklGlHf4Q(4-0#BVGaFB9W3fSh3%`Y=-ey+G%HLeduzw%7Cu}HTSqxm
zpNDnxpRtc<vQx?voAZw`#hKNxj-Q)+yANqWJ)PsCzv7FTgG_(#Tl04nkG?*XDWPzA
z*xfcFhEXQrx72J0XxblwB;2>54ftKOxlp?<nCo189({n&;1XN-UaRzin4FE9YIQsK
z&P1Nk{~AH$gM?x`DGZJ~y%2uInQY3ek;d+?hIk0PdOSB?Ak`&#Y(1vU6u@2v1FpOO
zvD{p9cW*EEHc9;T7Zp78#qQD389mhG;<i>*%LzB?W8<Uas@Ueum>?H-dDFwy)!k-F
zOtbah-KsA;uXyume22E&*p;W1Z`+&i_T&?;Yv+ONUYx`qQ3iQAbw-yqIf9T-{I`f8
zouU3*fL(R6l#g>rZcwwx->2*IHDBh&t5G4v4FdfU`T?18{m^n_Hu2-%ZOtfJsu_ig
z-IW$mf9wM31<{@13J*7{t7ENgBKhwV3j@^is?9Wf#ZBf8zw_HKp+xxQ_RZ%R7M)@#
zF<JXGFEU1i4FU)E$Ap2YPoV>R*=Ju!aXmmlj&Kvx{j^&nYeWjYJTZf$c0Bnpm2SNG
zRUN7@@=qdpjcxq|TCvbeK|n^E600)RZ?MMOTlqZ%<<>(;+~4~zMxn5LdoQ=~H~QR+
zgpHr~<McOP9_Fmu0_-#jrM+?y4z@chN70!oZVvR}t|Vy|L7dpon~d%NQ;EHyO8qCz
z)78)&Z`Cvr91P$hHNUL~;(C0{9Fkt5m{pBFMtfNQm@~WH;6!>8^LFD0XEKKX>qy*#
zO8Z0zBHwP1(|Yqkw#VI>Hrq}#w^D=f=roK(x%%y|7X*x0?fmIX$S0zsn?6FmetVd#
z5q%O8|B|pRbyw#{AM2&HEv6MDraK7m-7c|4SZzQYx%S}*XHX+nYig^=JXx{zRC<3O
zdaZHd0-T+zQ{=5$ph0u1nn=%)@Uy^fwBcF%BN!&h)745wtB+)~>3MGT-)}zLn!MSC
zXdNs#?L5<(XYLY<ezc$D|AzT*<FhPZO^Lggy`kvCUguZVqaV;a&j!0fhxivRaS@c<
z=Ke1`8+ys~x^eW=K>Q#t5%|nO5hyS}beU_jx|!@m){|lJ2jOZgS^w_)<zxxLEY2aN
z6ZR|XO!eIDGq_Y6QwaH@j^p<dOtFitHrB=O2LV^ju$cU3+g9I-Pj~z5OTAN`RY=uX
zhd;*BrH3nhPjX=*gP#iV&i68zGeAuTsqH@~gXSU0%k+6h-&FFsT{?L#^JDyMdG`J|
zSs9Qw#6{Gx9xit8S>Ha>R+MW!-7T?=y<|;u7aF*1s1X{mvQ>>TcG1zzeDvi#W<q#j
zsw|G|EQLxlBc>-_GHfD<3If-&bj-T}AovI9!Gqa;QCs&{p$@<8yovqSM68ncJvs4Q
z6#W=aCk4-r7-&XXz8CDbWx|pj+{j(Ue^a>pUOp2JF(}T(m#FU2>722Ce*IpFy!r|0
zih`<dCpCY!htuXdjZVkp(f%a<e;nlR0s6t$=h!7De|RfkjC!^il&No7<}W-N@Kah(
zk;Enby&|s?(&YrFn&knoqaKTi9%!k>S8exAy#eGZ82j&R@&^jXJZ}zY@2lOFP;QL1
zu^0$-{M=H0aM^!s=xKaN$HD5)?LlyqYG1aTs<iCCh*ZWI1w{5*M*bz;5ybxY<lCT%
zx0tit*&m<%eq`O&QdvelrtSe%B?U>(*JpSZc4D?AuSO%^AIAX)t<@#qLpz;GVe3Y0
zT|dr@NdDyP5oRl@w-!GHf8I}T5%ARq-?uRN*M+ZizCBMyyGCM+lhxpE34U=Q_p|oz
z+G)%qcGbJh@72Gw(+I`d6O138`0R35;wyEx8zsV(onmK44<p?tBnroBbr;cFi_iW@
zu{s=`d-^*I|3&_o51f8n1>-Pkbr$7_9lYuOlT@ci;M#ORJ+VD_>b?<l?muIMcEjf$
z{8UY}eu0sCdip89*Rt8W*dN(Xx+Mm21mEm+JIUAIm|%p$oecApcfe^cD|f#9=Vc!e
zdoF}8ljvtBGT1Z^%jwd6ov_1l5nsdLwq8Q2^O|b8|E3bCIAY^zzHNBK5F)w79hEUU
z$w5=^l5HVg^XKp^jC~7MG-)&uH$0qIn+Vj?jv+Zo3!@25fI<<S?;AnCl2suHJ~sS9
z>f-h)3CRlI`dYabXBnPc+Z)3!Y<MR6KUtTfVr?d?PmK}<oa|Nl1JSbNNMAtwRE{X%
z_qFi>#8#1Z6e_c_8~G&y&wu1;ZNer}DI+76iAEUe5dz4uJU9qX!2gbJefDSpPH*Au
zjR`O6M{_!X`LDiyPdAk_;?6H^zsmTkfGd391Gj#ponP9D0DRhQVQal(BpIBgaI2oj
zUQv~IgV8q5wtE*zHp)Tls!8&=Z$&qR_Gqn_WQw^U3EGKFZ#><?_T!VM7qPMp@v@*+
zqUf!~6vO>-KlrKvv$~*-!rDImf%qhqN4MDfuJ6Xb@7+)YwPX0qXLB2$2^2!(OIT`-
z*$r9WgIWv!t@FmuHY9J}wVZH7(DSm5O4f5~{FjD52=4o<<<Br5?1!k+my-s}Z|Zh%
zK6`(RZS5>TvxXSj4PqHy8meq_Qdz8Taba-g&rXXb2|G(frV+^v#HQ=5;$h2q!4S^Q
zhrb{)K-X{=xW)Hj5<b9*w}L(=I+bt^PXWu!@U*(UMf1NOTn7;i-OoEzbZgMl%%7cG
z2jw65!3pnXeJ<P{LvZM8bwsZQT7Pd8E!&Pp?{NMCwpV+7T&%3XQu4B+QY>LK)0SZb
ze<|7pnDh~{e~AtayEs_*^P&>anJ$Hh`+?^x1yOjKpD8LHj%9vJADn{|_2EYsh}rPp
zM)Lai>aAK_3UKBnfSe>*l4`@k;3ro3ptLLKzL)aKK$ABgbr5USupc}^7-3^7-cA{A
z6}55N>>+vzaryyq<#)X?28>>Azv#;Q{s;)o1+LiEhqBR)KAuCET6^0If^GImmLsZ-
zOva}cMx*l>(&3(8(oJzk4m_bw+(HlsX%v>|t7Y6rguN%#m-pDl9+X;q1gLV^@D`zr
zXr#CNt)QvtDTkk8ameD`^Y;gkI*4-2ExIQiV8bF~OlP;DA3yx=+R|;=xd+Mn0eugN
zZ##v3h1Ddv+2<aIV7qCZJovlZaS*<qe}kWFj92T9<7jm;6*gl<nqdnGI-bX}!Ntw^
z;%tobBT5gJKS=@skvMY^B*%CN1Cp*8o%}hQG^x4#%59cE2)tnA_*P#9KpOx^QFbwi
zN(cxr{TZhErjmxl+s{uG7~bKV`HKxX7uAjnCR+isc6hb>e6w4BH)<K)J)YV4Ql3su
zA5L~U(`aW8AT587M1Mq@y#1a?GRuVVeejP$Q#C?|bEMwxe4EfkX|Sxfo&VfXC$#(h
zLw$+<&R&OVNDqwxyYgGz!Tzx@ZfWiJ+`V+lv=F+0&z|E(p8-K&Yh%!WunN{u2n!o)
zNU&2+Z55)F2m)+VfHz;TTb?SpQg5z)b7<O=_V!eFO38n%fA7qi%<V<Y{(Rv)CwEaP
zTHigf_6bvNOm1>JuJJcSfUhEYl$c-_B==kn&e0y;KBg*(-}7x&xSq7T59uWLpNVn~
z|G=^hir<xeu-0?owb$RYXvufuJeCIv2(_S5=mC=s{r1Dl;4gvyw%5+QZ~`UO?6Wc5
zh}5SK&Qdx4b2r76C4@|CcCt-zorN}GHiSK^4KDH&+=br}(p{c85O=-HPGKiU+TYrH
zFV649xbVoL@$TF-jP64ygI7_M2awUEY2r;^-%T!4Q6A5p5vaes76N`bqyji49Eq|B
z&T`Qa;b+mSwJPfSj1Ww~X>u>f?{ibH2PMZBqNv@}Ppv{hp>DJCF=G2JNFUYCyjNRV
z(dk5{@R2b=lnz?(Ritl@9)D+EL|1t1QFnwd0>@D94RE=Pt6_pka{(OD`!2$K7(SVw
zJsn1wiZV>n@ZX&E71ZL<>G|H{G>lHGEAl=|S!!aN?x!Q1BJMdjmk%(%M$w_<ihSNJ
zXCcG8@RlV$xcPoL-RsNfqI{PuN6F&z{qS8(|BI%fXgpUmVxhFoW=bDmWH)Lg^ejmJ
zvfdY>R7mkoT3Ypf_t_)<`-{-kuZq6!#dg7w7yoTVZu9mnKD=)Xk$$;UwO}+x|DHXK
zpCIEz9QdaiL>20!ZMVuXi=a8HnFG5$dMPJ?DfCj;b_#9p)qCK(bBzYL9FSe@T}SI%
z&!jFLoP^Y`LE_gWMLB_9;gMJl_-UW|@~n7$Cd;vlPQ2zl&RK`5fE>Rhrvr=I0R7lJ
z!%y8t+TU%xUgs{Nq0_9Xf<0XtBo>(yimmhDFzymuEw2Shh?3oGylD0Gu$^K8f8~Z?
zHSv#dGaM&)9DZi#gI_1nJi8j&T~^CXuorb#p1x90pBDmM)_3!IH*uHTwU*@`TirdH
zRDT<WPcAjy_~F>z;V;B!yO$t2J2OMToNtIbZCmE`uj_H&S$|uF72oQ?LNVFTcHe@Z
z-*@;kS4s7BX7a%IHu&0kIa+%O)1@dv&^i;`dpt&r^?T~K1JLPHe;foEmw1*00o6&E
zJU=A=t*F&NHv)dq*BiR2AO+DlvIy$_3Vk4<la19Rg^Qp%srsYWzu4d8>}&9$+cI;A
zO&~@BiMh8la8TL{E^v4XW*)z|P6uTktceV178nxsZBR}*Ww5w)|Fuv;FKM5N8+b)?
zP+l$$k<t+_D7lbC2!f>DEmMC*xB&|8OylH$UEpEGtR55@_um)NTCQydl7#NqG6j14
zq-!`=flsgVZWUk~62F`mdgYb#MOHCh)1C=dzDR{geituDfLWe<HtVk;;vAu{<%dn&
z{pY_K870$@7+e9Jmn1alO`DwI{&T_7L|zRy!A+VsN&koZD+C@upQ8la9&W#+f(}Dw
zgQm*c)o-?9!1#w3rD(gk!gJjcIa+v{)<ob6a&Dn(Ga>h%flwtRf|yR$nrBf1CE=gS
z6WYN%4gPo+-gABsTuw>PvwkPT_XNM0(rXdCAZ33S+bd}S1_mS>+*i8y{p|rkG)L<Z
zY-sqS%gs9N)m-ClCRMcibrj2P!~UWhnac|dq@Dx$z(K?hmf*TX^5l6gcTqv{=H$Io
z=ed;WRZ67a(fTB{Z7f=0Y8?l(js!gMh@*PXmv;iQRaByf?Q77xS~o_({yiM+mqYOy
z+Y^s8bARQGVSM*v?9$gWkKzu-Ka#_!%*Nq;%0?ENK@s*$EI*`UU(`>kj$!}#p+ny;
z1*_WkpZu)+!k$se#fmJiMA2hD%q)b!VGvvQ%trj%557)q>6iiXo$Q&hJI=2TH9oC!
zNb!ezzKvqW&%lJ-TY2@O1a>{^b6)$Mp_Qyu&Iz=X(pvj#xhMg*#S{1jd_gePJ`0a}
zKkG%N<~J0Uo87H43&FVLcB_p$<5V-9njjiiS?hGZMSER^WsW8o{46|ite+4q-<)+T
z=8ItQ*35nuD~$2SCoX`}8s5&SXOWIzVdLlcoOo-bz8-FUD1G(PgI|Xe^Ku@k9)Y=-
zNw$Q<pM?I^WF_#`#EkUU41h67`>hQdC$P_UqtP+b4Sr{nLYYFZ@kH&PbTC-}?%wvX
zj`L9F$FYtekHuO5;+Cn}c1UF#f6N1-PI)~^N&@~8YuowbkJ)&ju$X*s!&bXJ&ekFS
z_L^Y&w=R*qwVg+e3CK5(i8!0_8AJJdq|iL+dm2fwc^^gBpv7lE`(cWYdd=uEcGKZj
zLO;y0$R|;loId7_;i0>nnifJa`m#V}2gleL7Owi!b71{cYWv;ITpaYJYDw8``N`QO
zENQM`DfqzsR>_|k<iNB@ZGij`zk1rGtG=$<z2wGQE6E`Lfe-;7)>_}Uwjy3fx^!AU
zb!+J9-y}Vp+1J`BD;|b8(EoaY#-|DbFKQmRD-(x5ewoifj@k>5F^5Y5M{;F{1*iyI
zs86jc2+J5lMaxt$^wnaU;qZLjSCz~3SJ}3%!~fd5sy-+sE;_XJcLcd{%2YQjZ#Wkg
zjxWP*^t*=yhhYNK54qAQAcKiuQW$bO>YjJcP_n`cf5Lne;m&@y-AVY){5J^dA4{4f
z$O`>aofZp2N#VAeA7U*+@={9@K+ND@s1jWOqRpi_8;rhbA1<{&Ypo@OII%eV!om8w
zya->d)Z>fayR{I(bh+ebG?DrE?)m^*Opcw48Ln5RHz%?z?~KS?9#5>ZY>jgFtqMt$
z8;nLKh7YQ>I;9_7ouZH&`!NhWQ>;MjL2<jQyk4G(<)?S!<?Z8T^dF>zcTv|jQk`4s
zg2>G`)zu^_lXp#$54S2etx*Rf8vbxICAjTyzhTzE$L@lrl5Mb0n&2aeBtYT901?wD
z2sqe*4xkd5T-QU)CSAq1aO&4?wEq+k>(f2SuROdWjJmyGZ_vei_Mu*++D8e(2KvJe
zF0a{YYUgML5#9LseV_U|PM)VMz0|+?4w`V&9)_VGt(j!+1fK7a@E<b0^CF5G(D-kl
zp|TSR#S&TJz*6|Wfw5VJ=)#X+Z*VTd<WfAOzQT6mnEcV<pRe7A$`j&3e0l%cdkO>l
z942fOAZ-<bQSc`kE`Hu+Op=<Me=}9nFKZ#O8#u(#-5@ANVI%J5WMi#&>p$qDQ<Atn
zRyZ_EU@0Z@cf|xs=!M>y+NWVFIe2?=FZW-wKMAogC2-tJR)fB>Kl!ZdL+K2Z9tGY-
z@Ri7|YiVE82#tH+mf6zN;GWN*VSCXz!Gw-kDVrLGr}M^yFLM>3u$N8@wvbJ>UQU=0
zNWRKA`F>bni$N)hg54|Ld_p^y+~=SZTYeA!Q4rrb_PjTAu_(46ZYzGy20ujm_qWrH
z?o-H_N!>>a{5-9(cvOOkkQN(+lD7@Pe1Zq(iYl&;J2G|nPu@wt>)6|Y?kq9i`MW^@
z>+(EGB8mh-^j$yn<pAmG$NkP2{`ViUqO-^Z?lw$Cdu;DITTcwe?;qqRbj39&_u;#U
zXCjaJ8SQ$Mlo><t+Y!z3AA9dk*COxC%xAtYq;G<4tHRrJLt}ptoiiDMaTs7on=o;q
zhfA7bLr!YqwfVs^`9>10zVBt{D}8D28#I(Nvoht>=jqVlvb{T4%vl(>rL@ZT6Yp<K
zKa4N1`{|L>MDU|LetyE}>EibxIOVgq?_?Gw2wL|k5$nDhD-{SS9x5W4^freBVD6_7
z)Kc(jeaNSGv)QhKj4zTMH}P5t4)ODI)GIZSKiV!bAND*9`^f&ziU=CyU_znrk3oc2
z2T9f<mDlP3htb=fXa2cG)P?DM;Y^xqhQSr6Qs;0rR3{I6f%5LGnG?($&G{i%??cAM
z9GL#EA1j29lZZ!^`5rcR!KgKdaO!JiNY0o|1=y8_V(*#N-(-udgtm59or1}wwGh|g
z1cDyp#S1x>iBNhWIF3nsF;GwYX@(X<8`y+@0F6=-8y&2iM5CoGhjv=u+^^gCJm2A|
z_Z(vHDhP<buL!n2qK)o<#`n=bSl!crH?9>ILi9FlD;|Hp#zxOv;pR>!UHh8o@NRxF
zgKv^lOXRbi_Z#;rFs2p_Tw^nnlpFr)_O8l#DFGiAZ(t>d7S?f@xqUZE<#pbZY^=*i
zzVawV*y4K+?z}}vyqg>Z6YlZEI9TNpRVMxI>ZXtG;<5QE^6=_A*=}eG7GvVb;)JC>
z6G$`PMg{$VFPJ}x@JfAwSr~(bO@9Mb^}O5gM0Xvp$E~e$y!`vmk40g>aV^&-q3&?%
zA<lZ`>bd~3v7XHB<dn=H0bTT@E1k(C1-9bB90o8VLIe9W9O&ry{2_=`{&WB<V>*Dn
z3;(0Max3hA{xizk1hN+V=?omC(Mb)f8}QHmIRqc>c7vnkvo{|`Z4h>P==}ZE`Luo&
z)zjdTLn@5N{wjH6Hsr1213x<i4#VTw1%mSG>#Og3ND7<ofjxcuh%Y++`gnX&LpQj6
zqBjhtyW2~X^6|^f#M24eSiX_hie0Uz#*&dem(?_?f}wWm!{TfgD|`L52t{j-!vtig
zKe7q%BW@x>5pQu9d9SAzaI1G*tKFvFxDt~XG`dWTf_wLp(61ghGPtPPMsk>f<_|7c
z53-%Z&Ar#PD-B>J0ewaAiukT^#CdBVFDP!Dk#BpJnofa<)@oMKXbtPN_6g|po{s)y
zd9aGVY(31d?~EhfuftI#w$#E)NoOlagsfd5dJ`Xi5cpb7a$EX+D;E!wocQ`I33~ow
z3w?dPj`ckPRJ!T4ClWU`s(T-0Ryu$DyS*U&pF4Koemr+>eo8CGCxP$-@vJkqDeG~F
zS;E0J?_+Y>reH<(hDh0NV`<c<sHPLO@B)%7NI+klvAXP;AG%ZiG&UNW@Gkqh{=V<i
z&^>Q8q?jawCzXW#A6mjQ>GIxxZ>gnWbP>i=1D_{l5jAykzaZFtG<A34n7?x#^!FJ4
zb!A9~$;i^jz%<`cGQ(=?>-+XH6oF6JSz^7CA&33E<afzw7~5d)Dfkz*?}r0#GEKdN
zrx<GgKFVzalkj+wj<j-NUubVBIq@%J@?yNe55MW41FcWgu@{gG_J@}`7++5Gx*RkA
zp1o_G7g@G4taOjzi+oZ;*b(*Z_#-TsR6jMjJ<l`j%Sh}ZY<8&_pG@h?a-`T*K=S0b
zO;<bU>siX;z^~(@NHJf0tVuR!MCevZ*|o`;fqTYCI|8$!)S03e`~i7@Ct{Vm6b?|2
zn@%MMv?;fuk02C4I`Lv|mH`PDg=8GOx=ErJau4BJ-M=_NQi2@ioXoFj+Zxg!a9!(h
zA^JC8w?qj>HliKdig2f!SIH_%tx~ja`CfeX4_Tu&=Bn7^fA@6aOOit}vZl=?{uABY
z&!Rc05_RYj&R+fD7-1yI3uc1K)l21P9X`*k|3n-Y_Yv^Ve$8Q3p`CH(se~k(MgYEC
z!+PMkCbKwd&>jj4?j~Fb`W3{m4^i|g4a12~ZqJH0q5ST0D&xwAW<f11#eCjq5RV<v
zqX?uMMqwyU_}&tb{)I`Y{84u@=k2ebM-YwIGsCnIXB^!7m084I1Q!jXs8!-Q9zL)1
z48N?w#JTTs(tSOeco%*o@goBImxZTgl0~)uDG}~mc%~Yk7W9Ma$&@@&FTY<i!+}GZ
zNt#P2JRS9X%)LMtf~YZ2ndHevN+TFq5}i&%7<Q0*$bV#i$?SQ=kEc~<Y<?30M}f@?
zh1T&r!i6pW$gJ4XlO3BB48n~cIp%*`xl<R{wWiyFQ!&>Bun6w_OflTLe;A*HZhHxi
z*J(3p;+&%16MNHPfm|3aF~t$_eMd$D3dadOz?6#T*C=`k!!YIJhxtW#^li<a43hc0
zSaoPsid(o<2^*}_iSd#=1=zo5pPUGpJJbG#D5!9low4I$^BbLY0J{IdlX=(Omu&zS
zN`xcC(Ms3m4rmHQ-XNH4X!-TuQ6~ZWFm4I{&*E3C6a#4T@A*Xf0X*P6Q92+M!+9tB
zP9>y2Y3)hM!v~k`4vXy7ofte*zVVvX8J9-#a{xcln<;XVwuO36<rOVGd;_=`7DW%Y
z=jf~nh_DsXDW5BE?q7z(8A9B)E{>YezB|JC*`t0<d{gu`=Fgsg*LCZsSiiP&#o}bR
z4#*(=m6gEsCPfZbk2@<&NA2vP*$LA=?Hc#Dn55Ctzn|YM?ffX9lOTKvX&+A!$@Svl
zQTg}^Y9ok#rdRjDxrB)o7`N;pAbcKMFtySb1qFJbUn*tS_Ct}1-fBnX*=3`v-0igX
zbl-`dx$mM1n^0EyQS3zzVP&36k+d8F$FROV%ddbNPaFkbi%AfiUaU3AcB8m=F{Dvr
zQl@@?kVW$5>r5(|=atZ_bV$XLm$g66B?TI2)QA6$V)Jp(Skwtl>;g4O;R>a7y2(ss
z{9{T<#&g`~TY6v%3vYrA^0=PTLDwih3SH8OVb5yG>>W&~)LEXO(KvN4Or`HsLmZgO
zMp*leqvFNWvp#<3H;7$8DHzF_#Ff7N#+kF%jwUtd4P7Edq%hhs?dL1;8aa)q`}dDQ
zQ-ge*8NEf?em_M=`Qmgv6EGv+Z26|eB1o;KWb#bRkjf?+!ztShO7GMobIE9W5ce0=
zGkYNs3)`&aABKVEG|Ck&u~7>#4fzO*9C(p!0)&3RN+NZ0uV4EoZ=r|aJCK*_`%8fo
z@NN9+^8i1~w;vvY-%Bt2K=dst*nT*P0J!l7N9H$58bDf@6=Kr#4NBs#Wp8hE))-v4
ztJ}uxa1gBCq>!w5`XC9ewPL2xhIb4VjaK>Qbi0h151d}IAx6HwTKEQc;(9+<qXK<I
zx;x*#3FiIn=_#4`-Nd!{s*RqXD4cT-2*!<f(ec$jyi^7Rr(y?K;p_Wn=-6*>Q%0~t
zK5tRA!?Z|n)0KxFZfW0HM~{826Zpl=cM)jy{#c3d_1^Q3YcTy{r{JONL9DSzM?P}i
zGeV_O0MRdP*Yp|FP}igJDi`$+c0@Px?Qu*io?{N%qu8|zSd7k<)V@tz;Fv%DC9I|-
zs~*y|FA^rZ{A+EmmrQqd6tZ0e8L02>D?n<g(Hjk&f91G(d-3@bfZ!-Ru%E<To#)8@
zmCI6sSgl98@3E_#g>7!+G^leYQG$Ql=OSm8&=@QwyM)r8M6xKtkk}<ohDR(O7%4VV
zb2nV<Iv(AS+!Vx*w{Xjx=)Yj80rz-p{H>3xKjVIUfBxK5|M9D$%}IKsRA?gW`76?f
zBQGdNr)0-<n;)-@eScIbj)QHhlGpzRQCNBgPmMz|vvGD}lhd^A_eGAcp0`nFXHIPp
z^Rcn_bcW3@am_My*E9CwoOWnFi|f}iK$V=uQMci%&u{pFsB8ww4oorb$o%hF4`g-l
z-bJ8N#~@F|dLW)H@r0NWse&BGZB-UIg)7^AFA>Z;1uq+%L~xPlALAzTMgj~5fLpKS
z?Z?^A@cjj)IIy14+Y0l)QTU%9A%Io-2dT4vI2P500#hGi!-eZ$s|!_K;%z_NZtnLF
zoE6$d1riM{cd<{&9(5Ht>v5x!%suQkKXaTPFU1rOK5svhvaa-0((>`=IFKLnRuobW
zx^|#8A8NeizMiCQ{06(58>=Vb4;&@p?{%1g2=#c!h2OVa_<OP0hB?x2ej&i>cQ1s!
zSc<rv0i%r<I+5^o-&cuI1D~(g%y1Q9%EE8o?0X2G3TvFwFl?X2e|Vzda7Pa5r+le(
z2!8KHG+h(OW`Hr74?n~}!a@uo<pnB6f1MbiE%q5BD|}$Zdn7D`dwOMII-7dHx)*l;
zbGEU3Zkat#Mt3h3k(yqU<L$rU9dEyYX#UZ^C{m~3t90+yrQgGUR0XYz+e^<mMBb>)
zR_{%`{<G%i=y~W)pDixrfB4QA!u=H5#q<~G9?9-bYa1KUJxscvob;FKEAoJShmvM#
ztdQ5@;KUDc2*A_vC;)8`Z401*QODnkC;Z_w?D53+B;{Ked5WWlIOIpiKdAz}Hs(}B
z@JzmOkGmiY=`}n_JCPnm(8=10i*^=R;Jl|wew=82v?1ZJ<@z1mtVc<*_ZD)#ZjM&m
zi|>ceMm~T*DYVpXt7QB%Pf~mj<ZVp{|5ehPcq39pmWE47a&ipOz>)X<cig<u;tF^X
zEv)0$bnV0XikS-s7a;ZMUKUTtf937h-!~k4EDWOy6Bq%j$Z@}mAmo8eWkz`ZM+9?N
zh^{zW7uQiy+>rdC+Y%fEgo4%i8MS}?V97K?=hH%B^oWU`_*2uR_jlymn?tNj7MX0m
zs%$j$gYC2R*F1LjGa{=J6Q$&CSC!*@CJl|*?B(bSwB*Vv{5WGztitw;a=3s@3;7<%
z4Pc4kdi0#ihhO~+b!ul<mFU;X!pYO&hh#m&-|aN9!;|G->4a{xQq|vmOVJQTMhA!c
zZT2E%+@rT>e6elezC{0zuG-Fj9MF6XB@*9?ETp<rbq9OY#u3cp+BZTGVFuW`Mma4J
ztDSXdNFT~mL*V{voLcKE)eMsRE3;m$UF}$?TO%rEhxw*{Q`qgt9gXNJDAO|dS|Txy
zy<OcDzRgEkDH+3!p&tC#@Mtr_)W0YA$~>M#3f@A)y*ee=WoodMxckQCLvP<paD-4c
zGqwmzw`Sd7?TyA@;cahcilFd>>p5eA<iq*U>c(FqJR6ul-Q5NIsUP#!(}!ORel4xC
zXVZt`rxQOprhOAnQ-D0YV?}0L6fp`PF_jPh7X;@FsVe~(K;wE%=Pv0UsOWSTy{OZP
zf{;!S)N~3ePA98OC!#>QOlHY^|Ms2pa;Qm)yUZlqNB~m%yVdo(BqPYt@Llw#m3+Y{
zF3ZPdiR)l6`%~(fT};#1N!%T@JRUvf2-(<?xnzUr*ujrm{p6H0VXP03G%Npr&tNsB
zgLtJ#12&_46t_GB$tgVi(|MctOG3Km8b||42fsqq`^m96aUYZT{PLzS+eoMn_#FT3
zCr)nEJ6m=Wu#orxg8Jf7M%K2&$2(93*sH#q@Xz7rd007Dab;Bk)P5-zOZBZh6t<zJ
zG6g%T{qrhz-7A#Mb70gS#a%{{&G6|6nR{ofxNG5wt>5Fy*^g?CJ`&XN2hq28I@y(p
zKq!@}PWI8+%U;ZHn>%`jQs~F?4zZh5se6+4lTbl~ssaTC;ld;D>c+Dxo5eXlgK=)E
zyVj@MB%m@%I(Soa6#+K1WM#ZtA~jTK8~BS=Br&>v)I2UzQqTXG`Fjy2S~=$(lp1}K
zl9{6RxG5K0-=`=5OCi_2ObVlp6HL!TR<eZE`seczeaF}4mZ(+Q^RAbt`oNz22V;m=
z4F=SMA0eqB{`CXxW7xdf#Paj63TgD^H?+*0?Y4oxq}pQ+E_qssw^mkO99=nX%Qr#B
z;KeVqx{ZI_kP1wy#?9Q38{ix>mONkn%eJI+qfaA*Nk3KBsuj@`UklzOxgSu6KAUGO
zx+9}Pk4!H8fp&RnAtYxT9<)Zmxh9mPt(maBvU=hDg>$qOXTeLNy!w6cX=BiS{20-K
zNA&54F1HkFpYr(616TG+S9ob?JU=ZV{|#y)A|)k}|LE!Sm(rASB!|>Ztn(WE+wf+a
zfd%(s11k=;Zv4}n^<^o|N1n?4IVtP*REtyVBXIA~{2iamh-~;rvy<3;Khpq+xZ0E9
zA1c#41oJttI(yx3k?5pByU@<_D-(M|Noi6HO_G#D`R6;Wso?D+?(%52dKwb-lU+oc
ztWt8fx*6hrrlB`+Y-}i5o$9ACPfCh4>Ss2Qb~=T;jCP)<fpI-G)rS9dco{3tk-9$?
zgNgq@%Qp8c@@Ol?q0OLc=;v2uzSmB;r6$2!sum`ZstNPztosvTVbVygu&cPBAxv=D
z1`i$!lX6%x&GC&&G;d+-B+u$N=YK@#@WWorPmt|HD}=FMi*xU`>t-l`zKX?VY-Llc
z_iL%^4DF(xm9rJazXQFq069bR==^$8XI74>boD>h#>K+}UrKA~oVh{c`O(`{J^wF4
z6HTI957+kBl|XiKCvZFsz4Y&x{%O?QT(C8%&Y*W%Vo_<a?^2Q&0UHpZ-go6Mtdxg`
zOeQoaw!>d=|2ee3Y3Gd06eB^RPxn0YNRe-lnxAhbd^k_X-jrI49g#9Wm&vr1EWT08
zqM_SaL*OH#uP9nL1Ya=TF2YqBfOtU`$XEfnMSHQh8@48nSe@sn76B3+yYEUMmK$>w
zv*7gG@c4@x<a3K6jffFaDVW=;Ivg=PLQyx8<K=>#HJl;Buoo^nvpbJ{{Ob9NCm$xe
zVU_coZoT*o2jO5pIleIwz*~SB3FH&2de}txUvR&52b6J*>Kit~(S4~af4XQ;ez*Yx
zObKmH!TS{vUsOI+^Ns#V;fUza7dt}CT(puEygoZ1qal7$r|=2$*Y-j-x5@Up`U{F>
z)61$iu$zHRvADw5Vj4s+mv;uS;aK9|-NFf#0M`3p|I8p#;4xg756Ls~Vd-aE)wl1k
z?tH}<3}^;4#>WgsX~T+*v<(?*9-25Ny|C^vkRuf`Nb)UYo7rcqUCmvV4oB?da0_1~
zmf2wwHsc-tiwf#sb;>pw_(x2)U=cXOE~((a+Eo2wZ%(=)m%ZNFjh`H+p>B#U!mc0A
zA8)@EAFUi<7(-`06Ee-HRUIsD2WyEETB&Z}l_<70QXpQE{)k23G2?1<6aUE>%{Fk)
zyghb%<CTVsS8gRA8Q@5Jad@y_WlBeWX@;oDgG4IJ#6$mObo%gmBHz+pU2S_0bq{+I
z2EuY8XecbgYyuPhg;Fl|r-K(KCcSC5w22P3k*Jy_-AKN-7d|^k-{AZ_@`tM7*Ouvg
z_is8r^OD;w#QxB(d?-rrc41Dq8gc?2Z<PyhRb={`m)Y1BoO6zDFwG^^{)>Yg>JLT-
z)okJgA9$iu_hFR8nJ(*`yWB>I;?yi|e-|mW6i*xZMI&x{;IPCSuTxEeg$7wyDR?AL
z=9-@NYR!B2cquFvpkpt*oN&io#qHLbm>ldzr9ZVdLgnr5-H*4f$|N`n#2F9OQzzc>
zk?I7M!fGxgxEb^wvvBJ!0(GqO*IMjeXrEMmqO~;T+fi7LL)Z6=ye}G#0FJZ5e?)iz
zxoYIVs^;I;0{o4mGLKIQd|@J-ZpVw*sfzgOJ0GAH#xzbp!vj{2!9VEDz8NE@SbV4Z
z{0-jjbsK(=+*zJY$0`ETt8kF|nb6xky*c*uMN>k4PS$Ps#OoYtCe_P>;3%RGeaDS=
z5ujy&VxK<}pYn(K4g*nC$Q+l6m$6t;GN{X|bS$7;G5FBR2oUFet~aDfuB#m#3T?*I
zSIy@hioazO{^dHH1aJGToe|N8?@MyC&X0{HM>xzYmI@FHfEzHjY{MV?^e0*z*HP=U
z5=@ofGNCX!2XQWLa@SjBqdi=Nm7|wp5(luH=*X!5h`)4icQKu@!VdQLuaYPW<NG8D
zHxPHCM4f_1zA4T{D75^vJEnp7T@+j<1gvSGP~Y+2xN^3GjXDp$)`F|TA-i6Sr9tYj
zpg08H!tEJ;w=6?is`{J4z8klan1jX@O9pjwo_Hp2b8a=-<`(3>k`t`0>d+U~!WN-N
z|FzKm6FN8eV3U{(ZvE_8&}G}VP{AQf7tg~n>{7VUVOp^o|IX8fi-r$V=m)~=E%|0U
z7RRPrvRt|2o{GoD`wT9bxm8IU0RbSwLGvVPReZ<7py+*S;_Bmj*jIapSh;TAG8OP5
zJ@_r~38N<?{+Z({m*m-2H)5ss;i;GO-($LmPn{Y1`^B|=02JOzz0wNNd8{OX%~YGC
z@7`zD+3Ak=;Xy_ZI$<5SkL%yD_m6YjE)nW}7ocxW5pT+ly)x0v+;tXN$V@NTir4PL
zpiyU++ak5;OfO&?)JVVJBKtjU4T%?=&QHi2q@a#j9;%!TY)8h>Kh~}Rd-+4@r{0V&
zsfIqI<K1GZ;?ISCwAuLNJ!H6VB3bxuT%k2K$3GRAlLI_`UfIxn5=DkkQ+$y`lLKtd
zc@R0TPpuO0-<bU=g?yiENVy4?93%wT5+rUY_PiBiw~Qw%z$22>Hj>B-6k^~vVXMV-
z@DS}NgCNFH5Qkr_PRN^k1Q!XzReLCBMdbkFoR5+;&qu(09+~I(9f~XH<N;CoMe40#
z65J-!c2D0vP!J7PT7ISeZJ))Lvo2UzFV73!sUAP7fY_wJpr!USE`I+)`<}c~17|SX
zi>VK<us5L3Eb*gY$5w_J%yN(K?2~71_cHkx`dE8_hYi1+od;KPdIR6nn>G?F3?v8&
zsG8uzw>L?p)E6mo!YUSTBna%?Sj9iC<BxPRbgAqdO)K7gr=MTYN7vIW+`Jja=w(~L
zoLAd4em{FBYXJpK8XBa2=#$V|1&~+Kl8qo6Xno4~<({{s{>u^Bkx;2%px&QV;la5<
z!FK%IP8CD6?)QX$A9At&Xg8l(%iHZunlVqNnUv61iN3-{V>fkz{pk}<kbgbeUdHm>
zal+(vv6vBY2tT;gk2;aN8gb<$t)OxnF`U@E{CfZPJ<kSp)0*QdJjlQcPWB%UzMf91
zAb}g7G?yQ>e)j)i6F%SQe;YctE#W0DSogo6FMRe$=?w5*XjAHx@*%Fa4${c<9twB4
Z%Ktt2F}8~Q0|)>B002ovPDHLkV1jXE7}o#*

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 0cb7145ef602..6c0ddf75cb7e 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -6,6 +6,8 @@
 
 %include shared.inc
 %filter substitution
+%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 conditionalForwardWithUrlbarWidth 27
@@ -62,6 +64,17 @@ toolbarseparator {
   min-height: 22px;
 }
 
+toolbox[tabsontop=true] > toolbar:not(#TabsToolbar):not(#nav-bar):not(#toolbar-menubar),
+toolbox[tabsontop=false] > toolbar:not(#nav-bar) {
+  margin-top: -2px; /* overlay the bottom border of the toolbar above us */
+  padding-top: 1px !important;
+}
+
+toolbox[tabsontop=true] > toolbar:not(#TabsToolbar):not(#nav-bar):not(:-moz-lwtheme) {
+  -moz-appearance: none;
+  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;
@@ -73,10 +86,9 @@ toolbar[mode="full"] toolbarseparator {
 
 #PersonalToolbar {
   -moz-appearance: none;
-  margin-top: -2px; /* overlay the bottom border of the toolbar above us */
-  padding-top: 1px !important;
   background-color: -moz-mac-chrome-active;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.57);
+  border-bottom: 2px solid;
+  -moz-border-bottom-colors: hsla(0,0%,0%,.15) hsla(0,0%,100%,.15);
 }
 
 #nav-bar[tabsontop=true],
@@ -85,9 +97,11 @@ toolbar[mode="full"] toolbarseparator {
   -moz-appearance: none;
   margin-top: 0; /* don't overlay the bottom border of the tabs toolbar */
   padding-top: 4px !important;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.57);
-  background-color: -moz-mac-chrome-active;
-  background-image: linear-gradient(rgba(255,255,255,.43), rgba(255,255,255,0)) !important; /* override lwtheme style */
+  border-bottom: 2px solid;
+  -moz-border-bottom-colors: hsla(0,0%,0%,.15) hsla(0,0%,100%,.15);
+  background: url(chrome://browser/skin/Toolbar-background-noise.png),
+              linear-gradient(hsl(0,0%,93%), hsl(0,0%,83%)); !important; /* override lwtheme style */
+  background-clip: border-box;
   background-origin: border-box !important;
 }
 
@@ -104,7 +118,6 @@ toolbar[mode="full"] toolbarseparator {
 #nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + toolbar:not(:-moz-lwtheme):-moz-window-inactive,
 #nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme):-moz-window-inactive {
   background-color: -moz-mac-chrome-inactive;
-  border-bottom-color: rgba(0, 0, 0, 0.32);
 }
 
 /* ----- BOOKMARK TOOLBAR ----- */
@@ -2165,6 +2178,8 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   margin: 0;
 }
 
+%include ../shared/tabs.inc.css
+
 .tab-throbber,
 .tab-icon-image {
   width: 16px;
@@ -2196,7 +2211,11 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 }
 
 .tabbrowser-tab:not(:hover) > .tab-stack > .tab-content > .tab-icon-image:not([selected="true"]) {
-  opacity: .8;
+  opacity: .9;
+}
+
+.tab-label:not([selected="true"]) {
+  opacity: .7;
 }
 
 .tabbrowser-tab:not([pinned]):not([fadein]) {
@@ -2205,57 +2224,27 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
               opacity 50ms ease-out 100ms /* hide the tab for the last 100ms of the max-width transition */;
 }
 
-.tab-stack {
-  /* ensure stable tab height with and without toolbarbuttons on the tab bar */
-  height: 26px;
-}
-
 .tabbrowser-tab,
 .tabs-newtab-button {
   -moz-appearance: none;
   font: message-box;
   font-weight: bold;
   text-shadow: @loweredShadow@;
-  margin: 0;
-  padding: 0;
   border: none;
-  text-align: center;
   -moz-box-align: stretch;
 }
 
-%define TABSONTOP_TAB #tabbrowser-tabs[tabsontop="true"] > .tabbrowser-tab
-%define TABSONBOTTOM_TAB #tabbrowser-tabs[tabsontop="false"] > .tabbrowser-tab
-%define TABSONTOP_TAB_STACK #tabbrowser-tabs[tabsontop="true"] > .tabbrowser-tab > .tab-stack
-%define TABSONBOTTOM_TAB_STACK #tabbrowser-tabs[tabsontop="false"] > .tabbrowser-tab > .tab-stack
+.tabbrowser-tab {
+  color: #333;
+}
+
 %define TABSONTOP_NEWTAB_BUTTON #tabbrowser-tabs[tabsontop="true"] > .tabbrowser-arrowscrollbox > .tabs-newtab-button
 %define TABSONBOTTOM_NEWTAB_BUTTON #tabbrowser-tabs[tabsontop="false"] > .tabbrowser-arrowscrollbox > .tabs-newtab-button
 
-@TABSONTOP_TAB_STACK@ > .tab-background {
-  margin-top: 3px;
-}
-
-@TABSONBOTTOM_TAB_STACK@ > .tab-background {
-  margin-bottom: 3px;
-}
-
-@TABSONTOP_TAB_STACK@ > .tab-background:not([selected="true"]):not(:-moz-lwtheme) {
-  margin-bottom: 2px;
-}
-
-@TABSONBOTTOM_TAB_STACK@ > .tab-background:not([selected="true"]) {
-  margin-top: 2px;
-}
-
-.tab-background,
-.tab-content,
-.tabs-newtab-button > .toolbarbutton-icon {
-  -moz-margin-start: -5px;
-  -moz-margin-end: -4px;
-  pointer-events: none;
-}
-
-.tab-close-button {
-  pointer-events: auto;
+.tab-background-start[selected=true]::before,
+.tab-background-end[selected=true]::before {
+  /* The fill is in the image of ::after on OS X */
+  background: none;
 }
 
 .tabbrowser-tabs[closebuttons="hidden"] > * > * > * > .tab-close-button:not([pinned]) {
@@ -2263,178 +2252,16 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   visibility: hidden;
 }
 
-.tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox {
-  -moz-padding-start: 5px;
-  -moz-padding-end: 4px;
-}
-
-.tab-content,
 .tabs-newtab-button > .toolbarbutton-icon {
   -moz-box-align: center;
   border: solid transparent;
   border-width: 0 11px;
 }
 
-.tab-background-start,
-.tab-background-end {
-  width: 12px;
-  height: 21px;
-}
-
-.tab-background-middle {
-  -moz-box-flex: 1;
-}
-
-@TABSONTOP_TAB_STACK@ > .tab-background > .tab-background-start:-moz-locale-dir(ltr),
-@TABSONTOP_TAB_STACK@ > .tab-background > .tab-background-end:-moz-locale-dir(rtl) {
-  clip-path: url(chrome://browser/content/browser.xul#osx-tab-ontop-left-curve-clip-path);
-}
-
-@TABSONTOP_TAB_STACK@ > .tab-background > .tab-background-end:-moz-locale-dir(ltr),
-@TABSONTOP_TAB_STACK@ > .tab-background > .tab-background-start:-moz-locale-dir(rtl) {
-  clip-path: url(chrome://browser/content/browser.xul#osx-tab-ontop-right-curve-clip-path);
-}
-
-@TABSONBOTTOM_TAB_STACK@ > .tab-background > .tab-background-start:-moz-locale-dir(ltr),
-@TABSONBOTTOM_TAB_STACK@ > .tab-background > .tab-background-end:-moz-locale-dir(rtl) {
-  clip-path: url(chrome://browser/content/browser.xul#osx-tab-onbottom-left-curve-clip-path);
-}
-
-@TABSONBOTTOM_TAB_STACK@ > .tab-background > .tab-background-end:-moz-locale-dir(ltr),
-@TABSONBOTTOM_TAB_STACK@ > .tab-background > .tab-background-start:-moz-locale-dir(rtl) {
-  clip-path: url(chrome://browser/content/browser.xul#osx-tab-onbottom-right-curve-clip-path);
-}
-
-.tab-background-start[selected="true"]:not(:-moz-lwtheme),
-.tab-background-middle[selected="true"]:not(:-moz-lwtheme),
-.tab-background-end[selected="true"]:not(:-moz-lwtheme) {
-  background-color: -moz-mac-chrome-active;
-}
-
-.tab-background-start[selected="true"]:not(:-moz-lwtheme):-moz-window-inactive,
-.tab-background-middle[selected="true"]:not(:-moz-lwtheme):-moz-window-inactive,
-.tab-background-end[selected="true"]:not(:-moz-lwtheme):-moz-window-inactive {
-  background-color: -moz-mac-chrome-inactive;
-}
-
-.tab-background-start[pinned][titlechanged]:not([selected="true"]),
-.tab-background-end[pinned][titlechanged]:not([selected="true"]) {
-  background-image: linear-gradient(rgba(148,205,253,.2), rgba(148,205,253,.2)) !important;
-}
-
-@TABSONBOTTOM_TAB_STACK@ > .tab-background > .tab-background-middle[pinned][titlechanged]:not([selected="true"]) {
-  background-image: radial-gradient(circle farthest-corner at 50% 99%, rgba(254,254,255,1) 3%, rgba(210,235,255,.9) 12%, rgba(148,205,253,.6) 30%, rgba(148,205,253,.2) 70%);
-}
-
-@TABSONTOP_TAB_STACK@ > .tab-background > .tab-background-middle[pinned][titlechanged]:not([selected="true"]) {
-  background-image: radial-gradient(circle farthest-corner at 50% 2px, rgba(254,254,255,1) 3%, rgba(210,235,255,.9) 12%, rgba(148,205,253,.6) 30%, rgba(148,205,253,.2) 70%);
-}
-
-.tabbrowser-tab > .tab-stack > .tab-background > .tab-background-start:-moz-lwtheme-brighttext:not([selected="true"]),
-.tabbrowser-tab > .tab-stack > .tab-background > .tab-background-middle:-moz-lwtheme-brighttext:not([selected="true"]),
-.tabbrowser-tab > .tab-stack > .tab-background > .tab-background-end:-moz-lwtheme-brighttext:not([selected="true"]) {
-  background-image: linear-gradient(hsla(0,0%,40%,.6), hsla(0,0%,30%,.6) 50%);
-}
-
-.tabbrowser-tab > .tab-stack > .tab-background > .tab-background-start:-moz-lwtheme-darktext:not([selected="true"]),
-.tabbrowser-tab > .tab-stack > .tab-background > .tab-background-middle:-moz-lwtheme-darktext:not([selected="true"]),
-.tabbrowser-tab > .tab-stack > .tab-background > .tab-background-end:-moz-lwtheme-darktext:not([selected="true"]) {
-  background-image: linear-gradient(hsla(0,0%,60%,.5), hsla(0,0%,45%,.5) 50%);
-}
-
-@TABSONTOP_TAB_STACK@ > .tab-content,
-@TABSONTOP_NEWTAB_BUTTON@ > .toolbarbutton-icon {
-  border-image: url(chrome://browser/skin/tabbrowser/tab-top-normal-active.png) 0 11 fill repeat stretch;
-}
-
-@TABSONTOP_TAB@:hover > .tab-stack > .tab-content:not([selected="true"]),
-@TABSONTOP_NEWTAB_BUTTON@:hover > .toolbarbutton-icon {
-  border-image: url(chrome://browser/skin/tabbrowser/tab-top-hover-active.png) 0 11 fill repeat stretch;
-}
-
-@TABSONTOP_TAB_STACK@ > .tab-content[selected="true"] {
-  border-image: url(chrome://browser/skin/tabbrowser/tab-top-selected-active.png) 0 11 fill repeat stretch;
-}
-
-@TABSONBOTTOM_TAB_STACK@ > .tab-content,
-@TABSONBOTTOM_NEWTAB_BUTTON@ > .toolbarbutton-icon {
-  border-image: url(chrome://browser/skin/tabbrowser/tab-bottom-normal-active.png) 0 11 fill repeat stretch;
-}
-
-@media (min-resolution: 2dppx) {
-  @TABSONTOP_TAB_STACK@ > .tab-content,
-  @TABSONTOP_NEWTAB_BUTTON@ > .toolbarbutton-icon {
-    border-image: url(chrome://browser/skin/tabbrowser/tab-top-normal-active@2x.png) 0 22 fill repeat stretch;
-  }
-
-  @TABSONTOP_TAB@:hover > .tab-stack > .tab-content:not([selected="true"]),
-  @TABSONTOP_NEWTAB_BUTTON@:hover > .toolbarbutton-icon {
-    border-image: url(chrome://browser/skin/tabbrowser/tab-top-hover-active@2x.png) 0 22 fill repeat stretch;
-  }
-
-  @TABSONTOP_TAB_STACK@ > .tab-content[selected="true"] {
-    border-image: url(chrome://browser/skin/tabbrowser/tab-top-selected-active@2x.png) 0 22 fill repeat stretch;
-  }
-}
-
-@TABSONBOTTOM_TAB@:hover > .tab-stack > .tab-content:not([selected="true"]),
-@TABSONBOTTOM_NEWTAB_BUTTON@:hover > .toolbarbutton-icon {
-  border-image: url(chrome://browser/skin/tabbrowser/tab-bottom-hover-active.png) 0 11 fill repeat stretch;
-}
-
-@TABSONBOTTOM_TAB_STACK@ > .tab-content[selected="true"] {
-  border-image: url(chrome://browser/skin/tabbrowser/tab-bottom-selected-active.png) 0 11 fill repeat stretch;
-}
-
-/* preloading hack */
-#TabsToolbar::after {
-  content: '';
-  display: block;
-  background-image:
-    url(chrome://browser/skin/tabbrowser/tab-top-normal-active.png),
-    url(chrome://browser/skin/tabbrowser/tab-top-hover-active.png),
-    url(chrome://browser/skin/tabbrowser/tab-top-selected-active.png),
-    url(chrome://browser/skin/tabbrowser/tab-bottom-normal-active.png),
-    url(chrome://browser/skin/tabbrowser/tab-bottom-hover-active.png),
-    url(chrome://browser/skin/tabbrowser/tab-bottom-selected-active.png),
-    url(chrome://browser/skin/tabbrowser/tabbar-top-bg-active.png),
-    url(chrome://browser/skin/tabbrowser/tabbar-top-bg-inactive.png),
-    url(chrome://browser/skin/tabbrowser/tabbar-bottom-bg-active.png),
-    url(chrome://browser/skin/tabbrowser/tabbar-bottom-bg-inactive.png);
-}
-
-@media (min-resolution: 2dppx) {
-  #TabsToolbar::after {
-    content: '';
-    display: block;
-    background-image:
-      url(chrome://browser/skin/tabbrowser/tab-top-normal-active@2x.png),
-      url(chrome://browser/skin/tabbrowser/tab-top-hover-active@2x.png),
-      url(chrome://browser/skin/tabbrowser/tab-top-selected-active@2x.png),
-      url(chrome://browser/skin/tabbrowser/tab-bottom-normal-active.png),
-      url(chrome://browser/skin/tabbrowser/tab-bottom-hover-active.png),
-      url(chrome://browser/skin/tabbrowser/tab-bottom-selected-active.png),
-      url(chrome://browser/skin/tabbrowser/tabbar-top-bg-active.png),
-      url(chrome://browser/skin/tabbrowser/tabbar-top-bg-inactive.png),
-      url(chrome://browser/skin/tabbrowser/tabbar-bottom-bg-active.png),
-      url(chrome://browser/skin/tabbrowser/tabbar-bottom-bg-inactive.png);
-  }
-}
-
 .tabbrowser-tab:focus > .tab-stack {
   box-shadow: @focusRingShadow@;
 }
 
-.tabbrowser-tab:not([selected="true"]):not(:hover):not(:-moz-lwtheme) {
-  color: #222;
-}
-
-.tabbrowser-tab[selected="true"] {
-  color: #000;
-  z-index: 1;
-  position: relative;
-}
-
 .tabbrowser-tab:-moz-lwtheme {
   color: inherit;
   text-shadow: inherit;
@@ -2449,13 +2276,12 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   content: '';
   display: block;
   -moz-appearance: toolbar;
-  height: 25px;
-  margin-bottom: -25px;
+  height: calc(@tabHeight@ + 1px);
+  margin-bottom: calc(-1px - @tabHeight@);
 }
 
 #TabsToolbar {
   -moz-appearance: none;
-  height: 26px;
   background-repeat: repeat-x;
 }
 
@@ -2464,59 +2290,34 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   padding-top: 2px;
 }
 
-/* For tabs-on-top, only fill the bottom 2px with the chrome background
- * color, so that the borders in tabbar-top-bg-*.png can mix with it.
- * In the top 24px the unified toolbar (from the ::before above) will show.
+/*
+ * Draw the bottom border of the tabstrip above ::before
  */
 #TabsToolbar[tabsontop="true"]:not(:-moz-lwtheme) {
-  padding-bottom: 2px;
-  background: url(chrome://browser/skin/tabbrowser/tabbar-top-bg-active.png),
-              linear-gradient(to top, -moz-mac-chrome-active 2px, transparent 2px);
-}
-
-#TabsToolbar[tabsontop="true"]:not(:-moz-lwtheme):-moz-window-inactive {
-  background: url(chrome://browser/skin/tabbrowser/tabbar-top-bg-inactive.png),
-              linear-gradient(to top, -moz-mac-chrome-inactive 2px, transparent 2px);
+  background: linear-gradient(to top, hsla(0,0%,0%,.3), hsla(0,0%,0%,.3) 1px, transparent 1px);
 }
 
 /* In tabs-on-bottom mode, fill the whole toolbar with the chrome
  * background color.
  */
 #TabsToolbar[tabsontop="false"]:not(:-moz-lwtheme) {
-  background: url(chrome://browser/skin/tabbrowser/tabbar-bottom-bg-active.png) -moz-mac-chrome-active;
+  background: -moz-mac-chrome-active;
 }
 
 #TabsToolbar[tabsontop="false"]:not(:-moz-lwtheme):-moz-window-inactive {
-  background: url(chrome://browser/skin/tabbrowser/tabbar-bottom-bg-inactive.png) -moz-mac-chrome-inactive;
+  background: -moz-mac-chrome-inactive;
 }
 
 #tabbrowser-tabs {
   -moz-box-align: stretch;
-  height: 26px;
-}
-
-#tabbrowser-tabs[tabsontop="true"] > .tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox:not(:-moz-lwtheme) {
-  margin-bottom: -2px;
-}
-
-#tabbrowser-tabs[tabsontop="false"] > .tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox {
-  margin-top: -2px;
 }
 
 @TABSONTOP_NEWTAB_BUTTON@ > .toolbarbutton-icon {
-  padding: 4px 0 2px;
-}
-
-@TABSONTOP_TAB_STACK@ > .tab-content {
-  padding-top: 2px;
+  padding: 6px 0 4px;
 }
 
 @TABSONBOTTOM_NEWTAB_BUTTON@ > .toolbarbutton-icon {
-  padding: 2px 0 4px;
-}
-
-@TABSONBOTTOM_TAB_STACK@ > .tab-content {
-  padding-bottom: 2px;
+  padding: 4px 0 6px;
 }
 
 /**
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index 3eb3b2cacd16..6d54e9a0895d 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -176,23 +176,20 @@ browser.jar:
   skin/classic/browser/tabbrowser/connecting@2x.png                      (tabbrowser/connecting@2x.png)
   skin/classic/browser/tabbrowser/loading.png                            (tabbrowser/loading.png)
   skin/classic/browser/tabbrowser/loading@2x.png                         (tabbrowser/loading@2x.png)
+  skin/classic/browser/tabbrowser/tab-active-middle.png                  (tabbrowser/tab-active-middle.png)
   skin/classic/browser/tabbrowser/tab-arrow-left.png                     (tabbrowser/tab-arrow-left.png)
   skin/classic/browser/tabbrowser/tab-arrow-left@2x.png                  (tabbrowser/tab-arrow-left@2x.png)
   skin/classic/browser/tabbrowser/tab-arrow-right.png                    (tabbrowser/tab-arrow-right.png)
   skin/classic/browser/tabbrowser/tab-arrow-right@2x.png                 (tabbrowser/tab-arrow-right@2x.png)
+  skin/classic/browser/tabbrowser/tab-background-end.png                 (tabbrowser/tab-background-end.png)
+  skin/classic/browser/tabbrowser/tab-background-middle.png              (tabbrowser/tab-background-middle.png)
+  skin/classic/browser/tabbrowser/tab-background-start.png               (tabbrowser/tab-background-start.png)
+  skin/classic/browser/tabbrowser/tab-stroke-end.png                     (tabbrowser/tab-stroke-end.png)
+  skin/classic/browser/tabbrowser/tab-stroke-start.png                   (tabbrowser/tab-stroke-start.png)
   skin/classic/browser/tabbrowser/tabbar-bottom-bg-active.png            (tabbrowser/tabbar-bottom-bg-active.png)
   skin/classic/browser/tabbrowser/tabbar-bottom-bg-inactive.png          (tabbrowser/tabbar-bottom-bg-inactive.png)
-  skin/classic/browser/tabbrowser/tab-bottom-normal-active.png           (tabbrowser/tab-bottom-normal-active.png)
-  skin/classic/browser/tabbrowser/tab-bottom-hover-active.png            (tabbrowser/tab-bottom-hover-active.png)
-  skin/classic/browser/tabbrowser/tab-bottom-selected-active.png         (tabbrowser/tab-bottom-selected-active.png)
   skin/classic/browser/tabbrowser/tabbar-top-bg-active.png               (tabbrowser/tabbar-top-bg-active.png)
   skin/classic/browser/tabbrowser/tabbar-top-bg-inactive.png             (tabbrowser/tabbar-top-bg-inactive.png)
-  skin/classic/browser/tabbrowser/tab-top-normal-active.png              (tabbrowser/tab-top-normal-active.png)
-  skin/classic/browser/tabbrowser/tab-top-normal-active@2x.png           (tabbrowser/tab-top-normal-active@2x.png)
-  skin/classic/browser/tabbrowser/tab-top-hover-active.png               (tabbrowser/tab-top-hover-active.png)
-  skin/classic/browser/tabbrowser/tab-top-hover-active@2x.png            (tabbrowser/tab-top-hover-active@2x.png)
-  skin/classic/browser/tabbrowser/tab-top-selected-active.png            (tabbrowser/tab-top-selected-active.png)
-  skin/classic/browser/tabbrowser/tab-top-selected-active@2x.png         (tabbrowser/tab-top-selected-active@2x.png)
   skin/classic/browser/tabbrowser/tab-overflow-border.png                (tabbrowser/tab-overflow-border.png)
   skin/classic/browser/tabbrowser/tabDragIndicator.png                   (tabbrowser/tabDragIndicator.png)
   skin/classic/browser/tabbrowser/tabDragIndicator@2x.png                (tabbrowser/tabDragIndicator.png)
@@ -311,6 +308,7 @@ browser.jar:
   skin/classic/browser/keyhole-circle@2x.png                (keyhole-circle-lion@2x.png)
   skin/classic/browser/lion/Toolbar.png                     (Toolbar-lion.png)
   skin/classic/browser/Toolbar@2x.png                       (Toolbar-lion@2x.png)
+  skin/classic/browser/Toolbar-background-noise.png         (Toolbar-background-noise.png)
   skin/classic/browser/lion/toolbarbutton-dropmarker.png    (toolbarbutton-dropmarker-lion.png)
   skin/classic/browser/toolbarbutton-dropmarker@2x.png      (toolbarbutton-dropmarker-lion@2x.png)
   skin/classic/browser/lion/tabbrowser/alltabs-box-bkgnd-icon.png      (tabbrowser/alltabs-box-bkgnd-icon-lion.png)
diff --git a/browser/themes/osx/tabbrowser/tab-active-middle.png b/browser/themes/osx/tabbrowser/tab-active-middle.png
new file mode 100644
index 0000000000000000000000000000000000000000..7872d03678032661cced28b941f1fbd353019707
GIT binary patch
literal 227
zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol}0V0ox?vVykk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5XT0LDHLo_B{4UFbHpulmt?oHP2_wSbbd7QFpXP5AN%<Q$1
z>A=KA-|NyGvfrL+FmyZFu&Hytfld(H<m%q2>~)57d$ex1x5Y(lxNvmsT-hCM7B4@`
z&trKhRmN8+o0RRTa;5LQ^^MzX1-(}t`uO)gDLI!gb!)}W)lzHtj{Oq5eqrA#Q8l3+
Z>4mxm7tMYeO#nKG!PC{xWt~$(699F7SXlr7

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/tabbrowser/tab-background-end.png b/browser/themes/osx/tabbrowser/tab-background-end.png
new file mode 100644
index 0000000000000000000000000000000000000000..9374cbda64b64563200cb6b8488ef3495781375b
GIT binary patch
literal 677
zcmV;W0$TlvP)<h;3K|Lk000e1NJLTq0015U0018d1^@s6@N9ht0007PNkl<Zc-p<!
z&1xD^7{+lE$2!_72`SR1P%6?&KWHh9X*9+d<40mlQng7M0<EQ8xEF;8-h(@@z>Qlk
zz*Rueg=;ri1XOe(Sp-26)8~aVAfW{3%(TMqU5N1K9Ovka1}`Hcf*y1rz$`OEZf<Tg
zYNFRC_yF(VB`m@t5J3l8m{mJYBiZlwf1aP8f3H+3hq+uXU^bf_2-(2`A_!`)UUPkY
zy$ex@!!h3cadma|yH=|m9~~We5qbr4@Bp-G#c4$TVh;{SqtUN&xg1+qSXf5vIg1NY
zd^{d&cu{!g9ufG~?RFDOOG~SWy<qX#e;t<MF^b#mc8Wg*ozggk!&8bjo6Qq;^&3G@
z8s44~#ShZybWrh@v+$M-;ZCP>VltVW2tEWsNjM}^G?hw)5PZhHY8DR4w0(AVcEG-C
zQAs!;Q*byOex0A6cOz&5fj8{u5J@JJwB3u+(c%ejatIZR#V_plT+g%JG<+QVjYcDe
z*hdgS%M;$<;JduMq!qis$Q$-@+IBb`n+QGz9Zz_jQy`no?jUI8InOjaoP4EHX`lBz
z(^%uQ-fFcdyu$N6({OX5_?E}x2_k5b`&UV0RRM24pQly7mV2ydxD;^rdc8eS6nzMq
z<*b^9Q=yI1)6)oIZ@~cCY2upO+uId|T!X=2-)gl=HwgO4IKgK$chUH)g0*V38poFV
z*||1MJ`6B35-Gf_6pMT7^?KZ5vCzujfC&tszxzZ&DC|(lGI%a7E@GKXW={}=00QsX
z_CJ}pLDZ@pmN+5QZnxuwLLr(+BzAGu!#10ZF1|VG8u<TVcHaL0pr1FohJ36x00000
LNkvXXu0mjfU3W3*

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/tabbrowser/tab-background-middle.png b/browser/themes/osx/tabbrowser/tab-background-middle.png
new file mode 100644
index 0000000000000000000000000000000000000000..060a3afa4abd9a732e2da16ecb57d0b4df0c851d
GIT binary patch
literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol}0V0ox?vVykk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5XtUX;ELp07OCnh93NIJk2(GVfL`pEtL^}ZXt{`~*{Uowo-
z&F$F#9d8b39(35$w@}3~Y(mekIb0{%wHX)|>dUV;d=$P4Xbgj=tDnm{r-UW|Vtq7`

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/tabbrowser/tab-background-start.png b/browser/themes/osx/tabbrowser/tab-background-start.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b0c62ca637166ead5fbdac5e054e69dab18e7f9
GIT binary patch
literal 657
zcmV;C0&e|@P)<h;3K|Lk000e1NJLTq0015U0018d1^@s6@N9ht00075Nkl<Zc-p<z
zO=}uK9LI4R*SbxsL@d&#P!wsUjkJ_%8ckwt;zJ%ankF^`T1$KIE(R2Q58iwQUcCAO
zJOvDT@a)AyKt&JYK?G6LpYRtGA>ht#Dts=>?0k1-9aJ_P4kd-pBeFm^P=FG6SR9i)
zN-;Ubcz6cO@CMBA5k5b}Dme=3z@%2It;uB4ozLe_tJUhyR;%?J_e7+O%Hc6A!P`(M
z<h;7NI_q}3e=+XYU@$m?V+g>ZY&06Nx*g>x`dX{iuI6&NV87r0gWxIn;9!;%;RTB7
zEf&jqqtOUs;vW>)zmF7A1-vwwOp|DE5`D-p2a8}Xm&@mvFaUe=kYtNvv6u&wozSGa
z^ANk*rz(}oR<GC3DY`Q+v8#O*jYhq+#a<!Agn2MuUS6Ki_IZR5v&|}vMzhiD^}f?&
zZXsC0lOwboiA20~bX-EQZnF|hnM~%0-r2TLEMYnD@TpWP1##U4TSBph7s1}?bdG4E
zZ$hzz74Y0@wQl3uE;w1Ro?k;Ek=Vy|H+*Hme15apte>{o!GiVuu2m`(KRx{>3znZi
zox|bq;Q9_tvcZDo7`;oSQhxf9tg{ljS~bt}Tg_(EM^A2NHE&c7Phce;j~~!kw22|R
zxw)A|!8=hU=nV#gr`>M*F~$ySV$6gnHVrChr3P%Vt57H$WBew35o;Q~8&gtH1@Cn_
zou^nVj-yVxaaAk|BRKuz_5$?qf#W#$#l?m1`uaME!4A5~Dh1iCcerFU8dq>e_rl@u
rVLF`-)M~ZyD!pK13d|Aa|9AKw@hUgEwE0yI00000NkvXXu0mjfafUN!

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/tabbrowser/tab-bottom-hover-active.png b/browser/themes/osx/tabbrowser/tab-bottom-hover-active.png
deleted file mode 100644
index a5fdaba4bb0f223984253e0839b70b9f81f0e7f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 422
zcmV;X0a^ZuP)<h;3K|Lk000e1NJLTq000{R000^Y1^@s6Mu;cy0004PNkl<ZNQvFn
zy=%fi9LDi4zO-t!wdl}MS}QtKmkxr1OL24%L23~ZL`4z*|LN(FUrH*z<Z_*Q@JzXT
zKHMcH!haumpay&bV@V}RHII~lvGvug|7WCt8=wq)0ev3~=vz<OdQ-<(1}Fe+U@57d
zG{Dk&3fB7z3&9-l1RNwiCk=40p4=%YdX$wv!YZeZ@ECgp_MXSMx1Lzo&J)|YU|UJA
zNds(Mu#G3SalzJ}*xChKd15OUZ0U(DU9g3um!ts}u9(lxoUpkkHjjg43EtE*NsXid
zX4aF9gH3H=k~c^Ln8v{}z&$Vt7bZv@m{`xr&r1}$1BQ|^lA4ZCQ&I*PTF+T51aE;Z
z(3RAY^d_lw1!>v5PPo>3&O*`MRe=wnCn+zfEva`QZAp2cXX~ohb`=G~2jv|Y*s+WV
z{=^(-WY-5a|Kfvj3QGZLg3o%9;ATG%{C1A>VAqQ_KOO0C8sVaBj9dl20rjltj$1U9
QkN^Mx07*qoM6N<$f_?C{YXATM

diff --git a/browser/themes/osx/tabbrowser/tab-bottom-normal-active.png b/browser/themes/osx/tabbrowser/tab-bottom-normal-active.png
deleted file mode 100644
index 1a0dceea376d576199d3c6d4bcf8ac974104c4c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 405
zcmV;G0c!q<P)<h;3K|Lk000e1NJLTq000{R000^Y1^@s6Mu;cy00048Nkl<ZNQvFm
zy=%fy6vp8n(bUiS)u06t+zXvLbarr5kb=}AB8rM4`u{JdLrzL+Ly~*1Qv>fHx#xYz
zO=94`9~EE-d;%MwA|j8r(Y}rL4fXfW;Q<do3-|)2BGRx8Fx8%x_IkHi5vT&Mz*$7v
zwgJxCQ`O#ISOk`VXW%L#P1^uh?I|Zg@vVFUE{@nmd;V<UE!Mu%Hn#I(Cr9jLf*l>P
zqX~9!#11Cd-VxiIU^_=_XM$}Vv8@TV7Lkr^fVC+W*v1rFIby3km{0gmy>!Hu+T-WJ
z7CLBi&jMhP2P*;%U>*%xqyx;gC-L(V$7;X?sEJ6|5bDO~)369E0q?*_L<S<#7m;2D
z($jSVV5IY<G$?*`0Wj8-wCE)zeJzh>f~>2GgVBTXro$6p27DxBrsv1HKJ~#!!aSfr
z_*t(L-s~pfyK|eSp0DfrLaf8+h=%+e$ppRuoT|Y29U1&t00000NkvXXu0mjfoZz;9

diff --git a/browser/themes/osx/tabbrowser/tab-bottom-selected-active.png b/browser/themes/osx/tabbrowser/tab-bottom-selected-active.png
deleted file mode 100644
index 0596cb28dd471f83629de71d56cfd8b348e4d9c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 487
zcmV<D0T}*?P)<h;3K|Lk000e1NJLTq000{R000^Y1^@s6Mu;cy00055Nkl<ZNQuRk
z-%Daa7=|CTEc<1FZRH|aLL@Fi5M9-kNbUXy?NudeMG`Fg|G!<#Yq^T2bLIp)@Z5d#
zKFrL=%pmF9oJnd*D)9wFQptH|69+&Mr~yBKs-${ep+$9I-?=q=K++OW0WN@%q;gJK
z85lXQ;{5kf09Ju5pa)#$k$Ha4d8^L<M>bjADe#z6_UN37bLV6wV3V-F!<@3Ab2gn@
zm@QZW)`13aC#e_<aOa$L=gy7)CVO!EMgcrzk@Y2&V*&bEWCKYXu>ga#vO{1fX)6{&
zHy);yjU?^FLbyFr$&P?0N!3_@C+DP=?ZuK+_AIFu3-Fvp_9Cef3-FRw)&#~14__3(
z*g2`XaV)7N=_G=dWuJCq8K_&<wlFJg%j(WsC|e;s<$bqt$I`TP-1>dztSpihfMsAC
z_yycbx{-9H@L}mBaPGPr;MViEoj3QE&2HrZ;eNaK3cHeiC(u>6IR@q+X$z-UHxcdv
zKM8NsEAR*SyMR~MT?5rA(ZW?t3yXYwfW8q9y8#@V<_zCmH~HWc(}-rJ%Y;K-12z&^
db6w&Yy#bfDTDje}t0n*d002ovPDHLkV1oTh+T;KL

diff --git a/browser/themes/osx/tabbrowser/tab-stroke-end.png b/browser/themes/osx/tabbrowser/tab-stroke-end.png
new file mode 100755
index 0000000000000000000000000000000000000000..3efb44726fa16622366738ffbcba296ad0277298
GIT binary patch
literal 932
zcmeAS@N?(olHy`uVBq!ia0vp^azHH4!3-piZ|XG#Qj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07#QONd_r7-ikV=5k&zL|#1sLFBLgQVC!m_opFaahG?1B@
zi7bLu4YC3>HWwF{sHmujhzO7&BO?RUE-Nc5C@83;q-1AjXJKLC=;+wp-R<M!lb4s*
z(9qD)(b3h_HDkt%Ns}gh`t)fg7_3;aV#kghd-m-4@ZrPGojdpK+jr{JsjFA7o<D#7
z+O=!fuU`kUf#A`jN6*0E#fujY9z1ya_U%(Jcm)REzkmPo<;(BizhAz52^4t!`t_SP
zZ-8pvy?gim{d=IvA3uHs+6Z(ZP}$e7U%!3(2GsK7$B&;sfByRQ3#jqWpFe;9{(Y7*
zsU7Iagpwe?U<O7eW)>D!RyKAH4o+S^egOe7F>wh=X<2!B1w~~QRUKVDeFGCya~oSH
zH!mOGprGKeu<(eegv7M8oZRx(o}Ru*Qx_~;vw8c@-Fpw8I(_l_&Aay>KYRA#_4|*X
zzkdJy&u@z#2QXUmJzX3_G|rb!%JzHgAkeb<w%JBmr#UPI6J#SQJu5U7-rh@mUoSsn
z)!&CKKaXaZ%nCev{p#H;|I0UZI`5n{*!bsy$?mf{oy$u9fB*OEPtlI}BWc3&F;~|w
z-+%o1cB_6K<-3dy+uPIr@916jqAd5`w@}I6L%)A6+NIY$v2K~_+gDrvdocf~4d*-k
z`og2LTHEGlh8(@hQ11ET*>rFD%T0dklV<u<J}wc7yyw49*oR@$o$9%zrDsm+$X0FV
zauA$x{P3CE8=4L_T)o=bpTU(Rtv2`jUQWS9A}XFY_e`JNottLjaOmlp^nZV^D@bmM
zTWYsJ_2ZU>dtPkYyVhF5|LNx{+47R*9SMv|nwP|0Z!(^oS2RO1g>A-)+?}0&ZLaVs
zdvXdm3V+Tmo$QjA$Mz$<fv17Vh2z}qUAK;TiX7$J;mD;Zz_EyF-<Qg}Z{*)k+bL6^
z!7)LDVSx&FWN}U9EPbAWLp)-PEIfY9zVlzc`|<Jl-^9=I5qeKA{Je4KHz+N8y85}S
Ib4q9e0Gz>};{X5v

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/tabbrowser/tab-stroke-start.png b/browser/themes/osx/tabbrowser/tab-stroke-start.png
new file mode 100755
index 0000000000000000000000000000000000000000..8e0cd509f524a09b26556f5c3f1dd2eb215824bd
GIT binary patch
literal 903
zcmeAS@N?(olHy`uVBq!ia0vp^azHH4!3-piZ|XG#Qj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07#QONd_r7-ikV=5k&zL|#1sLFBLgQVC!m_opFaahG?1B@
zi7bLu4YC3>HWwF{sHmujhzO7&BO?RUE-Nc5C@83;q-1AjXJKLC=;+wp-R<M!lb4s*
z(9qD)(b3h_HDkt%Ns}gh`t)fg7_3;aV#kghd-m-4@ZrPGojdpK+jr{JsjFA7o<D#7
z+O=!fuU`kUf#A`jN6*0E#fujY9z1ya_U%(Jcm)REzkmPo<;(BizhAz52^4t!`t_SP
zZ-8pvy?gim{d=IvA3uHs+6Z(ZP}$e7U%!3(2GsK7$B&;sfByRQ3#jqWpFe;9{(Y7*
zsU7Iagpwe?U<O7eW)>D!RyKAH4o+S^egOe7F>wh=X<2!B1w~~QRUKVDeFGCya~oSH
zH!mOGprGKeu<(eegv7M8oZRx(o}Ru*Qx_~;vw8c@-Fpw8I(_l_&Aay>KYRA#_4|*X
zzkdJy&u@z#2QXTLJY5_^G|rb!jt)L#AktFqFD1gw6r@wmBBNn!q4od&e8oulTTHE!
z+I=Rye>3m2Psc1*0TbqfR$jAqUZ0kJ#7cAV4*Bno)a_GwOV7W5oM$dtknguEandqR
z$r|^|FKg7UBwZ?fe)?zVDy?lVl%pRqs@=^fz2KbFdp50!eMU+CO?|oK{U@e9pPjeS
zw0w75o!I*;&#G?v>#a6a|C_OUuVf*s{^rb|M{du&{O5T&|014K+N&R|*l8a#W&5*d
zlkTotFeM^%a^1Grm{~%aVL|J^*ETvl*t>IQ#s5%?=|?|%$@H47o+Q#R{mi<JXQQTN
zr>d9VHBYSD6XmSL;xvVIp6v;Znd{?Q7G(suD4e!`IO$`GK*B+$l}aoua~S(Ftt98@
z1WaHRYLIX_p#AObHG|CmPk%B5{p4fn-Ldmc$!&M1)Pt4DN;mU)t$JJgCRht9DY7(s
bihSW;GbN@ys-(&Slw3Vs{an^LB{Ts5WfFx7

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/tabbrowser/tab-top-hover-active.png b/browser/themes/osx/tabbrowser/tab-top-hover-active.png
deleted file mode 100644
index f41b253d0bce22c49f06bba7bdf1934813ff3562..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 466
zcmV;@0WJQCP)<h;3K|Lk000e1NJLTq000{R000^Y1^@s6Mu;cy0004*Nkl<ZNQu3b
zT}uK%7=@oUQ&}bYkS+{LEkp#9pz_))5s5B>GEme0|9?1L_%3d;AF~cLaISXdJe>2+
zGLXEE_H+!CGIX49#%aX?CqNYlff`UxP|dzqZGRl>1S*+H3+Mxnz!UJCpeOs@xBWFc
zp9_o<)$MQ(K+;gsI734_-?MY|Si;OyWuOc6Bt1y#OS+TP%FvzddoW<vd{Wazsj9#W
zP?FS<bX!0jt8ipKsp;ag8cVu1SW(>q<GtCX!cKvSq<cy219T5e%*P2f%b8K8fSD`o
z40!W|y_rug>;iZ%crpG6csHL^SP)D0ap1h#lG?yWELo5SD+A}i+_T2H`IPfu7r;W>
zAN3#s3-if^T>?vo|0z|#(tMm?E6<s&ion*MGg}vdeS6mU?E<R+4NK-z<Jx>GF0dcZ
z+xP=qrNIJr&r1{7c-FW9uGu{^K@uzk2EdnRji2Td?!$uE<!At}z{s=4k@+-Ymn4W_
zA#ejs*}i3=q#F-~Y~Qr0`GyfJs;_C$kyP@PwKg!{sLuaeza+5;BST<b1^@s607*qo
IM6N<$g3(jcA^-pY

diff --git a/browser/themes/osx/tabbrowser/tab-top-hover-active@2x.png b/browser/themes/osx/tabbrowser/tab-top-hover-active@2x.png
deleted file mode 100644
index a8215a283d57a01334bd53c4a864ad373cfc4cd8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 891
zcmV->1BCpEP)<h;3K|Lk000e1NJLTq001@s001-y1^@s6!Hvt-0009*Nkl<ZXx{Bw
z(M}ps5Z!xsy9icEL1PRL7L&H|0r&@FjQFSzeuS?+@Bt=%gP*_?KhlIi`qYxP35J?h
z5~D`j7<W6z%q9Z?VPV-#=}vO8T*A&dvom*gmwUDAy2d<08^V-QejrT?m=i+!kT$j^
zX+43BX^PLo(Ii-mR|K1nlfXOI^Jn&P`7-S@ASK8=0T7g6EHIKj;hpFCv4wx##~o;3
zO8njw0j(0=61E6Mfr3xSbGO*%stC{&T2;^)lR+&K-V^eKEMM(O%6bsT0{hG}$KrtC
z0trl(ADk}}J`i57tgNWBvoovNY}(y!cY(UmRDciof=~Dc2Xifpz{V;`?W0-1af+~s
zD|m2lV6|GUM5R)(3Wb8sWHM8y3qIfrKH(c2oUKjfHpguy+DEoPuz}8XczCF*)vA?F
zryUw!6Mhidgzr<L&AzVT8yw)`Zn-g_nFNxtH-sgW$octs!m_Lf8eec=e+W+j%&{l-
z1)mq-02i0#5^K;wmLf_ZjluEpv6anc@95(t3vp)z_`U=eI9W?t+}{E#MNDM1x3`D!
zl@Xp@F{jr|0xd<wH%=p;&)?F)2{AB-IStkjcvpPBQnqd18zCEW_UH(r6nih9<2=rA
zUJV3uj?^~kBh@opyc2|M%<1cSQ5$n=abU7CBErny$D*>CypPRwDax)GD*C!&T#9ii
zGNS5=amM1n;;tBX#kdqhDaE<JkIn5Io4ePRxD@}jQjEJ|T#6BwVvn;3OL3^CIAf!-
z7O_qJPp~p3*oF{d=3dk_&Z303Osf)!gh6n^o@3wyH|vqhwZ1YY7yIN+0V9{oImu))
z^hF79f}4kO2f@%qKs_Q;CSx66Zf|ctMim&idAKfg4b7Y$GBIV=-VrjXRLVFxIk}5!
zVu2ePpoKN{XG;wY%w^*`#_pJ+m#x#&)BClxwYyHIqoV-0p+RJ=$Qmu7`{h!k-(X7u
zQvZvt(k<<jdD!3If2!B(zZ;E)9R<J*4bTEj&<2gHb^NYKCtMM})M~YF<#M^(ZnuAu
zxi>dAW)uK7G(Zb9K^rtqe1qQI-ThiBl|Jt5?0h;pI{F+XpaEK->A!ut{|kuaLIcUb
R+(7^U002ovPDHLkV1gobpZWj*

diff --git a/browser/themes/osx/tabbrowser/tab-top-normal-active.png b/browser/themes/osx/tabbrowser/tab-top-normal-active.png
deleted file mode 100644
index 5987a2fe32d7e26d7b0ae3f80625e69ae9b7d45f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 520
zcmV+j0{8uiP)<h;3K|Lk000e1NJLTq000{R000^Y1^@s6Mu;cy0005cNkl<Zc-p;{
z&q@MO7{$x6@o%N0NhMgT7K%n-h09hI5iWvqktX&GK8Nq%L-+!MAPBC+r5kZ2x^ivj
zz$b~#=*%5R__?{?IlsC04$R(ix%>lu`x|J$y9I4CW7caal7a)^2SE@5VG}~K?w5JZ
zN@ykWO35WigBy?sw<hFeJuUMg$%}BiOp_<hfE)<S=ktrjVv)Ck>ztGMjN~;-nTUuE
zt{9xnW~u3Pnw(4~@zH1$v4ZQI<2-Yc*Ee@(wktol1Bc`BIL0!&aGp7EFFl&6Y~!vT
zI-O2{1x^_Z24Ut`cehJ+1RjUOVXWWpN1VbO^X#!Jdtp!&=IzQjTy!Zbvd50h0B^ls
z?^qS)*|SaNS=-q=F4|Cq`L&&StYkWff|5&FNqY2MG7f*@)i+dOo;`MCF;I3XE3?P0
ztm0BuaU!d>+wG_-%sY{N;T4Xn!n_@s4{*5J?RI0TFfTnmJF=QfSq&siWg=RAUe3XH
ztJOMDg?W&aK8^imvLMKUTC>?qs3OOhmA+q@h=?vn_zIpHjmDWO%u7#Pdc}c1d4d#p
z1|^WF*XyUMFb_VYFD3o($nnWtU4x@Sp<uX$Js>B&L3(&+|Hco0k8&{9QgKlL0000<
KMNUMnLSTa33GZ$I

diff --git a/browser/themes/osx/tabbrowser/tab-top-normal-active@2x.png b/browser/themes/osx/tabbrowser/tab-top-normal-active@2x.png
deleted file mode 100644
index 658b291d3940b0a53d321f54ff86e2ade53cf82f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 968
zcmV;(12_DMP)<h;3K|Lk000e1NJLTq001@s001-y1^@s6!Hvt-000AzNkl<Zc-rln
zu}<4i7=^Ko?Igs;K-$7kAyo<sv{HlALP|qI)25*<bjd3q!HC4d!aMK+?2K%PfdPaV
zcml-00t;`zLjO}8WHmyCVBdQYilq-JQuLqm+1D3EcF)bt&9mg64;>yBAT}V*Be4Oo
zVjg@X6KfOc6<om+d?Aw%pR-)fjztxUS>#s8W0^i75JDj$1052PkhA(Y+lvL6pR$-m
z9KmI1UU)5x3m=3Tp^}gp&Kl?JJhNP8TOe&Qhi5P=3<)KaQA~+hS!O%wiN(v$Wxy+;
zjNl*$KCiB>P8}Q^OkQ4ImSo2JBwz++VJ2o%u8d4(yX;~m7mM$y4A0&)0&BI}r>m<g
z%A^lwBZG3&%+9cjokXmC3Fd_orOMaW*C_B#7!_U!kq{&#;;d23Mh3DdS7L{FNhT8G
z)#A-O8%0s&;^G2VYD@@)ydpwmAPbquW(Qui<YF$j-w6y~US6J-?-miRi6Sy7Ho-1#
zQZbvCJ`kpa>dwy2WPGKx5F!)V>=3Y%om9*hLY}ee>FMbk1nLBt6q{uiKMk>r5D7JK
zc6Rnsw-_>!O(JwkD(19{ot&KX%Xj;9g3LR_oHWD+ggJ10d>rZ)LngAxKv%32vBSed
z{3Ffj1esm2M~Hm^#>AMfOl*IDA6sx%C&*MORtLt!n6E<YD=;R;d}U(0ySvzeGde-0
zO0jRim>BcBVx5Y~PY7(mzD|&-Qmg@ti7{V=*mqz|jQPsMwzs#j1$#O{rb@9UFeb))
zWnx=fTiB^wogh=C*gP;M#{8~Wr(&C%o7ky(b%IQlVn2W}G3Kif`w5JRF<+V3#>NJ=
zU`Hp&R4Mig7!zZDnqt`}D3(oAYym7SEny3`b%M;>{ItaepODyKGO_rfUrrc$Dq`%C
zV>j!uVi=g`!|g@i_ZM2N7S_F`6J#PA9ngiH+)l+T;t0ObFBCC!czAeTZe&}x7&4Jf
zu_8P9>}Y|9irG9PIj-pnhBg|F83dUC*%Yg=Q;r?&hlp8syeaTe_>H9??_i9X5<@mR
zpbI*+zd-=*6SH}lM}#s4fwi@@sq^#mk!rQtYXW4W1G<nhJNoE+zgT<}gretpb1N$=
z<)fpcx6NiV#1b$8ve5xu&<Wkxk;nhVoWFk@r>9UT^wjHhPksxH?CtFp*Vota95^ru
qI-m<Wp&L4)D-Wk#>^brL#r^;aVB9|VL(Vk-0000<MNUMnLSTZo*|tRh

diff --git a/browser/themes/osx/tabbrowser/tab-top-selected-active.png b/browser/themes/osx/tabbrowser/tab-top-selected-active.png
deleted file mode 100644
index 930e76588fed21ab53cd454f1e7f0d82989b814b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 611
zcmV-p0-XJcP)<h;3K|Lk000e1NJLTq000{R000^Y1^@s6Mu;cy00009a7bBm000XU
z000XU0RWnu7ytkQ6-h)vR7l6Imd{SYKoG{aTc9ZZAtZW`vtEe@z4}1D0Z(8;;#1&F
z!^KzdiWeWi1dkr%Kp+@ezaig{acMwWH~D3uo%yD-J3Fn<vdjq>5%DB8R6unDmB3y#
zmYN#FM;t)_6{v#)atMyVvEhi<)uwJ9Y!z5zNC3w`cEof(2OV$?uC~k_+8@y04sU~`
z=Asxjzy<g~`aSRf2H=T2n%@K7?}<JA8fH0H`ZlA8vn;_G7((C;a}&IS*A2-1Chdpx
zuLio#XRHp4%sfR4m!C0@z$ciy&0|ix5&c?bwU)XP$Fn$`Njm}i-1u!l@`4`HKQY_l
zY=LM-TK-Z|Q#$X;l>Vxfx}XZfvn9rpg25)ix$|K)hS`bHg8z4ALH}P_<(0lOU1U)L
zZ>w-s`m9F#6zM+&vwD$MqYrwbtaq*8eknETta_xx@i}cp(=U^m-Hx?Avumr%S|+oI
zI_aih_BHceFwnPsy=)8S+1JEzM(4jWqhB?rBG-atCg`HT-l=^Q=&c3w=6`Hj&#tX%
zZr*2B)A^iPmvYXh+$EUW`=A<qSn7Hs;W<eQ7D!6}B+!lQLDu<%%TcB`PN`#cmxo%<
zL(Hd<?}&cMbJnL$Lfz&0)y(!l8{Dvu-InMgj{Xt#+SK=&;wkuo(F?dVub865q9b~u
xOZ|#;{XVz@_qfpIcgMKoGLEU!6<zB0e*i9U&Sf}`W>EkD002ovPDHLkV1gtsBtifH

diff --git a/browser/themes/osx/tabbrowser/tab-top-selected-active@2x.png b/browser/themes/osx/tabbrowser/tab-top-selected-active@2x.png
deleted file mode 100644
index 7de41e77b273e66b7578c11c96efbe054b1655fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1098
zcmV-Q1hxB#P)<h;3K|Lk000e1NJLTq001@s001-y1^@s6!Hvt-000CLNkl<ZXx{Bw
zO-LI-6yBL^^J9pyq0y9DgqA{W)rzsj(nG--C`fwrBJ|K>@tRxdwFn-1@72<K%_$Um
z@Z>=~6h)*69@9gGVinpn>HF*(9oNk!n^iZ|9r&2tVfTCAoA+jRVV*QxG%2O9fl~`L
zfKxkR%av9)PHDHe7PVSU5>y}3U@}4tVE5c1r?OK=gEz;lv!xjh(JgRELxd4_3H6@N
zr5sgG+UoHfG36A$1BXl&0AW!=OzS&bB4*(TGq=gMr0$&Oh-ovUW=)S$n8tbuLxe|!
zaYBwTL3rX46a4NtbAhv0b1=jaRO#6;EoC!n3hAIZg;`9}*aPZE2-gV-9{1Wz<^tyk
z+em7W3$d1lYfidIKNYbQjXk73-QV9IFO^Eq%H{H_{r&y7H2%&DzyU6Bf*Us2R!XI0
zvuP<CrJ&Y>xRXflW1-K^&JL}vuD;3Ta{2D=?!IU=8uuD5aDWS(;D!y@Vw;_;;h461
zQIid#CG^dL?gwCKZf@>gp-^}kiA1ml%7m|kb;1{qSZA&>xM2gf*tr4AW+J@qih_wU
z)L$7K9E{J*%)Agn?9%-PJGMutU@knO!d&3ofDPD!P1t4)QvbHK;+W8$!7TM)jAn40
zX7d+aZxMbIs%HdnZ^0I9vYsAotr<=Z%4YsBnCvnJhKGmmQn!5y(P<XjY|~&3p=SO_
zWD{wq*4e@4kV>V@Gmg}W$gxd>HJtd>YITiC%{gJ3=I%L0>i}$1ShSqVFO@z!d*>J}
zg}pjjT6Rp>kX3wetkOV}r=MVz*EOFYnvIr|V@@PhpWsSoD-rX{u~UhdQ){P)1&#%&
z_&-MMk53397Ob(0vfcZ&#)4D~A{J~O!3R3{KnD>EB6blXCfabj7iW=*!3VnCKhRb}
zzc&xzIu&hBEo2*S9*)|j8nhhG3d{LeyG2aeY1REeX^-PcCIiJKBArf${c?<L3)Ui?
zPB!6_thcpWN+57*Z;XwNCH+c8wrv<k6$Gj@!uAuO*Fqh;=7a2m>KnShffuKyrf&Kb
zF}5vOi>lf&?X=@sTGo=aoG3~UWvRbPEt1dYZ~5gIY(oRIu%@VCDNEAVp5!AMJrz}y
zGF)HLhXuK?u<$gQOn&prG1!I%-W>X%jjIThb9yQsmgA}Nx)`B@fYbSFC_%_%GLfaF
zrF=G<MJg=&xZN*91GGRBv_T`ZvgVjxCMb>LRcvTxS65eca&j_0KR<tGb93|g=;-Ke
z8ZQxk__*D}b_rUb3EH3$T8*PRuEVN1L~N1pned76ac5`eL$O$VJv}}BIFU&Fqz8+}
zzp9z4&wz#^G(j6QLMt?D`r*r>H0oE#d?&0B-V@f^z$t|_*0jPJZ7YKQ0=|nxD8hth
Q`2YX_07*qoM6N<$f{=0vr2qf`

diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
index 8f82ae7673f9..61ebf18deffd 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -8,6 +8,16 @@
 %define tabCurveWidth 30px
 %define tabCurveHalfWidth 15px
 
+/* image preloading hack */
+#TabsToolbar::after {
+  content: '';
+  display: block;
+  background-image:
+    url(chrome://browser/skin/tabbrowser/tab-background-end.png),
+    url(chrome://browser/skin/tabbrowser/tab-background-middle.png),
+    url(chrome://browser/skin/tabbrowser/tab-background-start.png);
+}
+
 .tabbrowser-tab,
 .tabs-newtab-button {
   -moz-appearance: none;

From 58712ea44cb52f893d2c2f01cf3300493f7b015d Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 1 Mar 2013 13:48:18 -0500
Subject: [PATCH 006/230] Bug 625989 - Always draw in the titlebar on OSX.
 r=josh,dao f=mstange

---
 browser/base/content/browser.js              |  6 --
 browser/base/content/browser.xul             |  1 +
 browser/themes/osx/browser.css               |  7 ++-
 toolkit/content/LightweightThemeConsumer.jsm | 22 +++++--
 widget/cocoa/nsChildView.h                   |  3 +
 widget/cocoa/nsChildView.mm                  | 22 ++++---
 widget/cocoa/nsCocoaWindow.h                 |  1 +
 widget/cocoa/nsCocoaWindow.mm                | 23 ++++++--
 widget/cocoa/nsNativeThemeCocoa.h            |  2 +
 widget/cocoa/nsNativeThemeCocoa.mm           | 60 ++++++++++++++++----
 10 files changed, 110 insertions(+), 37 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index a1c4fdf9b670..be357a9a2e6a 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -6721,12 +6721,6 @@ let gPrivateBrowsingUI = {
     document.getElementById("Tools:Sanitize").setAttribute("disabled", "true");
 
     if (window.location.href == getBrowserURL()) {
-#ifdef XP_MACOSX
-      if (!PrivateBrowsingUtils.permanentPrivateBrowsing) {
-        document.documentElement.setAttribute("drawintitlebar", true);
-      }
-#endif
-
       // Adjust the window's title
       let docElement = document.documentElement;
       if (!PrivateBrowsingUtils.permanentPrivateBrowsing) {
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index ac4b39138af7..f538a06663f9 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -32,6 +32,7 @@
         titlemodifier=""
         titlemodifier_normal=""
         titlemodifier_privatebrowsing="&mainWindow.titlePrivateBrowsingSuffix;"
+        chromemargin="0,-1,-1,-1"
 #else
         title_privatebrowsing="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@ &mainWindow.titlePrivateBrowsingSuffix;"
         titlemodifier="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@"
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 6c0ddf75cb7e..aee73ac01d85 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -40,8 +40,7 @@
   background-color: #eeeeee;
 }
 
-#titlebar-buttonbox-container,
-#main-window:not([drawintitlebar=true]) > #titlebar {
+#titlebar-buttonbox-container {
   display: none;
 }
 
@@ -49,6 +48,10 @@
   height: 22px;
 }
 
+#main-window:not(:-moz-lwtheme):not([privatebrowsingmode=temporary]) > #titlebar {
+  -moz-appearance: -moz-window-titlebar;
+}
+
 #main-window[chromehidden~="toolbar"][chromehidden~="location"][chromehidden~="directories"] {
   border-top: 1px solid rgba(0,0,0,0.65);
 }
diff --git a/toolkit/content/LightweightThemeConsumer.jsm b/toolkit/content/LightweightThemeConsumer.jsm
index 3fa4f42d3b21..608c6f0a9bbb 100644
--- a/toolkit/content/LightweightThemeConsumer.jsm
+++ b/toolkit/content/LightweightThemeConsumer.jsm
@@ -41,6 +41,9 @@ LightweightThemeConsumer.prototype = {
   _lastData: null,
   _lastScreenWidth: null,
   _lastScreenHeight: null,
+#ifdef XP_MACOSX
+  _chromemarginDefault: undefined,
+#endif
 
   observe: function (aSubject, aTopic, aData) {
     if (aTopic != "lightweight-theme-styling-update")
@@ -108,10 +111,21 @@ LightweightThemeConsumer.prototype = {
     }
 
 #ifdef XP_MACOSX
-    if (active)
-      root.setAttribute("drawintitlebar", "true");
-    else
-      root.removeAttribute("drawintitlebar");
+    // Sample whether or not we draw in the titlebar by default the first time we update.
+    // If the root has no chromemargin attribute, getAttribute will return null, and
+    // we'll remove the attribute when the lw-theme is deactivated.
+    if (this._chromemarginDefault === undefined)
+      this._chromemarginDefault = root.getAttribute("chromemargin");
+
+    if (active) {
+      root.setAttribute("chromemargin", "0,-1,-1,-1");
+    }
+    else {
+      if (this._chromemarginDefault)
+        root.setAttribute("chromemargin", this._chromemarginDefault);
+      else
+        root.removeAttribute("chromemargin");
+    }
 #endif
   }
 }
diff --git a/widget/cocoa/nsChildView.h b/widget/cocoa/nsChildView.h
index 0439b93e2afa..56a20b826757 100644
--- a/widget/cocoa/nsChildView.h
+++ b/widget/cocoa/nsChildView.h
@@ -540,6 +540,9 @@ public:
   }
 
   // unit conversion convenience functions
+  int32_t           CocoaPointsToDevPixels(CGFloat aPts) {
+    return nsCocoaUtils::CocoaPointsToDevPixels(aPts, BackingScaleFactor());
+  }
   nsIntPoint        CocoaPointsToDevPixels(const NSPoint& aPt) {
     return nsCocoaUtils::CocoaPointsToDevPixels(aPt, BackingScaleFactor());
   }
diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
index 91ccf9566c80..530c88497332 100644
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -2053,23 +2053,29 @@ nsChildView::MaybeDrawRoundedBottomCorners(GLManager* aManager, nsIntRect aRect)
 void
 nsChildView::UpdateThemeGeometries(const nsTArray<ThemeGeometry>& aThemeGeometries)
 {
-  NSWindow* win = [mView window];
-  if (!win || ![win isKindOfClass:[ToolbarWindow class]])
+  if (![mView window] || ![[mView window] isKindOfClass:[ToolbarWindow class]])
     return;
 
-  float unifiedToolbarHeight = 0;
-  nsIntRect topPixelStrip(0, 0, [win frame].size.width, 1);
+  ToolbarWindow* win = (ToolbarWindow*)[mView window];
+  bool drawsContentsIntoWindowFrame = [win drawsContentsIntoWindowFrame];
+  int32_t windowWidth = mBounds.width;
+  int32_t titlebarHeight = CocoaPointsToDevPixels([win titlebarHeight]);
+  int32_t underTitlebarPos = drawsContentsIntoWindowFrame ? titlebarHeight : 0;
+  int32_t unifiedToolbarBottom = 0;
 
   for (uint32_t i = 0; i < aThemeGeometries.Length(); ++i) {
     const ThemeGeometry& g = aThemeGeometries[i];
     if ((g.mWidgetType == NS_THEME_MOZ_MAC_UNIFIED_TOOLBAR ||
          g.mWidgetType == NS_THEME_TOOLBAR) &&
-        g.mRect.Contains(topPixelStrip)) {
-      unifiedToolbarHeight = g.mRect.YMost();
+        g.mRect.X() <= 0 &&
+        g.mRect.XMost() >= windowWidth &&
+        g.mRect.Y() <= underTitlebarPos) {
+      unifiedToolbarBottom = g.mRect.YMost();
     }
   }
-  [(ToolbarWindow*)win
-    setUnifiedToolbarHeight:DevPixelsToCocoaPoints(unifiedToolbarHeight)];
+
+  CGFloat unifiedHeight = DevPixelsToCocoaPoints(titlebarHeight + unifiedToolbarBottom - underTitlebarPos);
+  [win setUnifiedToolbarHeight:unifiedHeight];
 }
 
 NS_IMETHODIMP
diff --git a/widget/cocoa/nsCocoaWindow.h b/widget/cocoa/nsCocoaWindow.h
index fe8ade980b16..3767d9a91d8e 100644
--- a/widget/cocoa/nsCocoaWindow.h
+++ b/widget/cocoa/nsCocoaWindow.h
@@ -269,6 +269,7 @@ public:
     virtual void SetShowsToolbarButton(bool aShow);
     virtual void SetShowsFullScreenButton(bool aShow);
     virtual void SetWindowAnimationType(WindowAnimationType aType);
+    NS_IMETHOD SetNonClientMargins(nsIntMargin &margins);
     NS_IMETHOD SetWindowTitlebarColor(nscolor aColor, bool aActive);
     virtual void SetDrawsInTitlebar(bool aState);
     virtual nsresult SynthesizeNativeMouseEvent(nsIntPoint aPoint,
diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm
index 13ffabbff557..a136e71ddbb2 100644
--- a/widget/cocoa/nsCocoaWindow.mm
+++ b/widget/cocoa/nsCocoaWindow.mm
@@ -1954,6 +1954,15 @@ void nsCocoaWindow::SetWindowAnimationType(nsIWidget::WindowAnimationType aType)
   mAnimationType = aType;
 }
 
+NS_IMETHODIMP nsCocoaWindow::SetNonClientMargins(nsIntMargin &margins)
+{
+  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
+
+  SetDrawsInTitlebar(margins.top == 0);
+
+  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
+}
+
 NS_IMETHODIMP nsCocoaWindow::SetWindowTitlebarColor(nscolor aColor, bool aActive)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
@@ -2835,7 +2844,7 @@ static const NSString* kStateShowsToolbarButton = @"showsToolbarButton";
     [super setBackgroundColor:mColor];
     mBackgroundColor = [[NSColor whiteColor] retain];
 
-    mUnifiedToolbarHeight = 0.0f;
+    mUnifiedToolbarHeight = 22.0f;
 
     // setBottomCornerRounded: is a private API call, so we check to make sure
     // we respond to it just in case.
@@ -2909,6 +2918,7 @@ static const NSString* kStateShowsToolbarButton = @"showsToolbarButton";
                     [self frame].size.width, [self titlebarHeight]);
 }
 
+// Returns the unified height of titlebar + toolbar.
 - (float)unifiedToolbarHeight
 {
   return mUnifiedToolbarHeight;
@@ -2920,15 +2930,16 @@ static const NSString* kStateShowsToolbarButton = @"showsToolbarButton";
   return frameRect.size.height - [self contentRectForFrameRect:frameRect].size.height;
 }
 
+// Stores the complete height of titlebar + toolbar.
 - (void)setUnifiedToolbarHeight:(float)aHeight
 {
-  if ([self drawsContentsIntoWindowFrame] || aHeight == mUnifiedToolbarHeight)
+  if (aHeight == mUnifiedToolbarHeight)
     return;
 
   mUnifiedToolbarHeight = aHeight;
 
   // Update sheet positioning hint.
-  [self setContentBorderThickness:mUnifiedToolbarHeight forEdge:NSMaxYEdge];
+  [self setContentBorderThickness:mUnifiedToolbarHeight - [self titlebarHeight] forEdge:NSMaxYEdge];
 
   // Redraw the title bar. If we're inside painting, we'll do it right now,
   // otherwise we'll just invalidate it.
@@ -3123,18 +3134,18 @@ static const NSString* kStateShowsToolbarButton = @"showsToolbarButton";
 
 static void
 DrawNativeTitlebar(CGContextRef aContext, CGRect aTitlebarRect,
-                   float aToolbarHeight, BOOL aIsMain)
+                   float aUnifiedToolbarHeight, BOOL aIsMain)
 {
   if (aTitlebarRect.size.width * aTitlebarRect.size.height > CUIDRAW_MAX_AREA) {
     return;
   }
-  int unifiedHeight = aTitlebarRect.size.height + aToolbarHeight;
+
   CUIDraw([NSWindow coreUIRenderer], aTitlebarRect, aContext,
           (CFDictionaryRef)[NSDictionary dictionaryWithObjectsAndKeys:
             @"kCUIWidgetWindowFrame", @"widget",
             @"regularwin", @"windowtype",
             (aIsMain ? @"normal" : @"inactive"), @"state",
-            [NSNumber numberWithInt:unifiedHeight], @"kCUIWindowFrameUnifiedTitleBarHeightKey",
+            [NSNumber numberWithInt:aUnifiedToolbarHeight], @"kCUIWindowFrameUnifiedTitleBarHeightKey",
             [NSNumber numberWithBool:YES], @"kCUIWindowFrameDrawTitleSeparatorKey",
             nil],
           nil);
diff --git a/widget/cocoa/nsNativeThemeCocoa.h b/widget/cocoa/nsNativeThemeCocoa.h
index 88b6e43b0f40..a0b695637f04 100644
--- a/widget/cocoa/nsNativeThemeCocoa.h
+++ b/widget/cocoa/nsNativeThemeCocoa.h
@@ -107,6 +107,8 @@ protected:
                           NSWindow* aWindow);
   void DrawStatusBar(CGContextRef cgContext, const HIRect& inBoxRect,
                      nsIFrame *aFrame);
+  void DrawNativeTitlebar(CGContextRef aContext, CGRect aTitlebarRect,
+                          float aUnifiedHeight, BOOL aIsMain);
   void DrawResizer(CGContextRef cgContext, const HIRect& aRect, nsIFrame *aFrame);
 
   // Scrollbars
diff --git a/widget/cocoa/nsNativeThemeCocoa.mm b/widget/cocoa/nsNativeThemeCocoa.mm
index cba01e5a5bb8..b1de27df3cfd 100644
--- a/widget/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/cocoa/nsNativeThemeCocoa.mm
@@ -1781,7 +1781,7 @@ nsNativeThemeCocoa::GetParentScrollbarFrame(nsIFrame *aFrame)
   do {
     if (scrollbarFrame->GetType() == nsGkAtoms::scrollbarFrame) break;
   } while ((scrollbarFrame = scrollbarFrame->GetParent()));
-  
+
   // We return null if we can't find a parent scrollbar frame
   return scrollbarFrame;
 }
@@ -1789,16 +1789,18 @@ nsNativeThemeCocoa::GetParentScrollbarFrame(nsIFrame *aFrame)
 static bool
 ToolbarCanBeUnified(CGContextRef cgContext, const HIRect& inBoxRect, NSWindow* aWindow)
 {
-  if (![aWindow isKindOfClass:[ToolbarWindow class]] ||
-      [(ToolbarWindow*)aWindow drawsContentsIntoWindowFrame])
+  if (![aWindow isKindOfClass:[ToolbarWindow class]])
     return false;
 
-  float unifiedToolbarHeight = [(ToolbarWindow*)aWindow unifiedToolbarHeight];
-  CGAffineTransform ctm = CGContextGetUserSpaceToDeviceSpaceTransform(cgContext);
-  CGRect deviceRect = CGRectApplyAffineTransform(inBoxRect, ctm);
+  ToolbarWindow* win = (ToolbarWindow*)aWindow;
+  float unifiedToolbarHeight = [win unifiedToolbarHeight];
+  float titlebarHeight = [win titlebarHeight];
+  bool drawsContentsIntoWindowFrame = [win drawsContentsIntoWindowFrame];
+  float underTitlebarPos = drawsContentsIntoWindowFrame ? titlebarHeight : 0;
+
   return inBoxRect.origin.x == 0 &&
-         deviceRect.size.width >= [aWindow frame].size.width &&
-         inBoxRect.origin.y <= 0.0 &&
+         inBoxRect.size.width >= [win frame].size.width &&
+         inBoxRect.origin.y <= underTitlebarPos &&
          floor(inBoxRect.origin.y + inBoxRect.size.height) <= unifiedToolbarHeight;
 }
 
@@ -1808,15 +1810,14 @@ nsNativeThemeCocoa::DrawUnifiedToolbar(CGContextRef cgContext, const HIRect& inB
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  float titlebarHeight = [(ToolbarWindow*)aWindow titlebarHeight];
-  float unifiedHeight = titlebarHeight + inBoxRect.size.height;
+  float unifiedHeight = [(ToolbarWindow*)aWindow unifiedToolbarHeight];
 
   BOOL isMain = [aWindow isMainWindow];
 
   CGContextSaveGState(cgContext);
   CGContextClipToRect(cgContext, inBoxRect);
 
-  CGRect drawRect = CGRectOffset(inBoxRect, 0, -titlebarHeight);
+  CGRect drawRect = CGRectOffset(inBoxRect, 0, inBoxRect.size.height - unifiedHeight);
   if (drawRect.size.width * drawRect.size.height <= CUIDRAW_MAX_AREA) {
     CUIDraw([NSWindow coreUIRenderer], drawRect, cgContext,
             (CFDictionaryRef)[NSDictionary dictionaryWithObjectsAndKeys:
@@ -1872,6 +1873,34 @@ nsNativeThemeCocoa::DrawStatusBar(CGContextRef cgContext, const HIRect& inBoxRec
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
 
+void
+nsNativeThemeCocoa::DrawNativeTitlebar(CGContextRef aContext, CGRect aTitlebarRect,
+                                       float aUnifiedHeight, BOOL aIsMain)
+{
+  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
+
+  if (aTitlebarRect.size.width * aTitlebarRect.size.height > CUIDRAW_MAX_AREA) {
+    return;
+  }
+
+  CGContextSaveGState(aContext);
+
+  CUIDraw([NSWindow coreUIRenderer], aTitlebarRect, aContext,
+          (CFDictionaryRef)[NSDictionary dictionaryWithObjectsAndKeys:
+            @"kCUIWidgetWindowFrame", @"widget",
+            @"regularwin", @"windowtype",
+            (aIsMain ? @"normal" : @"inactive"), @"state",
+            [NSNumber numberWithInt:aUnifiedHeight], @"kCUIWindowFrameUnifiedTitleBarHeightKey",
+            [NSNumber numberWithBool:NO], @"kCUIWindowFrameDrawTitleSeparatorKey",
+            [NSNumber numberWithBool:YES], @"is.flipped",
+            nil],
+          nil);
+
+  CGContextRestoreGState(aContext);
+
+  NS_OBJC_END_TRY_ABORT_BLOCK;
+}
+
 static void
 RenderResizer(CGContextRef cgContext, const HIRect& aRenderRect, void* aData)
 {
@@ -2134,6 +2163,14 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsRenderingContext* aContext,
     }
       break;
 
+    case NS_THEME_WINDOW_TITLEBAR: {
+      NSWindow* win = NativeWindowForFrame(aFrame);
+      BOOL isMain = [win isMainWindow];
+      float unifiedToolbarHeight = [(ToolbarWindow*)win unifiedToolbarHeight];
+      DrawNativeTitlebar(cgContext, macRect, unifiedToolbarHeight, isMain);
+    }
+      break;
+
     case NS_THEME_TOOLBOX: {
       HIThemeHeaderDrawInfo hdi = { 0, kThemeStateActive, kHIThemeHeaderKindWindow };
       HIThemeDrawHeader(&macRect, &hdi, cgContext, HITHEME_ORIENTATION);
@@ -2910,6 +2947,7 @@ nsNativeThemeCocoa::ThemeSupportsWidget(nsPresContext* aPresContext, nsIFrame* a
 
     case NS_THEME_DIALOG:
     case NS_THEME_WINDOW:
+    case NS_THEME_WINDOW_TITLEBAR:
     case NS_THEME_MENUPOPUP:
     case NS_THEME_MENUITEM:
     case NS_THEME_MENUSEPARATOR:

From b7e9bcba68056e750496f8bada563f78a042df38 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Wed, 3 Apr 2013 01:02:00 -0700
Subject: [PATCH 007/230] Bug 856749 - Extend clip-path on tab-background-start
 to overlap middle by 1px to fix a visible seam on selected tabs. r=dao

---
 browser/base/content/browser.xul | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index f538a06663f9..d000287eeff6 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1187,16 +1187,13 @@
 
   <svg:svg height="0">
     <svg:clipPath id="tab-curve-clip-path-start" clipPathUnits="userSpaceOnUse">
-      <svg:path d="M30,2.005C17.049,2.104,15.508,11.669,14.511,17c-1.565,8.376-4.276,13-13,13L0.34,31H30V2.005z"
-                stroke-width="1px" />
+      <svg:path d="M 30,2 C 17.049,2.104,15.508,11.669,14.511,17 c -1.565,8.376,-4.276,13,-13,13 L 0,31 H 31 V 2 z"/>
     </svg:clipPath>
     <svg:clipPath id="tab-curve-clip-path-end" clipPathUnits="userSpaceOnUse">
-      <svg:path d="M-1,2.005L0,2.005C12.951,2.104,14.492,11.669,15.489,17c1.565,8.376,4.276,13,13,13l1.171,1H-1V2.005z"
-                stroke-width="1px" />
+      <svg:path d="M -1,2 C 12.951,2.104,14.492,11.669,15.489,17 c +1.565,8.376,+4.276,13,+13,13 L 30,31 H -1 V 2 z"/>
     </svg:clipPath>
     <svg:clipPath id="tab-clip-path-outer" clipPathUnits="userSpaceOnUse">
-      <svg:path d="M 30,0 C 24,0 17.78,2.58 15.10,8.09 12.05,13.46 13.14,20.37 9.18,25.3 7.1,27.7 3.8,28 0.8,28 c -0.4,0.6 -2.09,1.11 -1.46,1.80 l 2.45,2.72 61.60,0 2.59,-3.06 C 65.15,28.96 64.57,27.80 63.5,28 60.13,28.13 56.33,27.03 54.74,23.78 51.85,18.44 52.65,11.81 49.09,6.73 45.88,1.65 39.54,-0.26 33.8,0 32.5,0 31.7,0 30,0 z"
-                stroke-width="1px" stroke="black"/>
+      <svg:path d="M 30,0 C 24,0 17.78,2.58 15.10,8.09 12.05,13.46 13.14,20.37 9.18,25.3 7.1,27.7 3.8,28 0.8,28 c -0.4,0.6 -2.09,1.11 -1.46,1.80 l 2.45,2.72 61.60,0 2.59,-3.06 C 65.15,28.96 64.57,27.80 63.5,28 60.13,28.13 56.33,27.03 54.74,23.78 51.85,18.44 52.65,11.81 49.09,6.73 45.88,1.65 39.54,-0.26 33.8,0 32.5,0 31.7,0 30,0 z"/>
     </svg:clipPath>
 
 #ifndef XP_UNIX

From 437e2a9b0899f11011ae6557cc34b3a851d6417f Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Fri, 29 Mar 2013 14:53:01 -0700
Subject: [PATCH 008/230] Bug 855230 - Don't use CaptionText color for luna
 blue in fullscreen. r=dao

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

diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 74a266290ef1..041509976cb7 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1895,35 +1895,35 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 %ifndef WINDOWS_AERO
 /* Use lighter colors of buttons and text in the titlebar on luna-blue */
 @media (-moz-windows-theme: luna-blue) {
-  #main-window[tabsintitlebar] .tabbrowser-tab:not([selected]):not(:-moz-lwtheme) {
-    color: CaptionText;
-  }
-
-  #main-window[tabsintitlebar] .tabbrowser-arrowscrollbox > .scrollbutton-up,
-  #main-window[tabsintitlebar] .tabbrowser-arrowscrollbox > .scrollbutton-down {
+  #main-window[tabsintitlebar]:not([inFullscreen]) .tabbrowser-arrowscrollbox > .scrollbutton-up,
+  #main-window[tabsintitlebar]:not([inFullscreen]) .tabbrowser-arrowscrollbox > .scrollbutton-down {
     list-style-image: url(chrome://browser/skin/tabbrowser/tab-arrow-left-inverted.png);
   }
 
-  #main-window[tabsintitlebar] .tabs-newtab-button,
-  #main-window[tabsintitlebar] #TabsToolbar > #new-tab-button,
-  #main-window[tabsintitlebar] #TabsToolbar > toolbarpaletteitem > #new-tab-button {
+  #main-window[tabsintitlebar]:not([inFullscreen]) .tabs-newtab-button,
+  #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar > #new-tab-button,
+  #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar > toolbarpaletteitem > #new-tab-button {
     list-style-image: url(chrome://browser/skin/tabbrowser/newtab-inverted.png);
   }
 
-  #main-window[tabsintitlebar] #TabsToolbar > #alltabs-button {
+  #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar > #alltabs-button {
     list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png");
   }
 
-  #main-window[tabsintitlebar] #TabsToolbar > #tabview-button {
+  #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar > #tabview-button {
     list-style-image: url(chrome://browser/skin/tabview/tabview-inverted.png);
   }
 
-  #main-window[tabsintitlebar] .tab-close-button:not(:hover):not([selected="true"]) {
+  #main-window[tabsintitlebar]:not([inFullscreen]) .tab-close-button:not(:hover):not([selected="true"]) {
     -moz-image-region: rect(0, 64px, 16px, 48px);
   }
 }
 %endif
 
+#main-window[tabsintitlebar]:not([inFullscreen]) .tabbrowser-tab:not([selected]):not(:-moz-lwtheme) {
+  color: CaptionText;
+}
+
 .tabbrowser-tab:-moz-lwtheme {
   color: inherit;
 }

From f3a490bdd9242ee55a07dd23d3eb05e3b1b20f2a Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Thu, 14 Feb 2013 10:59:13 -0500
Subject: [PATCH 009/230] Bug 813802 - [Win] Tabs and menubar in the titlebar
 for restored windows. r=MattN

---
 browser/base/content/browser.js         | 154 ++++++++++++++++++++----
 browser/base/content/tabbrowser.xml     |   4 +-
 browser/themes/windows/browser-aero.css |  13 +-
 browser/themes/windows/browser.css      |  55 ++++++++-
 toolkit/content/xul.css                 |   9 +-
 5 files changed, 187 insertions(+), 48 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index be357a9a2e6a..6e4770a13224 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -4560,10 +4560,19 @@ var TabsInTitlebar = {
     this._readPref();
     Services.prefs.addObserver(this._prefName, this, false);
 
-    // Don't trust the initial value of the sizemode attribute; wait for
-    // the resize event (handled in tabbrowser.xml).
-    this.allowedBy("sizemode", false);
-
+    // We need to update the appearance of the titlebar when the menu changes
+    // from the active to the inactive state. We can't, however, rely on
+    // DOMMenuBarInactive, because the menu fires this event and then removes
+    // the inactive attribute after an event-loop spin.
+    //
+    // Because updating the appearance involves sampling the heights and margins
+    // of various elements, it's important that the layout be more or less
+    // settled before updating the titlebar. So instead of listening to
+    // DOMMenuBarActive and DOMMenuBarInactive, we use a MutationObserver to
+    // watch the "invalid" attribute directly.
+    let menu = document.getElementById("toolbar-menubar");
+    this._menuObserver = new MutationObserver(this._onMenuMutate);
+    this._menuObserver.observe(menu, {attributes: true});
     this._initialized = true;
 #endif
   },
@@ -4573,17 +4582,23 @@ var TabsInTitlebar = {
     if (allow) {
       if (condition in this._disallowed) {
         delete this._disallowed[condition];
-        this._update();
+        this._update(true);
       }
     } else {
       if (!(condition in this._disallowed)) {
         this._disallowed[condition] = null;
-        this._update();
+        this._update(true);
       }
     }
 #endif
   },
 
+  updateAppearance: function updateAppearance(aForce) {
+#ifdef CAN_DRAW_IN_TITLEBAR
+    this._update(aForce);
+#endif
+  },
+
   get enabled() {
     return document.documentElement.getAttribute("tabsintitlebar") == "true";
   },
@@ -4594,35 +4609,73 @@ var TabsInTitlebar = {
       this._readPref();
   },
 
+  _onMenuMutate: function (aMutations) {
+    // We don't care about restored windows, since the menu shouldn't be
+    // pushing the tab-strip down.
+    if (document.documentElement.getAttribute("sizemode") == "normal") {
+      return;
+    }
+
+    for (let mutation of aMutations) {
+      if (mutation.attributeName == "inactive" ||
+          mutation.attributeName == "autohide") {
+        TabsInTitlebar._update(true);
+        return;
+      }
+    }
+  },
+
   _initialized: false,
   _disallowed: {},
   _prefName: "browser.tabs.drawInTitlebar",
+  _lastSizeMode: null,
 
   _readPref: function () {
     this.allowedBy("pref",
                    Services.prefs.getBoolPref(this._prefName));
   },
 
-  _update: function () {
+  _update: function (aForce=false) {
     if (!this._initialized || window.fullScreen)
       return;
 
     let allowed = true;
+
+    if (!aForce) {
+      // _update is called on resize events, because the window is not ready
+      // after sizemode events. However, we only care about the event when the
+      // sizemode is different from the last time we updated the appearance of
+      // the tabs in the titlebar.
+      let sizemode = document.documentElement.getAttribute("sizemode");
+      if (this._lastSizeMode == sizemode) {
+        return;
+      }
+      this._lastSizeMode = sizemode;
+    }
+
     for (let something in this._disallowed) {
       allowed = false;
       break;
     }
 
-    if (allowed == this.enabled)
-      return;
-
     function $(id) document.getElementById(id);
+
     let titlebar = $("titlebar");
+    let titlebarContent = $("titlebar-content");
+    let menubar = $("toolbar-menubar");
+
+    // Reset the margins that _update modifies so that we can take accurate
+    // measurements.
+    titlebarContent.style.marginBottom = "";
+    titlebar.style.marginBottom = "";
+    menubar.style.marginBottom = "";
 
     if (allowed) {
-      function rect(ele)   ele.getBoundingClientRect();
+      // We set the tabsintitlebar attribute first so that our CSS for
+      // tabsintitlebar manifests before we do our measurements.
+      document.documentElement.setAttribute("tabsintitlebar", "true");
 
-      let tabsToolbar       = $("TabsToolbar");
+      function rect(ele)   ele.getBoundingClientRect();
 
 #ifdef MENUBAR_CAN_AUTOHIDE
       let appmenuButtonBox  = $("appmenu-button-container");
@@ -4631,25 +4684,58 @@ var TabsInTitlebar = {
       let captionButtonsBox = $("titlebar-buttonbox");
       this._sizePlaceholder("caption-buttons", rect(captionButtonsBox).width);
 
-      let tabsToolbarRect = rect(tabsToolbar);
-      let titlebarTop = rect($("titlebar-content")).top;
-      titlebar.style.marginBottom = - Math.min(tabsToolbarRect.top - titlebarTop,
-                                               tabsToolbarRect.height) + "px";
+      let titlebarContentHeight = rect(titlebarContent).height;
+      let menuHeight = this._outerHeight(menubar);
 
-      document.documentElement.setAttribute("tabsintitlebar", "true");
+      // If the titlebar is taller than the menubar, add more padding to the
+      // bottom of the menubar so that it matches.
+      if (menuHeight && titlebarContentHeight > menuHeight) {
+        let menuTitlebarDelta = titlebarContentHeight - menuHeight;
+        menubar.style.marginBottom = menuTitlebarDelta + "px";
+        menuHeight += menuTitlebarDelta;
+      }
 
-      if (!this._draghandle) {
+      // Next, we calculate how much we need to stretch the titlebar down to
+      // go all the way to the bottom of the tab strip.
+      let tabsToolbar = $("TabsToolbar");
+      let tabAndMenuHeight = this._outerHeight(tabsToolbar) + menuHeight;
+      titlebarContent.style.marginBottom = tabAndMenuHeight + "px";
+
+      // Finally, we have to determine how much to bring up the elements below
+      // the titlebar. We start with a baseHeight of tabAndMenuHeight, to offset
+      // the amount we added to the titlebar content. Then, we have two cases:
+      //
+      // 1) The titlebar is larger than the tabAndMenuHeight. This can happen in
+      //    large font mode with the menu autohidden. In this case, we want to
+      //    add tabAndMenuHeight, since this should line up the bottom of the
+      //    tabstrip with the bottom of the titlebar.
+      //
+      // 2) The titlebar is equal to or smaller than the tabAndMenuHeight. This
+      //    is the more common case, and occurs with normal font sizes. In this
+      //    case, we want to bring the menu and tabstrip right up to the top of
+      //    the titlebar, so we add the titlebarContentHeight to the baseHeight.
+      let baseHeight = tabAndMenuHeight;
+      baseHeight += (titlebarContentHeight > tabAndMenuHeight) ? tabAndMenuHeight
+                                                               : titlebarContentHeight;
+      titlebar.style.marginBottom = "-" + baseHeight + "px";
+
+      if (!this._draghandles) {
+        this._draghandles = {};
         let tmp = {};
         Components.utils.import("resource://gre/modules/WindowDraggingUtils.jsm", tmp);
-        this._draghandle = new tmp.WindowDraggingElement(tabsToolbar);
-        this._draghandle.mouseDownCheck = function () {
+
+        let mouseDownCheck = function () {
           return !this._dragBindingAlive && TabsInTitlebar.enabled;
         };
+
+        this._draghandles.tabsToolbar = new tmp.WindowDraggingElement(tabsToolbar);
+        this._draghandles.tabsToolbar.mouseDownCheck = mouseDownCheck;
+
+        this._draghandles.navToolbox = new tmp.WindowDraggingElement(gNavToolbox);
+        this._draghandles.navToolbox.mouseDownCheck = mouseDownCheck;
       }
     } else {
       document.documentElement.removeAttribute("tabsintitlebar");
-
-      titlebar.style.marginBottom = "";
     }
   },
 
@@ -4657,12 +4743,30 @@ var TabsInTitlebar = {
     Array.forEach(document.querySelectorAll(".titlebar-placeholder[type='"+ type +"']"),
                   function (node) { node.width = width; });
   },
+
+  /**
+   * Retrieve the height of an element, including its top and bottom
+   * margins.
+   *
+   * @param ele
+   *        The element to measure.
+   * @return
+   *        The height and margins as an integer. If the height of the element
+   *        is 0, then this returns 0, regardless of what the margins are.
+   */
+  _outerHeight: function (ele) {
+    let cstyle = document.defaultView.getComputedStyle(ele);
+    let margins = parseInt(cstyle.marginTop) + parseInt(cstyle.marginBottom);
+    let height = ele.getBoundingClientRect().height;
+    return height > 0 ? Math.abs(height + margins) : 0;
+  },
 #endif
 
   uninit: function () {
 #ifdef CAN_DRAW_IN_TITLEBAR
     this._initialized = false;
     Services.prefs.removeObserver(this._prefName, this);
+    this._menuObserver.disconnect();
 #endif
   }
 };
@@ -4675,14 +4779,14 @@ function updateAppButtonDisplay() {
     document.getElementById("toolbar-menubar").getAttribute("autohide") == "true";
 
 #ifdef CAN_DRAW_IN_TITLEBAR
-  document.getElementById("titlebar").hidden = !displayAppButton;
+  document.getElementById("titlebar").hidden = gInPrintPreviewMode;
 
-  if (displayAppButton)
+  if (!gInPrintPreviewMode)
     document.documentElement.setAttribute("chromemargin", "0,2,2,2");
   else
     document.documentElement.removeAttribute("chromemargin");
 
-  TabsInTitlebar.allowedBy("drawing-in-titlebar", displayAppButton);
+  TabsInTitlebar.allowedBy("drawing-in-titlebar", !gInPrintPreviewMode);
 #else
   document.getElementById("appmenu-toolbar-button").hidden =
     !displayAppButton;
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 38b820ffaa29..22672fda81ef 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -3451,9 +3451,7 @@
               if (aEvent.target != window)
                 break;
 
-              let sizemode = document.documentElement.getAttribute("sizemode");
-              TabsInTitlebar.allowedBy("sizemode",
-                                       sizemode == "maximized" || sizemode == "fullscreen");
+              TabsInTitlebar.updateAppearance();
 
               var width = this.mTabstrip.boxObject.width;
               if (width != this.mTabstripWidth) {
diff --git a/browser/themes/windows/browser-aero.css b/browser/themes/windows/browser-aero.css
index 12ef18c94a03..a5de9e661781 100644
--- a/browser/themes/windows/browser-aero.css
+++ b/browser/themes/windows/browser-aero.css
@@ -11,7 +11,8 @@
 %define glassInactiveBorderColor rgb(102, 102, 102)
 
 @media not all and (-moz-windows-classic) {
-  #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container {
+  #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container,
+  #main-window[sizemode="normal"] > #tab-view-deck > #browser-panel > #navigator-toolbox > #toolbar-menubar {
     margin-top: 1px;
   }
 
@@ -125,10 +126,6 @@
     -moz-appearance: -moz-win-exclude-glass;
   }
 
-  #main-window[chromemargin^="0,"][sizemode=normal] #navigator-toolbox {
-    margin-top: -7px;
-  }
-
   /* Artificially draw window borders that are covered by lwtheme, see bug 591930. */
   #main-window[sizemode="normal"] > #titlebar > #titlebar-content:-moz-lwtheme {
     border-top: 2px solid;
@@ -269,7 +266,7 @@
     background-color: -moz-dialog;
   }
 
-  #navigator-toolbox[tabsontop=false] > #toolbar-menubar > #menubar-items > #main-menubar:not(:-moz-lwtheme):not(:-moz-window-inactive) {
+  #main-menubar:not(:-moz-lwtheme):not(:-moz-window-inactive) {
     background-color: rgba(255,255,255,.5);
     border-radius: 4px;
   }
@@ -331,10 +328,6 @@
   }
 
   /* Glass Fog */
-  #main-window[tabsintitlebar] #appmenu-button-container,
-  #main-window[tabsintitlebar] #titlebar-buttonbox {
-    z-index: 1; /* These elements need to appear above the glass fog */
-  }
 
   #TabsToolbar:not(:-moz-lwtheme) {
     background-image: none;
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 041509976cb7..2a823c05f617 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -37,6 +37,21 @@
   -moz-box-flex: 1; /* make menu items expand to fill toolbar height */
 }
 
+#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"][inactive="true"]:not([customizing="true"]) {
+  visibility: hidden;
+}
+
+#main-window[sizemode="normal"] #toolbar-menubar,
+/* We want a 4px gap between the TabsToolbar and the toolbar-menubar when the
+   toolbar-menu is displayed in either restored or maximized mode. */
+#main-window:not([sizemode="fullscreen"]) #toolbar-menubar:-moz-any(:not([autohide="true"]), :not([inactive="true"])) {
+  margin-bottom: 4px;
+}
+
+#toolbar-menubar:not([autohide="true"]) {
+  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-drag");
+}
+
 #navigator-toolbox {
   -moz-appearance: none;
   background-color: transparent;
@@ -64,12 +79,16 @@
 %ifdef WINDOWS_AERO
 @media not all and (-moz-windows-compositor) {
 %endif
-  #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme) {
+  #toolbar-menubar {
+    background-color: transparent !important;
+  }
+
+  #main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme) {
     background: linear-gradient(to top, @toolbarShadowColor@ 1px, transparent 1px),
                 linear-gradient(rgba(50%,50%,50%,0), ActiveCaption 85%);
     color: CaptionText;
   }
-  #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive {
+  #main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive {
     background: linear-gradient(to top, @toolbarShadowColor@ 1px, transparent 1px),
                 linear-gradient(rgba(50%,50%,50%,0), InactiveCaption 85%);
     color: InactiveCaptionText;
@@ -106,6 +125,16 @@
 
 /* ::::: app menu button ::::: */
 
+/* The app menu button must appear on top of the navigator-toolbox in order
+ * for click and hover mouse events to work properly for the button in the
+ * restored window state. Otherwise, elements in the navigator-toolbox, like the
+ * menubar can swallow these events. It will also place the button above the
+ * fog on themes with Aero Glass.
+ */
+#main-window[tabsintitlebar] #appmenu-button-container {
+  z-index: 1;
+}
+
 #appmenu-button {
   -moz-appearance: none;
   background-clip: padding-box;
@@ -128,6 +157,10 @@
 
 %ifndef WINDOWS_AERO
 @media (-moz-windows-default-theme) {
+  #main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar {
+    margin-top: 4px;
+  }
+
   #main-window[sizemode="normal"] #appmenu-button {
     margin-bottom: 5px;
   }
@@ -541,13 +574,21 @@
 }
 
 @media (-moz-windows-classic) {
-  #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container {
+  #main-window[tabsintitlebar][sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container,
+  #main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel > #navigator-toolbox > #toolbar-menubar {
     margin-top: 4px;
   }
 }
 
+/* The button box must appear on top of the navigator-toolbox in order for
+ * click and hover mouse events to work properly for the button in the restored
+ * window state. Otherwise, elements in the navigator-toolbox, like the menubar,
+ * can swallow those events. It will also place the buttons above the fog on
+ * themes with Aero Glass.
+ */
 #titlebar-buttonbox {
   -moz-appearance: -moz-window-button-box;
+  z-index: 1;
 }
 
 #main-window[sizemode="maximized"] #titlebar-buttonbox {
@@ -1881,6 +1922,10 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   background-image: linear-gradient(to top, @toolbarShadowColor@ 1px, rgba(0,0,0,.05) 1px, transparent 50%);
 }
 
+#main-window[tabsintitlebar] #TabsToolbar {
+  background-color: transparent;
+}
+
 %ifndef WINDOWS_AERO
 @media (-moz-windows-default-theme) {
   #main-window[sizemode=normal] #TabsToolbar {
@@ -1895,6 +1940,10 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 %ifndef WINDOWS_AERO
 /* Use lighter colors of buttons and text in the titlebar on luna-blue */
 @media (-moz-windows-theme: luna-blue) {
+  #main-window[tabsintitlebar] #main-menubar > menu {
+    color: white;
+  }
+
   #main-window[tabsintitlebar]:not([inFullscreen]) .tabbrowser-arrowscrollbox > .scrollbutton-up,
   #main-window[tabsintitlebar]:not([inFullscreen]) .tabbrowser-arrowscrollbox > .scrollbutton-down {
     list-style-image: url(chrome://browser/skin/tabbrowser/tab-arrow-left-inverted.png);
diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css
index bfa3f6cce078..474181a6462d 100644
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -272,20 +272,15 @@ toolbar[customizing="true"][hidden="true"] {
 
 %ifdef XP_MACOSX
 toolbar[type="menubar"] {
-  min-height: 0 !important;
-  border: 0 !important;
+  visibility: collapse;
 }
 %else
 toolbar[type="menubar"][autohide="true"] {
   -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-menubar-autohide");
-  overflow: hidden;
 }
 
 toolbar[type="menubar"][autohide="true"][inactive="true"]:not([customizing="true"]) {
-  min-height: 0 !important;
-  height: 0 !important;
-  -moz-appearance: none !important;
-  border-style: none !important;
+  visibility: collapse;
 }
 %endif
 

From d589bedeacac3c27af85b5fa0bf2eaafad85b0bc Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Tue, 26 Mar 2013 17:23:23 -0400
Subject: [PATCH 010/230] Bug 770135 - New PanelUI and toolbar customization -
 Milestone 1. r=mconley,jaws,Unfocused.

---
 browser/base/content/browser-customization.js |  108 ++
 browser/base/content/browser.css              |    4 +
 browser/base/content/browser.js               |  125 +-
 browser/base/content/browser.xul              |  404 +++--
 browser/base/content/customize.inc            |   36 +
 browser/base/content/customizing.xhtml        |   22 +
 browser/base/content/global-scripts.inc       |    1 +
 browser/base/content/panelUI.inc              |   78 +
 browser/base/content/panelUI.js               |  243 +++
 browser/base/content/panelUI.xml              |   40 +
 browser/base/content/panelUIOverlay.js        |    9 +
 browser/base/content/panelUIOverlay.xul       |   26 +
 browser/base/content/toolbar.xml              |  104 ++
 browser/base/jar.mn                           |   16 +-
 browser/components/about/AboutRedirector.cpp  |    2 +
 browser/components/build/nsModule.cpp         |    1 +
 .../locales/en-US/chrome/browser/browser.dtd  |   17 +
 browser/modules/CustomizableUI.jsm            | 1576 +++++++++++++++++
 browser/modules/CustomizeMode.jsm             |  484 +++++
 browser/modules/Makefile.in                   |    2 +
 browser/themes/linux/appmenu.png              |  Bin 0 -> 247 bytes
 browser/themes/linux/jar.mn                   |    2 +
 browser/themes/linux/panelUIOverlay.css       |    8 +
 browser/themes/osx/appmenu.png                |  Bin 0 -> 247 bytes
 browser/themes/osx/jar.mn                     |    2 +
 browser/themes/osx/panelUIOverlay.css         |    8 +
 browser/themes/shared/panelUIOverlay.inc.css  |  249 +++
 browser/themes/windows/appmenu.png            |  Bin 0 -> 247 bytes
 browser/themes/windows/browser.css            |   43 +-
 browser/themes/windows/jar.mn                 |    4 +
 browser/themes/windows/panelUIOverlay.css     |    8 +
 toolkit/themes/linux/global/inContentUI.css   |    1 -
 32 files changed, 3318 insertions(+), 305 deletions(-)
 create mode 100644 browser/base/content/browser-customization.js
 create mode 100644 browser/base/content/customize.inc
 create mode 100644 browser/base/content/customizing.xhtml
 create mode 100644 browser/base/content/panelUI.inc
 create mode 100644 browser/base/content/panelUI.js
 create mode 100644 browser/base/content/panelUI.xml
 create mode 100644 browser/base/content/panelUIOverlay.js
 create mode 100644 browser/base/content/panelUIOverlay.xul
 create mode 100644 browser/base/content/toolbar.xml
 create mode 100644 browser/modules/CustomizableUI.jsm
 create mode 100644 browser/modules/CustomizeMode.jsm
 create mode 100644 browser/themes/linux/appmenu.png
 create mode 100644 browser/themes/linux/panelUIOverlay.css
 create mode 100644 browser/themes/osx/appmenu.png
 create mode 100644 browser/themes/osx/panelUIOverlay.css
 create mode 100644 browser/themes/shared/panelUIOverlay.inc.css
 create mode 100644 browser/themes/windows/appmenu.png
 create mode 100644 browser/themes/windows/panelUIOverlay.css

diff --git a/browser/base/content/browser-customization.js b/browser/base/content/browser-customization.js
new file mode 100644
index 000000000000..7af29dddd82a
--- /dev/null
+++ b/browser/base/content/browser-customization.js
@@ -0,0 +1,108 @@
+# -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+# 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/.
+
+/**
+ * Customization handler prepares this browser window for entering and exiting
+ * customization mode by handling CustomizationStart and CustomizationEnd
+ * events.
+ */
+let CustomizationHandler = {
+  handleEvent: function(aEvent) {
+    switch(aEvent.type) {
+      case "CustomizationStart":
+        this._customizationStart();
+        break;
+      case "CustomizationEnd":
+        this._customizationEnd(aEvent.detail);
+        break;
+    }
+  },
+
+  _customizationStart: function() {
+    // Disable the toolbar context menu items
+    let menubar = document.getElementById("main-menubar");
+    for (let childNode of menubar.childNodes)
+      childNode.setAttribute("disabled", true);
+
+    let cmd = document.getElementById("cmd_CustomizeToolbars");
+    cmd.setAttribute("disabled", "true");
+
+    let splitter = document.getElementById("urlbar-search-splitter");
+    if (splitter) {
+      splitter.parentNode.removeChild(splitter);
+    }
+
+    CombinedStopReload.uninit();
+    PlacesToolbarHelper.customizeStart();
+    BookmarksMenuButton.customizeStart();
+    DownloadsButton.customizeStart();
+    TabsInTitlebar.allowedBy("customizing-toolbars", false);
+
+    gBrowser.selectedTab = window.gBrowser.addTab("about:customizing");
+  },
+
+  _customizationEnd: function(aDetails) {
+    // Update global UI elements that may have been added or removed
+    if (aDetails.changed) {
+      gURLBar = document.getElementById("urlbar");
+
+      gProxyFavIcon = document.getElementById("page-proxy-favicon");
+      gHomeButton.updateTooltip();
+      gIdentityHandler._cacheElements();
+      XULBrowserWindow.init();
+
+#ifndef XP_MACOSX
+      updateEditUIVisibility();
+#endif
+
+      // Hacky: update the PopupNotifications' object's reference to the iconBox,
+      // if it already exists, since it may have changed if the URL bar was
+      // added/removed.
+      if (!window.__lookupGetter__("PopupNotifications")) {
+        PopupNotifications.iconBox =
+          document.getElementById("notification-popup-box");
+      }
+
+    }
+
+    PlacesToolbarHelper.customizeDone();
+    BookmarksMenuButton.customizeDone();
+    DownloadsButton.customizeDone();
+
+    if (gBrowser.selectedBrowser.currentURI.spec == "about:customizing") {
+      gBrowser.removeCurrentTab();
+    }
+
+    // The url bar splitter state is dependent on whether stop/reload
+    // and the location bar are combined, so we need this ordering
+    CombinedStopReload.init();
+    UpdateUrlbarSearchSplitterState();
+    setUrlAndSearchBarWidthForConditionalForwardButton();
+
+    // Update the urlbar
+    if (gURLBar) {
+      URLBarSetURI();
+      XULBrowserWindow.asyncUpdateUI();
+      PlacesStarButton.updateState();
+      SocialShareButton.updateShareState();
+    }
+
+    TabsInTitlebar.allowedBy("customizing-toolbars", true);
+
+    // Re-enable parts of the UI we disabled during the dialog
+    let menubar = document.getElementById("main-menubar");
+    for (let childNode of menubar.childNodes)
+      childNode.setAttribute("disabled", false);
+    let cmd = document.getElementById("cmd_CustomizeToolbars");
+    cmd.removeAttribute("disabled");
+
+    // make sure to re-enable click-and-hold
+    if (!getBoolPref("ui.click_hold_context_menus", false)) {
+      SetClickAndHoldHandlers();
+    }
+
+    gBrowser.selectedBrowser.focus();
+  }
+}
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index a2d7b6b1d778..14615818af4a 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -9,6 +9,10 @@ searchbar {
   -moz-binding: url("chrome://browser/content/search/search.xml#searchbar");
 }
 
+#nav-bar {
+  -moz-binding: url("chrome://browser/content/toolbar.xml#toolbar");
+}
+
 tabbrowser {
   -moz-binding: url("chrome://browser/content/tabbrowser.xml#tabbrowser");
 }
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 6e4770a13224..85acc0837039 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -90,6 +90,12 @@ XPCOMUtils.defineLazyModuleGetter(this, "TelemetryStopwatch",
 XPCOMUtils.defineLazyModuleGetter(this, "AboutHomeUtils",
   "resource:///modules/AboutHomeUtils.jsm");
 
+XPCOMUtils.defineLazyGetter(this, "gCustomizeMode", function() {
+  let scope = {};
+  Cu.import("resource:///modules/CustomizeMode.jsm", scope);
+  return new scope.CustomizeMode(window);
+});
+
 #ifdef MOZ_SERVICES_SYNC
 XPCOMUtils.defineLazyModuleGetter(this, "Weave",
   "resource://services-sync/main.js");
@@ -146,6 +152,7 @@ let gInitialPages = [
 ];
 
 #include browser-addons.js
+#include browser-customization.js
 #include browser-feeds.js
 #include browser-fullScreen.js
 #include browser-fullZoom.js
@@ -1031,6 +1038,7 @@ var gBrowserInit = {
     OfflineApps.init();
     IndexedDBPromptHelper.init();
     gFormSubmitObserver.init();
+    PanelUI.init();
     SocialUI.init();
     AddonManager.addAddonListener(AddonsMgrListener);
     WebrtcIndicator.init();
@@ -1280,6 +1288,9 @@ var gBrowserInit = {
     Services.obs.notifyObservers(window, "browser-delayed-startup-finished", "");
     setTimeout(function () { BrowserChromeTest.markAsReady(); }, 0);
     TelemetryTimestamps.add("delayedStartupFinished");
+
+    window.addEventListener("CustomizationStart", CustomizationHandler, false);
+    window.addEventListener("CustomizationEnd", CustomizationHandler, false);
   },
 
   onUnload: function() {
@@ -1363,6 +1374,7 @@ var gBrowserInit = {
       IndexedDBPromptHelper.uninit();
       AddonManager.removeAddonListener(AddonsMgrListener);
       SocialUI.uninit();
+      PanelUI.uninit();
     }
 
     // Final window teardown, do this last.
@@ -3309,118 +3321,13 @@ function OpenBrowserWindow(options)
   return win;
 }
 
-var gCustomizeSheet = false;
+//XXXunf Are these still useful to keep around?
 function BrowserCustomizeToolbar() {
-  // Disable the toolbar context menu items
-  var menubar = document.getElementById("main-menubar");
-  for (let childNode of menubar.childNodes)
-    childNode.setAttribute("disabled", true);
-
-  var cmd = document.getElementById("cmd_CustomizeToolbars");
-  cmd.setAttribute("disabled", "true");
-
-  var splitter = document.getElementById("urlbar-search-splitter");
-  if (splitter)
-    splitter.parentNode.removeChild(splitter);
-
-  CombinedStopReload.uninit();
-
-  PlacesToolbarHelper.customizeStart();
-  BookmarksMenuButton.customizeStart();
-  DownloadsButton.customizeStart();
-
-  TabsInTitlebar.allowedBy("customizing-toolbars", false);
-
-  var customizeURL = "chrome://global/content/customizeToolbar.xul";
-  gCustomizeSheet = getBoolPref("toolbar.customization.usesheet", false);
-
-  if (gCustomizeSheet) {
-    let sheetFrame = document.createElement("iframe");
-    let panel = document.getElementById("customizeToolbarSheetPopup");
-    sheetFrame.id = "customizeToolbarSheetIFrame";
-    sheetFrame.toolbox = gNavToolbox;
-    sheetFrame.panel = panel;
-    sheetFrame.setAttribute("style", panel.getAttribute("sheetstyle"));
-    panel.appendChild(sheetFrame);
-
-    // Open the panel, but make it invisible until the iframe has loaded so
-    // that the user doesn't see a white flash.
-    panel.style.visibility = "hidden";
-    gNavToolbox.addEventListener("beforecustomization", function onBeforeCustomization() {
-      gNavToolbox.removeEventListener("beforecustomization", onBeforeCustomization, false);
-      panel.style.removeProperty("visibility");
-    }, false);
-
-    sheetFrame.setAttribute("src", customizeURL);
-
-    panel.openPopup(gNavToolbox, "after_start", 0, 0);
-  } else {
-    window.openDialog(customizeURL,
-                      "CustomizeToolbar",
-                      "chrome,titlebar,toolbar,location,resizable,dependent",
-                      gNavToolbox);
-  }
+  gCustomizeMode.enter();
 }
 
 function BrowserToolboxCustomizeDone(aToolboxChanged) {
-  if (gCustomizeSheet) {
-    document.getElementById("customizeToolbarSheetPopup").hidePopup();
-    let iframe = document.getElementById("customizeToolbarSheetIFrame");
-    iframe.parentNode.removeChild(iframe);
-  }
-
-  // Update global UI elements that may have been added or removed
-  if (aToolboxChanged) {
-    gURLBar = document.getElementById("urlbar");
-
-    gProxyFavIcon = document.getElementById("page-proxy-favicon");
-    gHomeButton.updateTooltip();
-    gIdentityHandler._cacheElements();
-    window.XULBrowserWindow.init();
-
-#ifndef XP_MACOSX
-    updateEditUIVisibility();
-#endif
-
-    // Hacky: update the PopupNotifications' object's reference to the iconBox,
-    // if it already exists, since it may have changed if the URL bar was
-    // added/removed.
-    if (!window.__lookupGetter__("PopupNotifications"))
-      PopupNotifications.iconBox = document.getElementById("notification-popup-box");
-  }
-
-  PlacesToolbarHelper.customizeDone();
-  BookmarksMenuButton.customizeDone();
-  DownloadsButton.customizeDone();
-
-  // The url bar splitter state is dependent on whether stop/reload
-  // and the location bar are combined, so we need this ordering
-  CombinedStopReload.init();
-  UpdateUrlbarSearchSplitterState();
-  setUrlAndSearchBarWidthForConditionalForwardButton();
-
-  // Update the urlbar
-  if (gURLBar) {
-    URLBarSetURI();
-    XULBrowserWindow.asyncUpdateUI();
-    PlacesStarButton.updateState();
-    SocialShareButton.updateShareState();
-  }
-
-  TabsInTitlebar.allowedBy("customizing-toolbars", true);
-
-  // Re-enable parts of the UI we disabled during the dialog
-  var menubar = document.getElementById("main-menubar");
-  for (let childNode of menubar.childNodes)
-    childNode.setAttribute("disabled", false);
-  var cmd = document.getElementById("cmd_CustomizeToolbars");
-  cmd.removeAttribute("disabled");
-
-  // make sure to re-enable click-and-hold
-  if (!getBoolPref("ui.click_hold_context_menus", false))
-    SetClickAndHoldHandlers();
-
-  gBrowser.selectedBrowser.focus();
+  gCustomizeMode.exit(aToolboxChanged);
 }
 
 function BrowserToolboxCustomizeChange(aType) {
@@ -3591,6 +3498,8 @@ var XULBrowserWindow = {
   startTime: 0,
   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
   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 d000287eeff6..578d2503416d 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -9,6 +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/" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
@@ -465,6 +466,7 @@
       </popupnotificationcontent>
     </popupnotification>
 
+#include panelUI.inc
   </popupset>
 
 #ifdef CAN_DRAW_IN_TITLEBAR
@@ -525,6 +527,7 @@
              fullscreentoolbar="true" mode="icons" customizable="true"
              iconsize="large"
              defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,webrtc-status-button,downloads-button,home-button,bookmarks-menu-button-container,window-controls"
+             customizationtarget="nav-bar-customizationtarget"
              context="toolbar-context-menu">
 
       <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
@@ -656,6 +659,173 @@
                      command="Browser:Stop"
                      tooltiptext="&stopButton.tooltip;"/>
 
+      <hbox id="nav-bar-customizationtarget" class="customization-target" flex="100"/>
+
+      <toolbaritem id="PanelUI-button"
+                   class="chromeclass-toolbar-additional"
+                   removable="false"
+                   title="&appmenu.title;">
+        <toolbarbutton id="PanelUI-menu-button"
+                       class="toolbarbutton-1"
+                       label="&brandShortName;"
+                       tooltiptext="&appmenu.title;"
+                       oncommand="PanelUI.toggle(event);"/>
+      </toolbaritem>
+
+      <hbox id="window-controls" hidden="true" pack="end">
+        <toolbarbutton id="minimize-button"
+                       tooltiptext="&fullScreenMinimize.tooltip;"
+                       oncommand="window.minimize();"/>
+
+        <toolbarbutton id="restore-button"
+                       tooltiptext="&fullScreenRestore.tooltip;"
+                       oncommand="BrowserFullScreen();"/>
+
+        <toolbarbutton id="close-button"
+                       tooltiptext="&fullScreenClose.tooltip;"
+                       oncommand="BrowserTryToCloseWindow();"/>
+      </hbox>
+    </toolbar>
+
+    <toolbarset id="customToolbars" context="toolbar-context-menu"/>
+
+    <toolbar id="PersonalToolbar"
+             mode="icons" iconsize="small" defaulticonsize="small"
+             lockiconsize="true"
+             class="chromeclass-directories"
+             context="toolbar-context-menu"
+             defaultset="personal-bookmarks"
+             toolbarname="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;"
+             collapsed="true"
+             customizable="true">
+      <toolbaritem flex="1" id="personal-bookmarks" title="&bookmarksItem.title;"
+                   removable="true">
+        <hbox flex="1"
+              id="PlacesToolbar"
+              context="placesContext"
+              onclick="BookmarksEventHandler.onClick(event, this._placesView);"
+              oncommand="BookmarksEventHandler.onCommand(event, this._placesView);"
+              tooltip="bhTooltip"
+              popupsinherittooltip="true">
+          <toolbarbutton class="bookmark-item bookmarks-toolbar-customize"
+                         mousethrough="never"
+                         label="&bookmarksToolbarItem.label;"/>
+          <hbox flex="1">
+            <hbox align="center">
+              <image id="PlacesToolbarDropIndicator"
+                     mousethrough="always"
+                     collapsed="true"/>
+            </hbox>
+            <scrollbox orient="horizontal"
+                       id="PlacesToolbarItems"
+                       flex="1"/>
+            <toolbarbutton type="menu"
+                           id="PlacesChevron"
+                           class="chevron"
+                           mousethrough="never"
+                           collapsed="true"
+                           tooltiptext="&bookmarksToolbarChevron.tooltip;"
+                           onpopupshowing="document.getElementById('PlacesToolbar')
+                                                   ._placesView._onChevronPopupShowing(event);">
+              <menupopup id="PlacesChevronPopup"
+                         placespopup="true"
+                         tooltip="bhTooltip" popupsinherittooltip="true"
+                         context="placesContext"/>
+            </toolbarbutton>
+          </hbox>
+        </hbox>
+      </toolbaritem>
+    </toolbar>
+
+#ifdef MENUBAR_CAN_AUTOHIDE
+#ifndef CAN_DRAW_IN_TITLEBAR
+#define APPMENU_ON_TABBAR
+#endif
+#endif
+
+
+    <toolbar id="TabsToolbar"
+             class="toolbar-primary"
+             fullscreentoolbar="true"
+             customizable="true"
+             mode="icons" lockmode="true"
+             iconsize="small" defaulticonsize="small" lockiconsize="true"
+             aria-label="&tabsToolbar.label;"
+             context="toolbar-context-menu"
+#ifdef APPMENU_ON_TABBAR
+             defaultset="appmenu-toolbar-button,tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton"
+#else
+             defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton"
+#endif
+             collapsed="true">
+
+#ifdef APPMENU_ON_TABBAR
+      <toolbarbutton id="appmenu-toolbar-button"
+                     class="chromeclass-toolbar-additional"
+                     type="menu"
+                     label="&brandShortName;"
+                     tooltiptext="&appMenuButton.tooltip;">
+#include browser-appmenu.inc
+      </toolbarbutton>
+#endif
+
+      <tabs id="tabbrowser-tabs"
+            class="tabbrowser-tabs"
+            tabbrowser="content"
+            flex="1"
+            setfocus="false"
+            tooltip="tabbrowser-tab-tooltip"
+            stopwatchid="FX_TAB_CLICK_MS">
+        <tab class="tabbrowser-tab" selected="true" fadein="true"/>
+      </tabs>
+
+      <toolbarbutton id="new-tab-button"
+                     class="toolbarbutton-1 chromeclass-toolbar-additional"
+                     label="&tabCmd.label;"
+                     command="cmd_newNavigatorTab"
+                     onclick="checkForMiddleClick(this, event);"
+                     tooltiptext="&newTabButton.tooltip;"
+                     ondrop="newTabButtonObserver.onDrop(event)"
+                     ondragover="newTabButtonObserver.onDragOver(event)"
+                     ondragenter="newTabButtonObserver.onDragOver(event)"
+                     ondragexit="newTabButtonObserver.onDragExit(event)"
+                     removable="true"/>
+
+      <toolbarbutton id="alltabs-button"
+                     class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button"
+                     type="menu"
+                     label="&listAllTabs.label;"
+                     tooltiptext="&listAllTabs.label;"
+                     removable="true">
+        <menupopup id="alltabs-popup"
+                   position="after_end">
+          <menuitem id="menu_tabview"
+                    class="menuitem-iconic"
+                    key="key_tabview"
+                    label="&viewTabGroups.label;"
+                    command="Browser:ToggleTabView"
+                    observes="tabviewGroupsNumber"/>
+          <menuseparator id="alltabs-popup-separator"/>
+        </menupopup>
+      </toolbarbutton>
+
+      <toolbarbutton id="tabs-closebutton"
+                     class="close-button tabs-closebutton"
+                     command="cmd_close"
+                     label="&closeTab.label;"
+                     tooltiptext="&closeTab.label;"/>
+
+#ifdef CAN_DRAW_IN_TITLEBAR
+      <hbox class="titlebar-placeholder" type="appmenu-button" ordinal="0"/>
+      <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"/>
+#endif
+    </toolbar>
+
+    <toolbarpalette id="BrowserToolbarPalette">
+
+# Update primaryToolbarButtons in browser/themes/shared/browser.inc when adding
+# or removing default items with the toolbarbutton-1 class.
+
       <toolbaritem id="search-container" title="&searchItem.title;"
                    align="center" class="chromeclass-toolbar-additional"
                    flex="100" persist="width" removable="true">
@@ -817,160 +987,6 @@
         </toolbarbutton>
       </toolbaritem>
 
-      <hbox id="window-controls" hidden="true" pack="end">
-        <toolbarbutton id="minimize-button"
-                       tooltiptext="&fullScreenMinimize.tooltip;"
-                       oncommand="window.minimize();"/>
-
-        <toolbarbutton id="restore-button"
-                       tooltiptext="&fullScreenRestore.tooltip;"
-                       oncommand="BrowserFullScreen();"/>
-
-        <toolbarbutton id="close-button"
-                       tooltiptext="&fullScreenClose.tooltip;"
-                       oncommand="BrowserTryToCloseWindow();"/>
-      </hbox>
-    </toolbar>
-
-    <toolbarset id="customToolbars" context="toolbar-context-menu"/>
-
-    <toolbar id="PersonalToolbar"
-             mode="icons" iconsize="small" defaulticonsize="small"
-             lockiconsize="true"
-             class="chromeclass-directories"
-             context="toolbar-context-menu"
-             defaultset="personal-bookmarks"
-             toolbarname="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;"
-             collapsed="true"
-             customizable="true">
-      <toolbaritem flex="1" id="personal-bookmarks" title="&bookmarksItem.title;"
-                   removable="true">
-        <hbox flex="1"
-              id="PlacesToolbar"
-              context="placesContext"
-              onclick="BookmarksEventHandler.onClick(event, this._placesView);"
-              oncommand="BookmarksEventHandler.onCommand(event, this._placesView);"
-              tooltip="bhTooltip"
-              popupsinherittooltip="true">
-          <toolbarbutton class="bookmark-item bookmarks-toolbar-customize"
-                         mousethrough="never"
-                         label="&bookmarksToolbarItem.label;"/>
-          <hbox flex="1">
-            <hbox align="center">
-              <image id="PlacesToolbarDropIndicator"
-                     mousethrough="always"
-                     collapsed="true"/>
-            </hbox>
-            <scrollbox orient="horizontal"
-                       id="PlacesToolbarItems"
-                       flex="1"/>
-            <toolbarbutton type="menu"
-                           id="PlacesChevron"
-                           class="chevron"
-                           mousethrough="never"
-                           collapsed="true"
-                           tooltiptext="&bookmarksToolbarChevron.tooltip;"
-                           onpopupshowing="document.getElementById('PlacesToolbar')
-                                                   ._placesView._onChevronPopupShowing(event);">
-              <menupopup id="PlacesChevronPopup"
-                         placespopup="true"
-                         tooltip="bhTooltip" popupsinherittooltip="true"
-                         context="placesContext"/>
-            </toolbarbutton>
-          </hbox>
-        </hbox>
-      </toolbaritem>
-    </toolbar>
-
-#ifdef MENUBAR_CAN_AUTOHIDE
-#ifndef CAN_DRAW_IN_TITLEBAR
-#define APPMENU_ON_TABBAR
-#endif
-#endif
-
-
-    <toolbar id="TabsToolbar"
-             class="toolbar-primary"
-             fullscreentoolbar="true"
-             customizable="true"
-             mode="icons" lockmode="true"
-             iconsize="small" defaulticonsize="small" lockiconsize="true"
-             aria-label="&tabsToolbar.label;"
-             context="toolbar-context-menu"
-#ifdef APPMENU_ON_TABBAR
-             defaultset="appmenu-toolbar-button,tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton"
-#else
-             defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton"
-#endif
-             collapsed="true">
-
-#ifdef APPMENU_ON_TABBAR
-      <toolbarbutton id="appmenu-toolbar-button"
-                     class="chromeclass-toolbar-additional"
-                     type="menu"
-                     label="&brandShortName;"
-                     tooltiptext="&appMenuButton.tooltip;">
-#include browser-appmenu.inc
-      </toolbarbutton>
-#endif
-
-      <tabs id="tabbrowser-tabs"
-            class="tabbrowser-tabs"
-            tabbrowser="content"
-            flex="1"
-            setfocus="false"
-            tooltip="tabbrowser-tab-tooltip"
-            stopwatchid="FX_TAB_CLICK_MS">
-        <tab class="tabbrowser-tab" selected="true" fadein="true"/>
-      </tabs>
-
-      <toolbarbutton id="new-tab-button"
-                     class="toolbarbutton-1 chromeclass-toolbar-additional"
-                     label="&tabCmd.label;"
-                     command="cmd_newNavigatorTab"
-                     onclick="checkForMiddleClick(this, event);"
-                     tooltiptext="&newTabButton.tooltip;"
-                     ondrop="newTabButtonObserver.onDrop(event)"
-                     ondragover="newTabButtonObserver.onDragOver(event)"
-                     ondragenter="newTabButtonObserver.onDragOver(event)"
-                     ondragexit="newTabButtonObserver.onDragExit(event)"
-                     removable="true"/>
-
-      <toolbarbutton id="alltabs-button"
-                     class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button"
-                     type="menu"
-                     label="&listAllTabs.label;"
-                     tooltiptext="&listAllTabs.label;"
-                     removable="true">
-        <menupopup id="alltabs-popup"
-                   position="after_end">
-          <menuitem id="menu_tabview"
-                    class="menuitem-iconic"
-                    key="key_tabview"
-                    label="&viewTabGroups.label;"
-                    command="Browser:ToggleTabView"
-                    observes="tabviewGroupsNumber"/>
-          <menuseparator id="alltabs-popup-separator"/>
-        </menupopup>
-      </toolbarbutton>
-
-      <toolbarbutton id="tabs-closebutton"
-                     class="close-button tabs-closebutton"
-                     command="cmd_close"
-                     label="&closeTab.label;"
-                     tooltiptext="&closeTab.label;"/>
-
-#ifdef CAN_DRAW_IN_TITLEBAR
-      <hbox class="titlebar-placeholder" type="appmenu-button" ordinal="0"/>
-      <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"/>
-#endif
-    </toolbar>
-
-    <toolbarpalette id="BrowserToolbarPalette">
-
-# Update primaryToolbarButtons in browser/themes/shared/browser.inc when adding
-# or removing default items with the toolbarbutton-1 class.
-
       <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                      label="&printButton.label;" command="cmd_print"
                      tooltiptext="&printButton.tooltip;"/>
@@ -1077,45 +1093,49 @@
 
   <hbox id="fullscr-toggler" collapsed="true"/>
 
-  <hbox flex="1" id="browser">
-    <vbox id="browser-border-start" hidden="true" layer="true"/>
-    <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
-      <sidebarheader id="sidebar-header" align="center">
-        <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
-        <image id="sidebar-throbber"/>
-        <toolbarbutton class="tabs-closebutton" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/>
-      </sidebarheader>
-      <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true"
-                style="min-width: 14em; width: 18em; max-width: 36em;"/>
-    </vbox>
+  <deck id="content-deck" flex="1">
+    <hbox flex="1" id="browser">
+      <vbox id="browser-border-start" hidden="true" layer="true"/>
+      <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
+        <sidebarheader id="sidebar-header" align="center">
+          <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
+          <image id="sidebar-throbber"/>
+          <toolbarbutton class="tabs-closebutton" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/>
+        </sidebarheader>
+        <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true"
+                  style="min-width: 14em; width: 18em; max-width: 36em;"/>
+      </vbox>
 
-    <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
-    <vbox id="appcontent" flex="1">
-      <tabbrowser id="content" disablehistory="true"
-                  flex="1" contenttooltip="aHTMLTooltip"
-                  tabcontainer="tabbrowser-tabs"
-                  contentcontextmenu="contentAreaContextMenu"
-                  autocompletepopup="PopupAutoComplete"/>
-      <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/>
-      <statuspanel id="statusbar-display" inactive="true"/>
-    </vbox>
-    <splitter id="social-sidebar-splitter"
-              class="chromeclass-extrachrome sidebar-splitter"
-              observes="socialSidebarBroadcaster"/>
-    <vbox id="social-sidebar-box"
-          class="chromeclass-extrachrome"
-          observes="socialSidebarBroadcaster"
-          persist="width">
-      <browser id="social-sidebar-browser"
-               type="content"
-               context="contentAreaContextMenu"
-               disableglobalhistory="true"
-               tooltip="aHTMLTooltip"
-               flex="1"
-               style="min-width: 14em; width: 18em; max-width: 36em;"/>
-    </vbox>
-    <vbox id="browser-border-end" hidden="true" layer="true"/>
-  </hbox>
+      <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
+      <vbox id="appcontent" flex="1">
+        <tabbrowser id="content" disablehistory="true"
+                    flex="1" contenttooltip="aHTMLTooltip"
+                    tabcontainer="tabbrowser-tabs"
+                    contentcontextmenu="contentAreaContextMenu"
+                    autocompletepopup="PopupAutoComplete"
+                    onclick="contentAreaClick(event, false);"/>
+        <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/>
+        <statuspanel id="statusbar-display" inactive="true"/>
+      </vbox>
+      <splitter id="social-sidebar-splitter"
+                class="chromeclass-extrachrome sidebar-splitter"
+                observes="socialSidebarBroadcaster"/>
+      <vbox id="social-sidebar-box"
+            class="chromeclass-extrachrome"
+            observes="socialSidebarBroadcaster"
+            persist="width">
+        <browser id="social-sidebar-browser"
+                 type="content"
+                 context="contentAreaContextMenu"
+                 disableglobalhistory="true"
+                 tooltip="aHTMLTooltip"
+                 flex="1"
+                 style="min-width: 14em; width: 18em; max-width: 36em;"/>
+      </vbox>
+      <vbox id="browser-border-end" hidden="true" layer="true"/>
+    </hbox>
+#include customize.inc
+  </deck>
 
   <hbox id="full-screen-warning-container" hidden="true" fadeout="true">
     <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
diff --git a/browser/base/content/customize.inc b/browser/base/content/customize.inc
new file mode 100644
index 000000000000..4a03070435cc
--- /dev/null
+++ b/browser/base/content/customize.inc
@@ -0,0 +1,36 @@
+<!-- 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/. -->
+
+<vbox id="customization-container" flex="1" style="background: #DBEAF9;">
+  <hbox flex="1">
+    <richlistbox id="customization-categories"
+                 onselect="document.getElementById('customization-content').selectedIndex = this.selectedIndex;">
+      <richlistitem>
+        <label value="&customizeMode.menuAndToolbars.label;"/>
+        </richlistitem>
+        <richlistitem>
+        <label value="&customizeMode.appearance.label;"/>
+      </richlistitem>
+    </richlistbox>
+    <deck id="customization-content" flex="1">
+      <hbox id="customization-widgets">
+        <vbox flex="1">
+          <label value="&customizeMode.menuAndToolbars.header;"/>
+          <vbox id="customization-palette" flex="1" style="display: block;"/>
+        </vbox>
+        <vbox>
+          <hbox id="customization-panelHolder"/>
+          <spacer flex="1"/>
+        </vbox>
+      </hbox>
+      <vbox id="customization-appearance">
+        <label value="&customizeMode.appearance.header;"/>
+      </vbox>
+    </deck>
+  </hbox>
+  <hbox pack="end">
+    <button oncommand="gCustomizeMode.reset();" label="&customizeMode.restoreDefaults;"/>
+    <button oncommand="BrowserToolboxCustomizeDone();" label="&customizeMode.done;"/>
+  </hbox>
+</vbox>
diff --git a/browser/base/content/customizing.xhtml b/browser/base/content/customizing.xhtml
new file mode 100644
index 000000000000..7abd16c7248b
--- /dev/null
+++ b/browser/base/content/customizing.xhtml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!DOCTYPE html [
+  <!ENTITY % htmlDTD
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "DTD/xhtml1-strict.dtd">
+  %htmlDTD;
+  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+  <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
+  %browserDTD;
+]>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>&customizeMode.tabTitle;</title>
+	</head>
+	<body></body>
+</html>
diff --git a/browser/base/content/global-scripts.inc b/browser/base/content/global-scripts.inc
index b4de574ae922..a02805edaba1 100755
--- a/browser/base/content/global-scripts.inc
+++ b/browser/base/content/global-scripts.inc
@@ -9,5 +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://global/content/inlineSpellCheckUI.js"/>
 <script type="application/javascript" src="chrome://global/content/viewSourceUtils.js"/>
diff --git a/browser/base/content/panelUI.inc b/browser/base/content/panelUI.inc
new file mode 100644
index 000000000000..8a8cb2cf687b
--- /dev/null
+++ b/browser/base/content/panelUI.inc
@@ -0,0 +1,78 @@
+<!-- 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/. -->
+
+<panel id="PanelUI-popup"
+       role="group"
+       type="arrow"
+       level="top"
+       consumeoutsideclicks="true">
+  <box id="PanelUI-container">
+    <stack id="PanelUI-viewStack" view="main">
+      <vbox id="PanelUI-mainView">
+        <vbox class="PanelUI-pageControls" pack="center">
+          <hbox class="PanelUI-editControls">
+            <toolbarbutton id="PanelUI-cut-btn" flex="1"
+                           label="&cutCmd.label;"
+                           tooltiptext="&cutButton.tooltip;"
+                           command="cmd_cut"/>
+            <toolbarbutton id="PanelUI-copy-btn" flex="1"
+                           label="&copyCmd.label;"
+                           tooltiptext="&copyButton.tooltip;"
+                           command="cmd_copy"/>
+            <toolbarbutton id="PanelUI-paste-btn" flex="1"
+                           label="&pasteCmd.label;"
+                           tooltiptext="&pasteButton.tooltip;"
+                           command="cmd_paste"/>
+          </hbox>
+          <hbox class="PanelUI-zoomControls">
+            <toolbarbutton id="PanelUI-zoomOut-btn" flex="1"
+                           noautoclose="true" label="&fullZoomReduceCmd.label;"
+                           command="cmd_fullZoomReduce"
+                           tooltiptext="&zoomOutButton.tooltip;"/>
+            <toolbarbutton id="PanelUI-zoomReset-btn" flex="1"
+                           noautoclose="true" label="&zoomReset.label;"
+                           tooltiptext="&zoomReset.tooltip;"
+                           command="cmd_fullZoomReset"/>
+            <toolbarbutton id="PanelUI-zoomIn-btn" flex="1"
+                           noautoclose="true" label="&fullZoomEnlargeCmd.label;"
+                           command="cmd_fullZoomEnlarge"
+                           tooltiptext="&zoomInButton.tooltip;"/>
+          </hbox>
+        </vbox>
+
+        <vbox id="PanelUI-contents" type="grid"/>
+
+        <vbox id="PanelUI-mainView-spring"/>
+
+        <hbox class="PanelUI-footer" align="center">
+          <toolbarbutton id="PanelUI-help-btn" label="&helpMenu.label;"
+                         command="openHelpLink('firefox-help');"/>
+          <spacer flex="1"/>
+          <toolbarbutton id="PanelUI-customize-btn" label="&appMenuCustomize.label;"
+                         command="cmd_CustomizeToolbars"/>
+        </hbox>
+      </vbox>
+
+      <!-- Used to capture click events over the PanelUI-mainView if we're in
+           subview mode. That way, any click on the PanelUI-mainView causes us
+           to revert to the mainView mode, whereupon PanelUI-click-capture then
+           allows click events to go through it. -->
+      <box id="PanelUI-clickCapturer">
+      </box>
+
+      <deck id="PanelUI-subViews" flex="1">
+        <vbox id="PanelUI-bookmarks" flex="1">
+          <label value="&appMenuBookmarks.label;"/>
+          <vbox flex="1">
+            <toolbarbutton label="&bookmarkThisPageCmd.label;"/>
+            <toolbarbutton label="&viewBookmarksToolbar.label;"/>
+            <toolbarbutton label="&showAllBookmarks2.label;"/>
+            <spacer flex="1"/>
+          </vbox>
+          <vbox id="PanelUI-bookmarks-tall-maker" />
+        </vbox>
+      </deck>
+    </stack>
+  </box>
+</panel>
diff --git a/browser/base/content/panelUI.js b/browser/base/content/panelUI.js
new file mode 100644
index 000000000000..93e9cf4b5b3c
--- /dev/null
+++ b/browser/base/content/panelUI.js
@@ -0,0 +1,243 @@
+/* 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/. */
+
+XPCOMUtils.defineLazyModuleGetter(this, "CustomizableUI",
+                                  "resource:///modules/CustomizableUI.jsm");
+/**
+ * Maintains the state and dispatches events for the main menu panel.
+ */
+
+const PanelUI = {
+  /** Panel events that we listen for. **/
+  get kEvents() ["popupshowing", "popupshown", "popuphiding", "popuphidden"],
+  /**
+   * Used for lazily getting and memoizing elements from the document. Lazy
+   * getters are set in init, and memoizing happens after the first retrieval.
+   */
+  get kElements() {
+    return {
+      clickCapturer: "PanelUI-clickCapturer",
+      container: "PanelUI-container",
+      contents: "PanelUI-contents",
+      mainView: "PanelUI-mainView",
+      mainViewSpring: "PanelUI-mainView-spring",
+      menuButton: "PanelUI-menu-button",
+      panel: "PanelUI-popup",
+      subViews: "PanelUI-subViews",
+      viewStack: "PanelUI-viewStack"
+    };
+  },
+
+  /**
+   * Returns whether we're in subview mode. This can return true even if
+   * the transition to subview mode is not yet complete.
+   **/
+  get _showingSubView() {
+    return (this.viewStack.hasAttribute("view") &&
+            this.viewStack.getAttribute("view") == "subview");
+  },
+
+  /**
+   * If true, puts us into subview mode, which slides the subview deck over
+   * and adjusts the height of the panel accordingly.
+   *
+   * @param aVal
+   *        True if we should be in subview mode.
+   */
+  set _showingSubView(aVal) {
+    if (aVal) {
+      let oldHeight = this.mainView.clientHeight;
+      this.viewStack.setAttribute("view", "subview");
+      this.mainViewSpring.style.height = this.subViews.scrollHeight - oldHeight + "px";
+      this.container.style.height = this.subViews.scrollHeight + "px";
+    } else {
+      this.viewStack.setAttribute("view", "main");
+      let springHeight = this.mainViewSpring.getBoundingClientRect().height;
+      this.container.style.height = (this.mainView.scrollHeight - springHeight) + "px";
+      this.mainViewSpring.style.height = "";
+    }
+
+    return aVal;
+  },
+
+  init: function() {
+    for (let [k, v] of Iterator(this.kElements)) {
+      // Need to do fresh let-bindings per iteration
+      let getKey = k;
+      let id = v;
+      this.__defineGetter__(getKey, function() {
+        delete this[getKey];
+        return this[getKey] = document.getElementById(id);
+      });
+    }
+
+    for (let event of this.kEvents) {
+      this.panel.addEventListener(event, this);
+    }
+
+    this.clickCapturer.addEventListener("click", this._onCapturerClick,
+                                        true);
+  },
+
+  uninit: function() {
+    for (let event of this.kEvents) {
+      this.panel.removeEventListener(event, this);
+    }
+
+    this.clickCapturer.removeEventListener("click", this._onCapturerClick,
+                                           true);
+  },
+
+  /**
+   * Customize mode extracts the mainView and puts it somewhere else while the
+   * user customizes. Upon completion, this function can be called to put the
+   * panel back to where it belongs in normal browsing mode.
+   *
+   * @param aMainView
+   *        The mainView node to put back into place.
+   */
+  replaceMainView: function(aMainView) {
+    this.viewStack.insertBefore(aMainView, this.viewStack.firstChild);
+  },
+
+  /**
+   * Opens the menu panel if it's closed, or closes it if it's
+   * open. If the event target has a child with the toolbarbutton-icon
+   * attribute, the panel will be anchored on that child. Otherwise, the panel
+   * is anchored on the event target itself.
+   *
+   * @param aEvent the event that triggers the toggle.
+   */
+  toggle: function(aEvent) {
+    if (this.panel.state == "open") {
+      this.hide();
+    } else if (this.panel.state == "closed") {
+      let anchor = aEvent.target;
+      let iconAnchor =
+        document.getAnonymousElementByAttribute(anchor, "class",
+                                                "toolbarbutton-icon");
+      this.panel.openPopup(iconAnchor || anchor, "bottomcenter topright");
+    }
+  },
+
+  /**
+   * If the menu panel is being shown, hide it.
+   */
+  hide: function() {
+    this.panel.hidePopup();
+    this.showMainView();
+  },
+
+  handleEvent: function(aEvent) {
+    switch (aEvent.type) {
+      case "popupshowing":
+        CustomizableUI.registerMenuPanel(this.contents);
+        let cstyle = window.getComputedStyle(this.viewStack, null);
+        this.container.style.height = cstyle.getPropertyValue("height");
+        this.container.style.width = cstyle.getPropertyValue("width");
+        // Fall through
+      case "popupshown":
+        // Fall through
+      case "popuphiding":
+        // Fall through
+      case "popuphidden": {
+        this._updatePanelButton(aEvent.target);
+        break;
+      }
+    }
+  },
+
+  /**
+   * Switch the panel to the main view if it's not already
+   * in that view.
+   */
+  showMainView: function() {
+    // Are we showing a subview? If so, fire the ViewHiding event on it.
+    if (this._showingSubView) {
+      let viewNode = this.subViews.selectedPanel;
+      let evt = document.createEvent("CustomEvent");
+      evt.initCustomEvent("ViewHiding", true, true, viewNode);
+      viewNode.dispatchEvent(evt);
+    }
+
+    this._shiftMainView();
+    this._showingSubView = false;
+  },
+
+  /**
+   * Shows a subview in the panel with a given ID.
+   *
+   * @param aViewId the ID of the subview to show.
+   */
+  showSubView: function(aViewId, aAnchor) {
+    let viewNode = document.getElementById(aViewId);
+    if (!viewNode) {
+      Cu.reportError("Could not show panel subview with id: " + aViewId);
+      return;
+    }
+
+    if (!aAnchor) {
+      Cu.reportError("Expected an anchor when opening subview with id: " + aViewId);
+      return;
+    }
+
+    // Emit the ViewShowing event so that the widget definition has a chance
+    // to lazily populate the subview with things.
+    let evt = document.createEvent("CustomEvent");
+    evt.initCustomEvent("ViewShowing", true, true, viewNode);
+    viewNode.dispatchEvent(evt);
+
+    this.subViews.selectedPanel = viewNode;
+
+    // Now we have to transition to transition the panel. There are a few parts
+    // to this:
+    //
+    // 1) The main view content gets shifted so that the center of the anchor
+    //    node is at the left-most edge of the panel.
+    // 2) The subview deck slides in so that it takes up almost all of the
+    //    panel.
+    // 3) If the subview is taller then the main panel contents, then the panel
+    //    must grow to meet that new height. Otherwise, it must shrink.
+    //
+    // All three of these actions make use of CSS transformations, so they
+    // should all occur simultaneously.
+    this._shiftMainView(aAnchor);
+    this._showingSubView = true;
+  },
+
+  /**
+   * Sets the anchor node into the open or closed state, depending
+   * on the state of the panel.
+   */
+  _updatePanelButton: function() {
+    this.menuButton.open = this.panel.state == "open" ||
+                           this.panel.state == "showing";
+  },
+
+  /**
+   * 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
+   * at the clipping edge. If aAnchor is undefined or null, the main view
+   * content is shifted back to its original position.
+   */
+  _shiftMainView: function(aAnchor) {
+    if (aAnchor) {
+      // We need to find the left edge of the anchor, relative to the main
+      // panel. Then we need to add half the width of the anchor. This is the
+      // target that we need to transition to.
+      let anchorRect = aAnchor.getBoundingClientRect();
+      let mainViewRect = this.mainView.getBoundingClientRect();
+      let leftEdge = anchorRect.left - mainViewRect.left;
+      let center = (anchorRect.width / 2);
+      let target = leftEdge + center;
+      this.mainView.style.transform = "translateX(-" + target + "px)";
+    } else {
+      this.mainView.style.transform = "";
+    }
+  },
+
+  _onCapturerClick: function(aEvent) {
+    PanelUI.showMainView();
+  },
+};
diff --git a/browser/base/content/panelUI.xml b/browser/base/content/panelUI.xml
new file mode 100644
index 000000000000..1ef86ddd62ae
--- /dev/null
+++ b/browser/base/content/panelUI.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<bindings id="browserPanelUIBindings"
+          xmlns="http://www.mozilla.org/xbl"
+          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+          xmlns:xbl="http://www.mozilla.org/xbl">
+
+  <binding id="toolbarbutton" display="xul:button"
+           extends="chrome://global/content/bindings/button.xml#button-base">
+    <resources>
+      <stylesheet src="chrome://global/skin/toolbarbutton.css"/>
+    </resources>
+    
+    <content>
+      <children includes="observes|template|menupopup|panel|tooltip"/>
+      <xul:hbox align="center" flex="1">
+	      <xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,label"/>
+	      <xul:vbox flex="1">
+	  	    <xul:label class="toolbarbutton-text" crop="right" flex="1"
+  	  	             xbl:inherits="value=label,accesskey,crop"/>
+  	  	  <xul:hbox pack="end">
+	  	  	  <xul:label class="toolbarbutton-acceltext" crop="middle"
+  		  	  	         xbl:inherits="value=acceltext"/>
+  		  	</xul:hbox>
+  		  </xul:vbox>
+  		</xul:hbox>
+    </content>
+    
+    <implementation implements="nsIAccessibleProvider">
+      <property name="accessibleType" readonly="true">
+        <getter>
+          return Components.interfaces.nsIAccessibleProvider.XULToolbarButton;
+        </getter>
+      </property>
+    </implementation>
+  </binding>
+</bindings>
diff --git a/browser/base/content/panelUIOverlay.js b/browser/base/content/panelUIOverlay.js
new file mode 100644
index 000000000000..0fdad43ab058
--- /dev/null
+++ b/browser/base/content/panelUIOverlay.js
@@ -0,0 +1,9 @@
+/* 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/. */
+
+if (typeof XPCOMUtils == "undefined")
+  Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "CustomizableUI",
+                                  "resource:///modules/CustomizableUI.jsm");
diff --git a/browser/base/content/panelUIOverlay.xul b/browser/base/content/panelUIOverlay.xul
new file mode 100644
index 000000000000..b8245cff1802
--- /dev/null
+++ b/browser/base/content/panelUIOverlay.xul
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!DOCTYPE overlay [
+  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
+  %brandDTD;
+  <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
+  %browserDTD;
+]>
+
+<?xml-stylesheet href="chrome://browser/skin/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"/>
+
+  <hbox id="app-extension-point-end">
+    <toolbarbutton id="PanelUI-menu-button"
+                   class="toolbarbutton-1"
+                   label="&brandShortName;"
+                   tooltiptext="&appmenu.title;"
+                   oncommand="CustomizableUI.showPanel(this);"/>
+  </hbox>
+</overlay>
diff --git a/browser/base/content/toolbar.xml b/browser/base/content/toolbar.xml
new file mode 100644
index 000000000000..39fef596b140
--- /dev/null
+++ b/browser/base/content/toolbar.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<bindings id="browserToolbarBindings"
+          xmlns="http://www.mozilla.org/xbl"
+          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+          xmlns:xbl="http://www.mozilla.org/xbl">
+
+  <binding id="toolbar">
+    <implementation implements="nsIAccessibleProvider">
+      <property name="accessibleType" readonly="true">
+        <getter>
+          return Components.interfaces.nsIAccessibleProvider.XULToolbar;
+        </getter>
+      </property>
+
+      <constructor><![CDATA[
+          if (document.readyState == "complete") {
+            this._init();
+          } else {
+            // Need to wait until XUL overlays are loaded. See bug 554279.
+            let self = this;
+            document.addEventListener("readystatechange", function onReadyStateChange() {
+              if (document.readyState != "complete")
+                return;
+              document.removeEventListener("readystatechange", onReadyStateChange, false);
+              self._init();
+            }, false);
+          }
+      ]]></constructor>
+
+      <method name="_init">
+        <body><![CDATA[
+          let scope = {};
+          Cu.import("resource:///modules/CustomizableUI.jsm", scope);
+          let CustomizableUI = scope.CustomizableUI;
+
+          // Searching for the toolbox palette in the toolbar binding because
+          // toolbars are constructed first.
+          let toolbox = this.toolbox;
+          if (toolbox && !toolbox.palette) {
+            for (let node of toolbox.children) {
+              if (node.localName == "toolbarpalette") {
+                // Hold on to the palette but remove it from the document.
+                toolbox.palette = node;
+                toolbox.removeChild(node);
+              }
+            }
+          }
+
+          CustomizableUI.registerToolbar(this);
+        ]]></body>
+      </method>
+
+      <property name="toolbarName"
+                onget="return this.getAttribute('toolbarname');"
+                onset="this.setAttribute('toolbarname', val); return val;"/>
+
+      <property name="customizationTarget" readonly="true">
+        <getter><![CDATA[
+          if (this._customizationTarget)
+            return this._customizationTarget;
+
+          let id = this.getAttribute("customizationtarget");
+          if (id)
+            this._customizationTarget = document.getElementById(id);
+          
+          if (!this._customizationTarget)
+            this._customizationTarget = this;
+
+          return this._customizationTarget;
+        ]]></getter>
+      </property>
+
+      <property name="toolbox" readonly="true">
+        <getter><![CDATA[
+          if (this._toolbox)
+            return this._toolbox;
+
+          let toolboxId = this.getAttribute("toolboxid");
+          if (toolboxId) {
+            let toolbox = document.getElementById(toolboxId);
+            if (toolbox) {
+              if (toolbox.externalToolbars.indexOf(this) == -1)
+                toolbox.externalToolbars.push(this);
+
+              this._toolbox = toolbox;
+            }
+          }
+
+          if (!this._toolbox && this.parentNode &&
+              this.parentNode.localName == "toolbox") {
+            this._toolbox = this.parentNode;
+          }
+
+          return this._toolbox;
+        ]]></getter>
+      </property>
+    </implementation>
+  </binding>
+
+</bindings>
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index 91e96ce769f5..f9cac5b2df3d 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -13,8 +13,14 @@ browser.jar:
 #endif
 %  overlay chrome://global/content/viewSource.xul chrome://browser/content/viewSourceOverlay.xul
 %  overlay chrome://global/content/viewPartialSource.xul chrome://browser/content/viewSourceOverlay.xul
-%  style chrome://global/content/customizeToolbar.xul chrome://browser/content/browser.css
-%  style chrome://global/content/customizeToolbar.xul chrome://browser/skin/
+
+# 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)
@@ -60,6 +66,7 @@ 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)
@@ -72,6 +79,9 @@ 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)
@@ -91,6 +101,8 @@ 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 3e672a9bb09f..ec843c4cc841 100644
--- a/browser/components/about/AboutRedirector.cpp
+++ b/browser/components/about/AboutRedirector.cpp
@@ -84,6 +84,8 @@ static RedirEntry kRedirMap[] = {
   { "healthreport", "chrome://browser/content/abouthealthreport/abouthealth.xhtml",
     nsIAboutModule::ALLOW_SCRIPT },
 #endif
+  { "customizing", "chrome://browser/content/customizing.xhtml",
+    nsIAboutModule::ALLOW_SCRIPT },
 };
 static const int kRedirTotal = NS_ARRAY_LENGTH(kRedirMap);
 
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
index a47bbf11477f..484ac6f88fcf 100644
--- a/browser/components/build/nsModule.cpp
+++ b/browser/components/build/nsModule.cpp
@@ -107,6 +107,7 @@ static const mozilla::Module::ContractIDEntry kBrowserContracts[] = {
 #ifdef MOZ_SERVICES_HEALTHREPORT
     { NS_ABOUT_MODULE_CONTRACTID_PREFIX "healthreport", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
 #endif
+    { NS_ABOUT_MODULE_CONTRACTID_PREFIX "customizing", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
 #if defined(XP_WIN)
     { NS_IEHISTORYENUMERATOR_CONTRACTID, &kNS_WINIEHISTORYENUMERATOR_CID },
 #elif defined(XP_MACOSX)
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 92fbb15386cd..aa185ac769a2 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -15,6 +15,8 @@
                                                                 inside the private browsing mode -->
 <!ENTITY mainWindow.titlePrivateBrowsingSuffix "(Private Browsing)">
 
+<!ENTITY appmenu.title                       "Customize and Control &brandFullName;">
+
 <!-- Tab context menu -->
 <!ENTITY  reloadTab.label                    "Reload Tab">
 <!ENTITY  reloadTab.accesskey                "R">
@@ -319,6 +321,8 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY appMenuGettingStarted.label "Getting Started">
 <!ENTITY appMenuSafeMode.label "Restart with Add-ons Disabled…">
 <!ENTITY appMenuSafeMode.accesskey "R">
+<!ENTITY appMenuBack.label "Back">
+<!ENTITY appMenuBookmarks.label "Bookmarks">
 
 <!ENTITY openCmd.commandkey           "l">
 <!ENTITY urlbar.placeholder2          "Search or enter address">
@@ -530,6 +534,9 @@ you can use these alternative items. Otherwise, their values should be empty.  -
 <!ENTITY zoomOutButton.tooltip          "Zoom out">
 <!ENTITY zoomInButton.tooltip           "Zoom in">
 <!ENTITY zoomControls.label             "Zoom Controls">
+<!ENTITY zoomReset.tooltip              "Reset Zoom">
+<!-- LOCALIZATION NOTE(zoomReset.label): the &#37; is the percent symbol. -->
+<!ENTITY zoomReset.label                "100&#37;">
 
 <!ENTITY quitApplicationCmdWin.label       "Exit"> 
 <!ENTITY quitApplicationCmdWin.accesskey   "x">
@@ -639,6 +646,16 @@ just addresses the organization to follow, e.g. "This site is run by " -->
 <!ENTITY social.learnMore.accesskey "l">
 <!ENTITY social.closeNotificationItem.label "Not Now">
 
+
+
+<!ENTITY customizeMode.tabTitle "Customize &brandShortName;">
+<!ENTITY customizeMode.menuAndToolbars.label "Menu and toolbars">
+<!ENTITY customizeMode.menuAndToolbars.header "More tools to add to the menu and toolbar">
+<!ENTITY customizeMode.appearance.label "Appearance">
+<!ENTITY customizeMode.appearance.header "Bling!">
+<!ENTITY customizeMode.restoreDefaults "Restore Defaults">
+<!ENTITY customizeMode.done "Done">
+
 <!ENTITY social.chatBar.commandkey "c">
 <!ENTITY social.chatBar.label "Focus chats">
 <!ENTITY social.chatBar.accesskey "c">
diff --git a/browser/modules/CustomizableUI.jsm b/browser/modules/CustomizableUI.jsm
new file mode 100644
index 000000000000..6af465b4656b
--- /dev/null
+++ b/browser/modules/CustomizableUI.jsm
@@ -0,0 +1,1576 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+this.EXPORTED_SYMBOLS = ["CustomizableUI"];
+
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+const kNSXUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+
+const kPrefCustomizationState        = "browser.uiCustomization.state";
+const kPrefCustomizationAutoAdd      = "browser.uiCustomization.autoAdd";
+const kPrefCustomizationDebug        = "browser.uiCustomization.debug";
+
+/**
+ * Lazily returns the definitions for the set of built-in widgets. This might
+ * not be the final resting place for this stuff, but it'll do for now.
+ */
+XPCOMUtils.defineLazyGetter(this, "gBuiltInWidgets", function() {
+  return [{
+    id: "bookmarks-panelmenu",
+    type: "view",
+    viewId: "PanelUI-bookmarks",
+    name: "Bookmarks...",
+    description: "Bookmarks, yo!",
+    defaultArea: CustomizableUI.AREA_PANEL,
+    //XXXunf Need to enforce this, and make it optional.
+    allowedAreas: [CustomizableUI.AREA_PANEL],
+    icons: {
+      "16": "chrome://branding/content/icon16.png",
+      "32": "chrome://branding/content/icon48.png",
+      "48": "chrome://branding/content/icon48.png"
+    },
+    // These are automatically bound to the ViewShowing and ViewHiding events
+    // that the Panel will dispatch, targetted at the view referenced by
+    // viewId.
+    // XXXmconley: Is this too magical?
+    onViewShowing: function(aEvent) {
+      // Populate our list of bookmarks
+      // Right now, I just jam in a tall vbox to simulate making the view
+      // tall before switching to it.
+      LOG("Bookmark view is being shown!");
+      let doc = aEvent.detail.ownerDocument;
+      let vbox = doc.getElementById("PanelUI-bookmarks-tall-maker");
+      vbox.style.height = "500px";
+    },
+    onViewHiding: function(aEvent) {
+      LOG("Bookmark view is being hidden!");
+    }
+  }, {
+    id: "weather-indicator",
+    name: "Weather",
+    description: "Don't look out the window, look at your browser!",
+    defaultArea: CustomizableUI.AREA_PANEL,
+    //XXXunf Need to enforce this, and make it optional.
+    allowedAreas: [CustomizableUI.AREA_PANEL],
+    icons: {
+      "16": "chrome://branding/content/icon16.png",
+      "32": "chrome://branding/content/icon48.png",
+      "48": "chrome://branding/content/icon48.png"
+    }
+  }, {
+    id: "share-page",
+    name: "Share 1",
+    shortcut: "Ctrl+Alt+S",
+    description: "Share this page",
+    defaultArea: CustomizableUI.AREA_NAVBAR,
+    allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
+    icons: {
+      "16": "chrome://branding/content/icon16.png",
+      "32": "chrome://branding/content/icon48.png",
+      "48": "chrome://branding/content/icon48.png"
+    }
+  }, {
+    id: "share-page-2",
+    name: "Share 2",
+    shortcut: "Ctrl+Alt+S",
+    description: "Share this page",
+    defaultArea: CustomizableUI.AREA_PANEL,
+    allowedAreas: [CustomizableUI.AREA_PANEL],
+    icons: {
+      "16": "chrome://branding/content/icon16.png",
+      "32": "chrome://branding/content/icon48.png",
+      "48": "chrome://branding/content/icon48.png"
+    }
+  }, {
+    id: "share-page-3",
+    name: "Share 3",
+    shortcut: "Ctrl+Alt+S",
+    description: "Share this page",
+    allowedAreas: [CustomizableUI.AREA_PANEL],
+    icons: {
+      "16": "chrome://branding/content/icon16.png",
+      "32": "chrome://branding/content/icon48.png",
+      "48": "chrome://branding/content/icon48.png"
+    }
+  }, {
+    id: "share-page-4",
+    name: "Share 4",
+    shortcut: "Ctrl+Alt+S",
+    description: "Share this page",
+    defaultArea: CustomizableUI.AREA_PANEL,
+    allowedAreas: [CustomizableUI.AREA_PANEL],
+    icons: {
+      "16": "chrome://branding/content/icon16.png",
+      "32": "chrome://branding/content/icon48.png",
+      "48": "chrome://branding/content/icon48.png"
+    }
+  }, {
+    id: "share-page-5",
+    name: "Share 5",
+    shortcut: "Ctrl+Alt+S",
+    description: "Share this page",
+    defaultArea: CustomizableUI.AREA_PANEL,
+    allowedAreas: [CustomizableUI.AREA_PANEL],
+    icons: {
+      "16": "chrome://branding/content/icon16.png",
+      "32": "chrome://branding/content/icon48.png",
+      "48": "chrome://branding/content/icon48.png"
+    }
+  }];
+});
+
+/**
+ * The keys are the handlers that are fired when the event type (the value)
+ * is fired on the subview. A widget that provides a subview has the option
+ * of providing onViewShowing and onViewHiding event handlers.
+ */
+const kSubviewEvents = [
+  "ViewShowing",
+  "ViewHiding"
+];
+
+/**
+ * gPalette is a map of every widget that CustomizableUI.jsm knows about, keyed
+ * on their IDs.
+ */
+let gPalette = new Map();
+
+/**
+ * gAreas maps area IDs to Sets of properties about those areas. An area is a
+ * place where a widget can be put.
+ */
+let gAreas = new Map();
+
+/**
+ * gPlacements maps area IDs to Arrays of widget IDs, indicating that the widgets
+ * are placed within that area (either directly in the area node, or in the
+ * customizationTarget of the node).
+ */
+let gPlacements = new Map();
+
+/**
+ * gFuturePlacements represent placements that will happen for areas that have
+ * not yet loaded (due to lazy-loading). This can occur when add-ons register
+ * widgets.
+ */
+let gFuturePlacements = new Map();
+
+/**
+ * If the user does not have any state saved, this is the default set of
+ * placements to use.
+ */
+let gDefaultPlacements = new Map([
+  ["nav-bar", [
+    "search-container",
+    "bookmarks-menu-button-container",
+    "downloads-button",
+    "social-toolbar-button",
+    "PanelUI-button",
+    "share-page"
+  ]],
+  ["PanelUI-contents", [
+    "new-window-button",
+    "print-button",
+    "history-button",
+    "fullscreen-button",
+    "share-page-5",
+    "bookmarks-panelmenu",
+  ]]
+]);
+
+//XXXunf Temporary. Need a nice way to abstract functions to build widgets
+//       of these types.
+let gSupportedWidgetTypes = new Set(["button", "view"]);
+
+/**
+ * gSeenWidgets remembers which widgets the user has seen for the first time
+ * before. This way, if a new widget is created, and the user has not seen it
+ * before, it can be put in its default location. Otherwise, it remains in the
+ * palette.
+ */
+let gSeenWidgets = new Set();
+
+let gSavedState = null;
+let gRestoring = false;
+let gDirty = false;
+let gInBatch = false;
+
+/**
+ * gBuildAreas maps area IDs to actual area nodes within browser windows.
+ */
+let gBuildAreas = new Map();
+let gNewElementCount = 0;
+let gWrapperCache = new WeakMap();
+let gListeners = new Set();
+
+let gDebug = false;
+try {
+  gDebug = Services.prefs.getBoolPref(kPrefCustomizationDebug);
+} catch (e) {}
+
+function LOG(aMsg) {
+  if (gDebug) {
+    Services.console.logStringMessage("[CustomizableUI] " + aMsg);
+  }
+}
+function ERROR(aMsg) Cu.reportError("[CustomizableUI] " + aMsg);
+
+
+let CustomizableUIInternal = {
+  initialize: function() {
+    LOG("Initializing");
+
+    this.addListener(this);
+    this._defineBuiltInWidgets();
+    this.loadSavedState();
+
+    this.registerArea(CustomizableUI.AREA_PANEL);
+    this.registerArea(CustomizableUI.AREA_NAVBAR, ["legacy"]);
+  },
+
+  _defineBuiltInWidgets: function() {
+    //XXXunf Need to figure out how to auto-add new builtin widgets in new
+    //       app versions to already customized areas.
+    for (let widgetDefinition of gBuiltInWidgets) {
+      this.createBuiltinWidget(widgetDefinition);
+    }
+  },
+
+  wrapWidget: function(aWidgetId) {
+    let provider = this.getWidgetProvider(aWidgetId);
+    if (!provider) {
+      return null;
+    }
+
+    if (provider == CustomizableUI.PROVIDER_API) {
+      let widget = gPalette.get(aWidgetId);
+      if (!widget.wrapper) {
+        widget.wrapper = new WidgetGroupWrapper(widget);
+      }
+      return widget.wrapper;
+    }
+
+    // PROVIDER_SPECIAL gets treated the same as PROVIDER_XUL.
+    return new XULWidgetGroupWrapper(aWidgetId);
+  },
+
+  registerArea: function(aName, aProperties) {
+    if (typeof aName != "string" || !/^[a-z0-9-_]{1,}$/i.test(aName)) {
+      throw new Error("Invalid area name");
+    }
+    if (gAreas.has(aName)) {
+      throw new Error("Area already registered");
+    }
+
+    let props = new Set(aProperties);
+    gAreas.set(aName, props);
+
+    if (props.has("legacy")) {
+      // Guarantee this area exists in gFuturePlacements, to avoid checking it in
+      // various places elsewhere.
+      gFuturePlacements.set(aName, new Set());
+    } else {
+      this.restoreStateForArea(aName);
+    }
+  },
+
+  registerToolbar: function(aToolbar) {
+    let document = aToolbar.ownerDocument;
+    let area = aToolbar.id;
+
+    if (!gAreas.has(area)) {
+      throw new Error("Unknown customization area");
+    }
+
+    if (this.isBuildAreaRegistered(area, aToolbar)) {
+      return;
+    }
+
+    let areaProperties = gAreas.get(area);
+
+    if (!gPlacements.has(area) && areaProperties.has("legacy")) {
+      let legacyState = aToolbar.getAttribute("currentset");
+      if (legacyState) {
+        legacyState = legacyState.split(",");
+      }
+      //XXXunf should the legacy attribute be purged?
+      //       kinda messes up switching to older builds
+      //XXXmconley No, I don't think so - I think we want to make it easy to
+      //           switch back and forth between builds until this thing hits
+      //           release.
+      //aToolbar.removeAttribute("currentset");
+
+      // Manually restore the state here, so the legacy state can be converted. 
+      this.restoreStateForArea(area, legacyState);
+    }
+
+    this.registerBuildArea(area, aToolbar);
+
+    let placements = gPlacements.get(area);
+    this.buildArea(area, placements, aToolbar);
+  },
+
+  buildArea: function(aArea, aPlacements, aAreaNode) {
+    let document = aAreaNode.ownerDocument;
+    let container = aAreaNode.customizationTarget;
+
+    if (!container) {
+      throw new Error("Expected area " + aArea
+                      + " to have a customizationTarget attribute.");
+    }
+
+    let currentNode = container.firstChild;
+    for (let id of aPlacements) {
+      if (currentNode && currentNode.id == id) {
+        currentNode = currentNode.nextSibling;
+        continue;
+      }
+
+      let [provider, node] = this.getWidgetNode(id, document, aAreaNode.toolbox);
+      if (!node) {
+        LOG("Unknown widget: " + id);
+        continue;
+      }
+
+      if (provider == CustomizableUI.PROVIDER_XUL &&
+          aArea == CustomizableUI.AREA_PANEL) {
+        this.ensureButtonClosesPanel(node);
+      }
+
+      container.insertBefore(node, currentNode);
+    }
+
+    if (currentNode) {
+      let palette = aAreaNode.toolbox ? aAreaNode.toolbox.palette : null;
+      let limit = currentNode.previousSibling;
+      let node = container.lastChild;
+      while (node != limit) {
+        // XXXunf Deprecating the old "removable" attribute, is this right?
+        // XXXmconley I think we need to hear from UX about this.
+        if (palette) {
+          palette.appendChild(node);
+        } else {
+          container.removeChild(node);
+        }
+        node = container.lastChild;
+      }
+    }
+  },
+
+  ensureButtonClosesPanel: function(aNode) {
+    //XXXunf This seems kinda hacky, but I can't find any other reliable method.
+    //XXXunf Is it worth going to the effort to remove these when appropriate?
+    // The "command" event only gets fired if there's not an attached command
+    // (via the "command" attribute). For menus, this is handled natively, but
+    // since the panel isn't implemented as a menu, we have to handle it
+    // ourselves.
+
+    aNode.addEventListener("mouseup", this.maybeAutoHidePanel, false);
+    aNode.addEventListener("keypress", this.maybeAutoHidePanel, false);
+  },
+
+  getWidgetProvider: function(aWidgetId) {
+    if (this.isSpecialWidget(aWidgetId)) {
+      return CustomizableUI.PROVIDER_SPECIAL;
+    }
+    if (gPalette.has(aWidgetId)) {
+      return CustomizableUI.PROVIDER_API;
+    }
+
+    // We fall back to the XUL provider, but we don't know for sure (at this
+    // point) whether it exists there either. So the API is technically lying.
+    // Ideally, it would be able to return an error value (or throw an
+    // exception) if it really didn't exist. Our code calling this function
+    // handles that fine, but this is a public API.
+    return CustomizableUI.PROVIDER_XUL;
+  },
+
+  getWidgetNode: function(aWidgetId, aDocument, aToolbox) {
+    if (this.isSpecialWidget(aWidgetId)) {
+      return [ CustomizableUI.PROVIDER_SPECIAL,
+               this.createSpecialWidget(aWidgetId, aDocument) ];
+    }
+
+    let widget = gPalette.get(aWidgetId);
+    if (widget) {
+      return [ CustomizableUI.PROVIDER_API,
+               this.buildWidget(aDocument, null, widget) ];
+    }
+
+    let node = this.findWidgetInToolbox(aWidgetId, aToolbox, aDocument);
+    if (node) {
+      return [ CustomizableUI.PROVIDER_XUL, node ];
+    }
+
+    return [];
+  },
+
+  registerMenuPanel: function(aPanel) {
+    if (this.isBuildAreaRegistered(CustomizableUI.AREA_PANEL, aPanel)) {
+      return;
+    }
+
+    let document = aPanel.ownerDocument;
+
+    for (let btn of aPanel.querySelectorAll("toolbarbutton")) {
+      if (!btn.hasAttribute("noautoclose")) {
+        this.ensureButtonClosesPanel(btn);
+      }
+    }
+
+    aPanel.toolbox = document.getElementById("navigator-toolbox");
+    aPanel.customizationTarget = aPanel;
+
+    let placements = gPlacements.get(CustomizableUI.AREA_PANEL);
+    this.buildArea(CustomizableUI.AREA_PANEL, placements, aPanel);
+    this.registerBuildArea(CustomizableUI.AREA_PANEL, aPanel);
+  },
+
+  registerWindow: function(aWindow) {
+    aWindow.addEventListener("unload", this, false);
+  },
+
+  onWidgetAdded: function(aWidgetId, aArea, aPosition) {
+    let areaNodes = gBuildAreas.get(aArea);
+    if (!areaNodes) {
+      return;
+    }
+
+    // Go through each of the nodes associated with this area and move the
+    // widget to the requested location.
+    for (let areaNode of areaNodes) {
+      let container = areaNode.customizationTarget;
+      let [provider, widgetNode] = this.getWidgetNode(aWidgetId,
+                                                      container.ownerDocument,
+                                                      areaNode.toolbox);
+
+      if (provider == CustomizableUI.PROVIDER_XUL &&
+          aArea == CustomizableUI.AREA_PANEL) {
+        this.ensureButtonClosesPanel(widgetNode);
+      }
+
+      let nextNode = container.children.item(aPosition);
+      container.insertBefore(widgetNode, nextNode);
+    }
+  },
+
+  onWidgetRemoved: function(aWidgetId, aArea) {
+    let areaNodes = gBuildAreas.get(aArea);
+    if (!areaNodes) {
+      return;
+    }
+
+    for (let areaNode of areaNodes) {
+      let container = areaNode.customizationTarget;
+      let widgetNode = container.ownerDocument.getElementById(aWidgetId);
+      if (!widgetNode) {
+        ERROR("Widget not found, unable to remove");
+        continue;
+      }
+
+      if (gPalette.has(aWidgetId) || this.isSpecialWidget(aWidgetId)) {
+        container.removeChild(widgetNode);
+      } else {
+        areaNode.toolbox.palette.appendChild(widgetNode);
+      }
+    }
+  },
+
+  onWidgetMoved: function(aWidgetId, aArea, aOldPosition, aNewPosition) {
+    let areaNodes = gBuildAreas.get(aArea);
+    if (!areaNodes) {
+      return;
+    }
+    
+    for (let areaNode of areaNodes) {
+      let container = areaNode.customizationTarget;
+      let widgetNode = container.ownerDocument.getElementById(aWidgetId);
+      if (!widgetNode) {
+        ERROR("Widget not found, unable to move");
+        continue;
+      }
+
+      let nextNode = container.children.item(aNewPosition > aOldPosition ?
+                                             aNewPosition + 1 :
+                                             aNewPosition);
+      container.insertBefore(widgetNode, nextNode);
+    }
+  },
+
+  isBuildAreaRegistered: function(aArea, aInstance) {
+    if (!gBuildAreas.has(aArea)) {
+      return false;
+    }
+    return gBuildAreas.get(aArea).has(aInstance);
+  },
+
+  registerBuildArea: function(aArea, aNode) {
+    if (!gBuildAreas.has(aArea)) {
+      gBuildAreas.set(aArea, new Set());
+    }
+
+    gBuildAreas.get(aArea).add(aNode);
+  },
+
+  unregisterBuildWindow: function(aWindow) {
+    let document = aWindow.document;
+
+    for (let [, area] of gBuildAreas) {
+      for (let node of area) {
+        if (node.ownerDocument == document) {
+          area.delete(node);
+        }
+      }
+    }
+
+    for (let [,widget] of gPalette)
+      widget.instances.delete(document);
+  },
+
+  handleEvent: function(aEvent) {
+    switch (aEvent.type) {
+      case "unload": {
+        let window = aEvent.target;
+        window.removeEventListener("unload", this);
+        this.unregisterBuildWindow(window);
+        break;
+      }
+    }
+  },
+
+  isSpecialWidget: function(aId) {
+    //XXXunf Need to double check these are getting handled correctly
+    //       everywhere, notably save/restore.
+    return (aId.startsWith("separator") ||
+            aId.startsWith("spring") ||
+            aId.startsWith("spacer"));
+  },
+
+  createSpecialWidget: function(aId, aDocument) {
+    let node = aDocument.createElementNS(kNSXUL, "toolbar" + aId);
+    // Due to timers resolution Date.now() can be the same for
+    // elements created in small timeframes.  So ids are
+    // differentiated through a unique count suffix.
+    node.id = aId + Date.now() + (++gNewElementCount);
+    if (aId == "spring") {
+      node.flex = 1;
+    }
+    return node;
+  },
+
+  findWidgetInToolbox: function(aId, aToolbox, aDocument) {
+    if (!aToolbox) {
+      return null;
+    }
+
+    // look for a node with the same id, as the node may be
+    // in a different toolbar.
+    let node = aDocument.getElementById(aId);
+    if (node) {
+      let parent = node.parentNode;
+      while (parent && parent.localName != "toolbar")
+        parent = parent.parentNode;
+
+      if (parent &&
+          parent.toolbox == aToolbox &&
+          parent.customizationTarget == node.parentNode) {
+        return node;
+      }
+    }
+
+    if (aToolbox.palette) {
+      // Attempt to locate a node with a matching ID within
+      // the palette.
+      return aToolbox.palette.querySelector("#" + aId);
+    }
+    return null;
+  },
+
+  // Depending on aMenu here is a hack that should be fixed.
+  buildWidget: function(aDocument, aMenu, aWidget) {
+    if (typeof aWidget == "string") {
+      aWidget = gPalette.get(aWidget);
+    }
+    if (!aWidget) {
+      throw new Error("buildWidget was passed a non-widget to build.");
+    }
+
+    LOG("Building " + aWidget.id);
+
+    let node = aDocument.createElementNS(kNSXUL, "toolbarbutton");
+
+    node.setAttribute("id", aWidget.id);
+    node.setAttribute("widget-id", aWidget.id);
+    node.setAttribute("widget-type", aWidget.type);
+    if (aWidget.disabled) {
+      node.setAttribute("disabled", true);
+    }
+    node.setAttribute("label", aWidget.name);
+    node.setAttribute("tooltiptext", aWidget.description);
+    //XXXunf Need to hook this up to a <key> element or something.
+    if (aWidget.shortcut) {
+      node.setAttribute("acceltext", aWidget.shortcut);
+    }
+    node.setAttribute("class", "toolbarbutton-1 chromeclass-toolbar-additional");
+
+    if (aMenu) {
+      node.setAttribute("image", aWidget.icons["32"]);
+    } else {
+      node.setAttribute("image", aWidget.icons["16"]);
+    }
+
+    let handler = this.handleWidgetClick.bind(this, aWidget, node);
+    node.addEventListener("command", handler, false);
+
+    // If the widget has a view, and has view showing / hiding listeners,
+    // hook those up to this widget.
+    if (aWidget.type == "view" &&
+        (aWidget.onViewShowing || aWidget.onViewHiding)) {
+      LOG("Widget " + aWidget.id + " has a view with showing and hiding events. Auto-registering event handlers.");
+      let viewNode = aDocument.getElementById(aWidget.viewId);
+
+      if (!viewNode) {
+        ERROR("Could not find the view node with id: " + aWidget.viewId);
+        throw new Error("Could not find the view node with id: " + aWidget.viewId);
+      }
+
+      for (let eventName of kSubviewEvents) {
+        let handler = "on" + eventName;
+        if (typeof aWidget[handler] == "function") {
+          viewNode.addEventListener(eventName, aWidget[handler], false);
+        }
+      }
+
+      LOG("Widget " + aWidget.id + " showing and hiding event handlers set.");
+    }
+
+    aWidget.instances.set(aDocument, node);
+    return node;
+  },
+
+  handleWidgetClick: function(aWidget, aNode, aEvent) {
+    LOG("handleWidgetClick");
+
+    if (aWidget.type == "button") {
+      this.maybeAutoHidePanel(aEvent);
+
+      if (aWidget.onCommand) {
+        try {
+          aWidget.onCommand.call(null, aEvent);
+        } catch (e) {
+          Cu.reportError(e);
+        }
+      } else {
+        //XXXunf Need to think this through more, and formalize.
+        Services.obs.notifyObservers(aNode,
+                                     "customizedui-widget-click",
+                                     aWidget.id);
+      }
+    } else if (aWidget.type == "view") {
+      let ownerWindow = aNode.ownerDocument.defaultView;
+      ownerWindow.PanelUI.showSubView(aWidget.viewId, aNode);
+    }
+  },
+
+  maybeAutoHidePanel: function(aEvent) {
+    if (aEvent.type == "keypress" && 
+        !(aEvent.keyCode == aEvent.DOM_VK_ENTER ||
+          aEvent.keyCode == aEvent.DOM_VK_RETURN)) {
+      return;
+    }
+
+    if (aEvent.type == "mouseup" && aEvent.button != 0) {
+      return;
+    }
+
+    let ownerWindow = aEvent.target.ownerDocument.defaultView;
+    ownerWindow.PanelUI.hide();
+  },
+
+  getUnusedWidgets: function(aWindowPalette) {
+    // We use a Set because there can be overlap between the widgets in
+    // gPalette and the items in the palette, especially after the first
+    // customization, since programmatically generated widgets will remain
+    // in the toolbox palette.
+    let widgets = new Set();
+
+    // It's possible that some widgets have been defined programmatically and
+    // have not been overlayed into the palette. We can find those inside
+    // gPalette.
+    for (let [id, widget] of gPalette) {
+      if (!widget.currentArea) {
+        widgets.add(id);
+      }
+    }
+
+    LOG("Iterating the actual nodes of the window palette");
+    for (let node of aWindowPalette.children) {
+      LOG("In palette children: " + node.id);
+      if (!this.getPlacementOfWidget(node.id)) {
+        widgets.add(node.id);
+      }
+    }
+
+    return [i for (i of widgets)];
+  },
+
+  getPlacementOfWidget: function(aWidgetId) {
+    let widget = gPalette.get(aWidgetId);
+
+    for (let [area, placements] of gPlacements) {
+      let index = placements.indexOf(aWidgetId);
+      if (index != -1) {
+        return { area: area, position: index };
+      }
+    }
+
+    return null;
+  },
+
+  addWidgetToArea: function(aWidgetId, aArea, aPosition) {
+    if (!gAreas.has(aArea)) {
+      throw new Error("Unknown customization area");
+    }
+
+    // If this is a lazy area that hasn't been restored yet, we can't yet modify
+    // it - would would at least like to add to it. So we keep track of it in
+    // gFuturePlacements,  and use that to add it when restoring the area. We
+    // throw away aPosition though, as that can only be bogus if the area hasn't
+    // yet been restorted (caller can't possibly know where its putting the
+    // widget in relation to other widgets).
+    if (this.isAreaLazy(aArea)) {
+      gFuturePlacements.get(aArea).set(aWidgetId);
+      return;
+    }
+
+    let oldPlacement = this.getPlacementOfWidget(aWidgetId);
+    if (oldPlacement && oldPlacement.area == aArea) {
+      this.moveWidgetWithinArea(aWidgetId, aPosition);
+      return;
+    }
+
+    if (oldPlacement) {
+      this.removeWidgetFromArea(aWidgetId);
+    }
+
+    if (!gPlacements.has(aArea)) {
+      gPlacements.set(aArea, [aWidgetId]);
+      aPosition = 0;
+    } else {
+      let placements = gPlacements.get(aArea);
+      if (typeof aPosition != "number") {
+        aPosition = placements.length;
+      }
+      if (aPosition < 0) {
+        aPosition = 0;
+      }
+      placements.splice(aPosition, 0, aWidgetId);
+    }
+
+    let widget = gPalette.get(aWidgetId);
+    if (widget) {
+      widget.currentArea = aArea;
+      widget.currentPosition = aPosition;
+    }
+
+    gDirty = true;
+    this.saveState();
+
+    this.notifyListeners("onWidgetAdded", aWidgetId, aArea, aPosition);
+  },
+
+  removeWidgetFromArea: function(aWidgetId) {
+    let oldPlacement = this.getPlacementOfWidget(aWidgetId);
+    if (!oldPlacement) {
+      return;
+    }
+
+    let placements = gPlacements.get(oldPlacement.area);
+    let position = placements.indexOf(aWidgetId);
+    if (position != -1) {
+      placements.splice(position, 1);
+    }
+
+    let widget = gPalette.get(aWidgetId);
+    if (widget) {
+      widget.currentArea = null;
+      widget.currentPosition = null;
+    }
+
+    gDirty = true;
+    this.saveState();
+
+    this.notifyListeners("onWidgetRemoved", aWidgetId, oldPlacement.area);
+  },
+
+  moveWidgetWithinArea: function(aWidgetId, aPosition) {
+    let oldPlacement = this.getPlacementOfWidget(aWidgetId);
+    if (!oldPlacement) {
+      return;
+    }
+
+    let placements = gPlacements.get(oldPlacement.area);
+    if (aPosition < 0) {
+      aPosition = 0;
+    } else if (aPosition > placements.length - 1) {
+      aPosition = placements.length - 1;
+    }
+
+    if (aPosition == oldPlacement.position) {
+      return;
+    }
+
+    placements.splice(oldPlacement.position, 1);
+    placements.splice(aPosition, 0, aWidgetId);
+
+    let widget = gPalette.get(aWidgetId);
+    if (widget) {
+      widget.currentPosition = aPosition;
+    }
+
+    gDirty = true;
+    this.saveState();
+
+    this.notifyListeners("onWidgetMoved", aWidgetId, oldPlacement.area,
+                         oldPlacement.position, aPosition);
+  },
+
+  // Note that this does not populate gPlacements, which is done lazily so that
+  // the legacy state can be migrated, which is only available once a browser
+  // window is openned.
+  // The panel area is an exception here, since it has no legacy state and is 
+  // built lazily - and therefore wouldn't otherwise result in restoring its
+  // state immediately when a browser window opens, which is important for
+  // other consumers of this API.
+  loadSavedState: function() {
+    let state = null;
+    try {
+      state = Services.prefs.getCharPref(kPrefCustomizationState);
+    } catch (e) {
+      LOG("No saved state found");
+      // This will fail if nothing has been customized, so silently fall back to
+      // the defaults.
+    }
+
+    if (!state) {
+      return;
+    }
+    try {
+      gSavedState = JSON.parse(state);
+    } catch(e) {
+      LOG("Error loading saved UI customization state, falling back to defaults.");
+    }
+
+    if (!("placements" in gSavedState)) {
+      gSavedState.placements = {};
+    }
+
+    gSeenWidgets = new Set(gSavedState.seen || []);
+  },
+
+  restoreStateForArea: function(aArea, aLegacyState) {
+    if (gPlacements.has(aArea)) {
+      // Already restored.
+      return;
+    }
+
+    this.beginBatchUpdate();
+    gRestoring = true;
+
+    let restored = false;
+    gPlacements.set(aArea, []);
+
+    if (gSavedState && aArea in gSavedState.placements) {
+      LOG("Restoring " + aArea + " from saved state");
+      let placements = gSavedState.placements[aArea];
+      for (let id of placements)
+        this.addWidgetToArea(id, aArea);
+      gDirty = false;
+      restored = true;
+    }
+
+    if (!restored && aLegacyState) {
+      LOG("Restoring " + aArea + " from legacy state");
+      for (let id of aLegacyState)
+        this.addWidgetToArea(id, aArea);
+      // Don't override dirty state, to ensure legacy state is saved here and
+      // therefore only used once.
+      restored = true;
+    }
+
+    if (!restored) {
+      LOG("Restoring " + aArea + " from default state");
+      if (gDefaultPlacements.has(aArea)) {
+        let defaults = gDefaultPlacements.get(aArea);
+        for (let id of defaults)
+          this.addWidgetToArea(id, aArea);
+      }
+      gDirty = false;
+    }
+
+    // Finally, add widgets to the area that were added before the it was able
+    // to be restored. This can occur when add-ons register widgets for a
+    // lazily-restored area before it's been restored.
+    if (gFuturePlacements.has(aArea)) {
+      for (let id of gFuturePlacements.get(aArea))
+        this.addWidgetToArea(id, aArea);
+    }
+
+    LOG("Placements for " + aArea + ":\n\t" + gPlacements.get(aArea).join("\n\t"));
+
+    gRestoring = false;
+    this.endBatchUpdate();
+  },
+
+  saveState: function() {
+    if (gInBatch || !gDirty) {
+      return;
+    }
+    let state = { placements: gPlacements,
+                  seen: gSeenWidgets };
+
+    LOG("Saving state.");
+    let serialized = JSON.stringify(state, this.serializerHelper);
+    LOG("State saved as: " + serialized);
+    Services.prefs.setCharPref(kPrefCustomizationState, serialized);
+    gDirty = false;
+  },
+
+  serializerHelper: function(aKey, aValue) {
+    if (typeof aValue == "object" && aValue.constructor.name == "Map") {
+      let result = {};
+      for (let [mapKey, mapValue] of aValue)
+        result[mapKey] = mapValue;
+      return result;
+    }
+
+    if (typeof aValue == "object" && aValue.constructor.name == "Set") {
+      return [i for (i of aValue)];
+    }
+
+    return aValue;
+  },
+
+  beginBatchUpdate: function() {
+    gInBatch = true;
+  },
+
+  endBatchUpdate: function(aForceSave) {
+    gInBatch = false;
+    if (aForceSave === true) {
+      gDirty = true;
+    }
+    this.saveState();
+  },
+
+  addListener: function(aListener) {
+    gListeners.add(aListener);
+  },
+
+  removeListener: function(aListener) {
+    if (aListener == this) {
+      return;
+    }
+
+    gListeners.delete(aListener);
+  },
+
+  notifyListeners: function(aEvent, ...aArgs) {
+    if (gRestoring) {
+      return;
+    }
+
+    for (let listener of gListeners) {
+      try {
+        if (aEvent in listener) {
+          listener[aEvent].apply(listener, aArgs);
+        }
+      } catch (e) {
+        Cu.reportError(e + " -- " + e.fileName + ":" + e.lineNumber);
+      }
+    }
+  },
+
+  createWidget: function(aProperties) {
+    let widget = this.normalizeWidget(aProperties, CustomizableUI.SOURCE_EXTERNAL);
+    //XXXunf This should probably throw.
+    if (!widget) {
+      return;
+    }
+
+    gPalette.set(widget.id, widget);
+    this.notifyListeners("onWidgetCreated", widget.id);
+
+    if (widget.defaultArea) {
+      let area = widget.defaultArea;
+      if (gDefaultPlacements.has(area)) {
+        gDefaultPlacements.get(area).push(widget.id);
+      } else {
+        gDefaultPlacements.set(area, [widget.id]);
+      }
+    }
+
+    // Look through previously saved state to see if we're restoring a widget.
+    let seenAreas = new Set();
+    for (let [area, placements] of gPlacements) {
+      seenAreas.add(area);
+      let index = gPlacements.get(area).indexOf(widget.id);
+      if (index != -1) {
+        widget.currentArea = area;
+        widget.currentPosition = index;
+        break;
+      }
+    }
+
+    // Also look at saved state data directly in areas that haven't yet been
+    // restored. Can't rely on this for restored areas, as they may have
+    // changed.
+    if (!widget.currentArea && gSavedState) {
+      for (let area of Object.keys(gSavedState.placements)) {
+        if (seenAreas.has(area)) {
+          continue;
+        }
+
+        let index = gSavedState.placements[area].indexOf(widget.id);
+        if (index != -1) {
+          widget.currentArea = area;
+          widget.currentPosition = index;
+          break;
+        }
+      }
+    }
+
+    // If we're restoring the widget to it's old placement, fire off the
+    // onWidgetAdded event - our own handler will take care of adding it to
+    // any build areas.
+    if (widget.currentArea) {
+      this.notifyListeners("onWidgetAdded", widget.id, widget.currentArea,
+                           widget.currentPosition);
+    } else {
+      let autoAdd = true;
+      try {
+        autoAdd = Services.prefs.getBoolPref(kPrefCustomizationAutoAdd);
+      } catch (e) {}
+
+      // If the widget doesn't have an existing placement, and it hasn't been
+      // seen before, then add it to its default area so it can be used.
+      if (autoAdd && !widget.currentArea && !gSeenWidgets.has(widget.id)) {
+        this.beginBatchUpdate();
+        gSeenWidgets.add(widget.id);
+
+        if (widget.defaultArea) {
+          if (this.isAreaLazy(widget.defaultArea)) {
+            gFuturePlacements.get(widget.defaultArea).set(widget.id);
+          } else {
+            this.addWidgetToArea(widget.id, widget.defaultArea);
+          }
+        }
+
+        this.endBatchUpdate(true);
+      }
+    }
+
+    return widget.id;
+  },
+
+  createBuiltinWidget: function(aData) {
+    // This should only ever be called on startup, before any windows are
+    // openned - so we know there's no build areas to handle. Also, builtin
+    // widgets are expected to be (mostly) static, so shouldn't affect the
+    // current placement settings.
+    let widget = this.normalizeWidget(aData, CustomizableUI.SOURCE_BUILTIN);
+    if (!widget) {
+      ERROR("Error creating builtin widget: " + aData.id);
+      return;
+    }
+
+    LOG("Creating built-in widget with id: " + widget.id);
+    gPalette.set(widget.id, widget);
+  },
+
+  // Returns true if the area will eventually lazily restore (but hasn't yet).
+  isAreaLazy: function(aArea) {
+    if (gPlacements.has(aArea)) {
+      return false;
+    }
+    return gAreas.get(aArea).has("legacy");
+  },
+
+  //XXXunf Log some warnings here, when the data provided isn't up to scratch.
+  normalizeWidget: function(aData, aSource) {
+    let widget = {
+      source: aSource || "addon",
+      instances: new Map(),
+      currentArea: null,
+      defaultArea: null,
+      allowedAreas: [],
+      shortcut: null,
+      description: null,
+      icons: {}
+    };
+
+    if (typeof aData.id != "string" || !/^[a-z0-9-_]{1,}$/i.test(aData.id)) {
+      ERROR("Given an illegal id in normalizeWidget: " + aData.id);
+      return null;
+    }
+
+    const kReqStringProps = ["id", "name"];
+    for (let prop of kReqStringProps) {
+      if (typeof aData[prop] != "string") {
+        return null;
+      }
+      widget[prop] = aData[prop];
+    }
+
+    const kOptStringProps = ["description", "shortcut"];
+    for (let prop of kOptStringProps) {
+      if (typeof aData[prop] == "string") {
+        widget[prop] = aData[prop];
+      }
+    }
+
+    if (aData.defaultArea && gAreas.has(aData.defaultArea)) {
+      widget.defaultArea = aData.defaultArea;
+    }
+
+    if (Array.isArray(aData.allowedAreas)) {
+      widget.allowedAreas =
+        [area for (area of aData.allowedAreas) if (gAreas.has(area))];
+    }
+
+    if ("type" in aData && gSupportedWidgetTypes.has(aData.type)) {
+      widget.type = aData.type;
+    } else {
+      widget.type = "button";
+    }
+
+    widget.disabled = aData.disabled === true;
+
+    if (typeof aData.icons == "object") {
+      let sizes = Object.keys(aData.icons);
+      for (let size of sizes) {
+        if (size == parseInt(size, 10)) {
+          widget.icons[size] = aData.icons[size];
+        }
+      }
+    }
+
+    if (widget.type == "button") {
+      widget.onCommand = typeof aData.onCommand == "function" ?
+                           aData.onCommand :
+                           null;
+    } else if (widget.type == "view") {
+      if (typeof aData.viewId != "string") {
+        ERROR("Expected a string for widget " + widget.id + " viewId, but got "
+              + aData.viewId);
+        return null;
+      }
+      widget.viewId = aData.viewId;
+
+      widget.onViewShowing = typeof aData.onViewShowing == "function" ?
+                                 aData.onViewShowing :
+                                 null;
+      widget.onViewHiding = typeof aData.onViewHiding == "function" ? 
+                                 aData.onViewHiding :
+                                 null;
+    }
+
+    if (gPalette.has(widget.id)) {
+      return null;
+    }
+
+    return widget;
+  },
+
+  destroyWidget: function(aWidgetId) {
+    let widget = gPalette.get(aWidgetId);
+    if (!widget) {
+      return;
+    }
+
+    // This will not remove the widget from gPlacements - we want to keep the
+    // setting so the widget gets put back in it's old position if/when it
+    // returns.
+
+    let area = widget.currentArea;
+    if (area) {
+      let buildArea = gBuildAreas.get(area);
+      for (let buildNode of buildArea) {
+        let widgetNode = buildNode.ownerDocument.getElementById(aWidgetId);
+        if (widgetNode) {
+          widgetNode.parentNode.removeChild(widgetNode);
+        }
+        for (let eventName of kSubviewEvents) {
+          let handler = "on" + eventName;
+          if (typeof widget[handler] == "function") {
+            viewNode.removeEventListener(eventName, widget[handler], false);
+          }
+        }
+      }
+    }
+
+    gPalette.delete(aWidgetId);
+
+    this.notifyListeners("onWidgetDestroyed", aWidgetId);
+  },
+
+  registerManifest: function(aBaseLocation, aData) {
+    let tokens = aData.split(/\s+/);
+    let directive = tokens.shift();
+    if (directive != "widget") {
+      return;
+    }
+
+    for (let [id, widget] of gPalette) {
+      if (widget.source == aBaseLocation.spec) {
+        return; // Already registered.
+      }
+    }
+
+    let uri = NetUtil.newURI(tokens.shift(), null, aBaseLocation);
+
+    dump("\tNew widget! " + uri.spec + "\n");
+
+    let data = "";
+    try {
+      if (uri.schemeIs("jar")) {
+        data = this.readManifestFromJar(uri);
+      } else {
+        data = this.readManifestFromFile(uri);
+      }
+    }
+    catch (e) {
+      Cu.reportError(e);
+      return;
+    }
+    data = JSON.parse(data);
+    data.source = aBaseLocation.spec;
+
+    this.createWidget(data);
+  },
+
+  // readManifestFromJar and readManifestFromFile from ChromeManifestParser.jsm.
+  readManifestFromJar: function(aURI) {
+    let data = "";
+    let entries = [];
+    let readers = [];
+
+    try {
+      // Deconstrict URI, which can be nested jar: URIs. 
+      let uri = aURI.clone();
+      while (uri instanceof Ci.nsIJARURI) {
+        entries.push(uri.JAREntry);
+        uri = uri.JARFile;
+      }
+
+      // Open the base jar.
+      let reader = Cc["@mozilla.org/libjar/zip-reader;1"]
+                     .createInstance(Ci.nsIZipReader);
+      reader.open(uri.QueryInterface(Ci.nsIFileURL).file);
+      readers.push(reader);
+
+      // Open the nested jars.
+      for (let i = entries.length - 1; i > 0; i--) {
+        let innerReader = Cc["@mozilla.org/libjar/zip-reader;1"].
+                          createInstance(Ci.nsIZipReader);
+        innerReader.openInner(reader, entries[i]);
+        readers.push(innerReader);
+        reader = innerReader;
+      }
+
+      // First entry is the actual file we want to read.
+      let zis = reader.getInputStream(entries[0]);
+      data = NetUtil.readInputStreamToString(zis, zis.available());
+    }
+    finally {
+      // Close readers in reverse order.
+      for (let i = readers.length - 1; i >= 0; i--) {
+        readers[i].close();
+        //XXXunf Don't think this is needed, but need to double check.
+        //flushJarCache(readers[i].file);
+      }
+    }
+
+    return data;
+  },
+
+  readManifestFromFile: function(aURI) {
+    let file = aURI.QueryInterface(Ci.nsIFileURL).file;
+    if (!file.exists() || !file.isFile()) {
+      return "";
+    }
+
+    let data = "";
+    let fis = Cc["@mozilla.org/network/file-input-stream;1"]
+                .createInstance(Ci.nsIFileInputStream);
+    try {
+      fis.init(file, -1, -1, false);
+      data = NetUtil.readInputStreamToString(fis, fis.available());
+    } finally {
+      fis.close();
+    }
+    return data;
+  },
+
+  getCustomizeTargetForArea: function(aArea, aWindow) {
+    let buildAreaNodes = gBuildAreas.get(aArea);
+    if (!buildAreaNodes) {
+      throw new Error("No build area nodes registered for " + aArea);
+    }
+
+    for (let node of buildAreaNodes) {
+      if (node.ownerDocument.defaultView === aWindow) {
+        return node.customizationTarget ? node.customizationTarget : node;
+      }
+    }
+
+    throw new Error("Could not find any window nodes for area " + aArea);
+  },
+
+  reset: function() {
+    Services.prefs.clearUserPref(kPrefCustomizationState);
+    LOG("State reset");
+  }
+};
+Object.freeze(CustomizableUIInternal);
+
+this.CustomizableUI = {
+  get AREA_PANEL() "PanelUI-contents",
+  get AREA_NAVBAR() "nav-bar",
+
+  get PROVIDER_XUL() "xul",
+  get PROVIDER_API() "api",
+  get PROVIDER_SPECIAL() "special",
+
+  get SOURCE_BUILTIN() "builtin",
+  get SOURCE_EXTERNAL() "external",
+
+  get TYPE_BUTTON() "button",
+
+  addListener: function(aListener) {
+    CustomizableUIInternal.addListener(aListener);
+  },
+  removeListener: function(aListener) {
+    CustomizableUIInternal.removeListener(aListener);
+  },
+  registerArea: function(aName, aProperties) {
+    CustomizableUIInternal.registerArea(aName, aProperties);
+  },
+  //XXXunf registerToolbarNode / registerToolbarInstance ?
+  registerToolbar: function(aToolbar) {
+    CustomizableUIInternal.registerToolbar(aToolbar);
+  },
+  registerMenuPanel: function(aPanel) {
+    CustomizableUIInternal.registerMenuPanel(aPanel);
+  },
+  registerWindow: function(aWindow) {
+    CustomizableUIInternal.registerWindow(aWindow);
+  },
+  addWidgetToArea: function(aWidgetId, aArea, aPosition) {
+    CustomizableUIInternal.addWidgetToArea(aWidgetId, aArea, aPosition);
+  },
+  removeWidgetFromArea: function(aWidgetId) {
+    CustomizableUIInternal.removeWidgetFromArea(aWidgetId);
+  },
+  moveWidgetWithinArea: function(aWidgetId, aPosition) {
+    CustomizableUIInternal.moveWidgetWithinArea(aWidgetId, aPosition);
+  },
+  beginBatchUpdate: function() {
+    CustomizableUIInternal.beginBatchUpdate();
+  },
+  endBatchUpdate: function(aForceSave) {
+    CustomizableUIInternal.endBatchUpdate(aForceSave);
+  },
+  createWidget: function(aProperties) {
+    return CustomizableUIInternal.wrapWidget(
+      CustomizableUIInternal.createWidget(aProperties)
+    );
+  },
+  destroyWidget: function(aWidgetId) {
+    CustomizableUIInternal.destroyWidget(aWidgetId);
+  },
+  getWidget: function(aWidgetId) {
+    return CustomizableUIInternal.wrapWidget(aWidgetId);
+  },
+  getUnusedWidgets: function(aWindowPalette) {
+    return CustomizableUIInternal.getUnusedWidgets(aWindowPalette).map(
+      CustomizableUIInternal.wrapWidget,
+      CustomizableUIInternal
+    );
+  },
+  getWidgetsInArea: function(aArea) {
+    if (!gAreas.has(aArea)) {
+      throw new Error("Unknown customization area");
+    }
+    if (!gPlacements.has(aArea)) {
+      throw new Error("Area not yet restored");
+    }
+
+    return gPlacements.get(aArea).map(
+      CustomizableUIInternal.wrapWidget,
+      CustomizableUIInternal
+    );
+  },
+  get areas() {
+    return [area for ([area, props] of gAreas)];
+  },
+  getCustomizeTargetForArea: function(aArea, aWindow) {
+    return CustomizableUIInternal.getCustomizeTargetForArea(aArea, aWindow);
+  },
+  reset: function() {
+    CustomizableUIInternal.reset();
+  }
+};
+Object.freeze(this.CustomizableUI);
+
+
+/**
+ * All external consumers of widgets are really interacting with these wrappers
+ * which provide a common interface.
+ */
+
+/**
+ * WidgetGroupWrapper is the common interface for interacting with an entire
+ * widget group - AKA, all instances of a widget across a series of windows.
+ * This particular wrapper is only used for widgets created via the provider
+ * API.
+ */
+function WidgetGroupWrapper(aWidget) {
+  this.isGroup = true;
+
+  const kBareProps = ["id", "source", "type", "disabled", "name", "description"];
+  for (let prop of kBareProps) {
+    let propertyName = prop;
+    this.__defineGetter__(propertyName, function() aWidget[propertyName]);
+  }
+
+  this.__defineGetter__("provider", function() CustomizableUI.PROVIDER_API);
+
+  this.__defineSetter__("disabled", function(aValue) {
+    aValue = !!aValue;
+    aWidget.disabled = aValue;
+    for (let [,instance] of aWidget.instances) {
+      instance.disabled = aValue;
+    }
+  });
+  
+  this.forWindow = function WidgetGroupWrapper_forWindow(aWindow) {
+    let instance = aWidget.instances.get(aWindow.document);
+    if (!instance) {
+      instance = CustomizableUIInternal.buildWidget(aWindow.document,
+                                                    null,
+                                                    aWidget);
+    }
+
+    let wrapper = gWrapperCache.get(instance);
+    if (!wrapper) {
+      wrapper = new WidgetSingleWrapper(aWidget, instance);
+      gWrapperCache.set(instance, wrapper);
+    }
+    return wrapper;
+  };
+
+  Object.freeze(this);
+}
+
+/**
+ * A WidgetSingleWrapper is a wrapper around a single instance of a widget in
+ * a particular window.
+ */
+function WidgetSingleWrapper(aWidget, aNode) {
+  this.isGroup = false;
+
+  this.node = aNode;
+  this.provider = CustomizableUI.PROVIDER_API;
+
+  const kGlobalProps = ["id", "type"];
+  for (let prop of kGlobalProps) {
+    this[prop] = aWidget[prop];
+  }
+
+  const nodeProps = ["label", "description"];
+  for (let prop of nodeProps) {
+    let propertyName = prop;
+    // Look at the node for these, instead of the widget data, to ensure the
+    // wrapper always reflects this live instance.
+    this.__defineGetter__(propertyName,
+                          function() aNode.getAttribute(propertyName));
+  }
+
+  this.__defineGetter__("disabled", function() aNode.disabled);
+  this.__defineSetter__("disabled", function(aValue) {
+    aNode.disabled = !!aValue;
+  });
+
+  Object.freeze(this);
+}
+
+/**
+ * XULWidgetGroupWrapper is the common interface for interacting with an entire
+ * widget group - AKA, all instances of a widget across a series of windows.
+ * This particular wrapper is only used for widgets created via the old-school
+ * XUL method (overlays, or programmatically injecting toolbaritems, or other
+ * such things).
+ */
+//XXXunf Going to need to hook this up to some events to keep it all live.
+function XULWidgetGroupWrapper(aWidgetId) {
+  this.isGroup = true;
+
+  let nodes = [];
+
+  let placement = CustomizableUIInternal.getPlacementOfWidget(aWidgetId);
+  if (placement) {
+    let buildAreas = gBuildAreas.get(placement.area) || [];
+    for (let areaNode of buildAreas)
+      nodes.push(areaNode.ownerDocument.getElementById(aWidgetId));
+  }
+
+  this.id = aWidgetId;
+  this.type = "custom";
+  this.provider = CustomizableUI.PROVIDER_XUL;
+
+  this.forWindow = function XULWidgetGroupWrapper_forWindow(aWindow) {
+    let instance = aWindow.document.getElementById(aWidgetId);
+    if (!instance) {
+      // Toolbar palettes aren't part of the document, so elements in there
+      // won't be found via document.getElementById().
+      instance = aWindow.gNavToolbox.palette.querySelector("#" + aWidgetId);
+    }
+
+    let wrapper = gWrapperCache.get(instance);
+    if (!wrapper) {
+      wrapper = new XULWidgetSingleWrapper(aWidgetId, instance);
+      gWrapperCache.set(instance, wrapper);
+    }
+    return wrapper;
+  };
+
+  Object.freeze(this);
+}
+
+/**
+ * A XULWidgetSingleWrapper is a wrapper around a single instance of a XUL 
+ * widget in a particular window.
+ */
+function XULWidgetSingleWrapper(aWidgetId, aNode) {
+  this.isGroup = false;
+
+  this.id = aWidgetId;
+  this.type = "custom";
+  this.provider = CustomizableUI.PROVIDER_XUL;
+
+  this.node = aNode;
+
+  Object.freeze(this);
+}
+
+
+CustomizableUIInternal.initialize();
diff --git a/browser/modules/CustomizeMode.jsm b/browser/modules/CustomizeMode.jsm
new file mode 100644
index 000000000000..85839b136e48
--- /dev/null
+++ b/browser/modules/CustomizeMode.jsm
@@ -0,0 +1,484 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+this.EXPORTED_SYMBOLS = ["CustomizeMode"];
+
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+
+const kPrefCustomizationDebug = "browser.uiCustomization.debug";
+const kPaletteId = "customization-palette";
+
+let gDebug = false;
+try {
+  gDebug = Services.prefs.getBoolPref(kPrefCustomizationDebug);
+} catch (e) {}
+
+function LOG(str) {
+  if (gDebug) {
+    Services.console.logStringMessage(str);
+  }
+}
+
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource:///modules/CustomizableUI.jsm");
+
+function CustomizeMode(aWindow) {
+  this.window = aWindow;
+  // We register this window to have its customization data cleaned up when
+  // unloading.
+  CustomizableUI.registerWindow(this.window);
+
+  this.document = aWindow.document;
+  // There are two palettes - there's the palette that can be overlayed with
+  // toolbar items in browser.xul. This is invisible, and never seen by the
+  // user. Then there's the visible palette, which gets populated and displayed
+  // to the user when in customizing mode.
+  this.visiblePalette = this.document.getElementById(kPaletteId);
+};
+
+CustomizeMode.prototype = {
+  _changed: false,
+  window: null,
+  document: null,
+  // areas is used to cache the customizable areas when in customization mode.
+  areas: null,
+  // When in customizing mode, we swap out the reference to the invisible
+  // palette in gNavToolbox.palette for our visiblePalette. This way, for the
+  // customizing browser window, when widgets are removed from customizable
+  // areas and added to the palette, they're added to the visible palette.
+  // _stowedPalette is a reference to the old invisible palette so we can
+  // restore gNavToolbox.palette to its original state after exiting
+  // customization mode.
+  _stowedPalette: null,
+
+  enter: function() {
+    CustomizableUI.addListener(this);
+
+    let window = this.window;
+    let document = this.document;
+
+    // Let everybody in this window know that we're about to customize.
+    let evt = document.createEvent("CustomEvent");
+    evt.initCustomEvent("CustomizationStart", true, true, window);
+    window.dispatchEvent(evt);
+
+    let customizer = document.getElementById("customization-container");
+    customizer.parentNode.selectedPanel = customizer;
+
+    window.PanelUI.hide();
+
+    let self = this;
+    let deck = document.getElementById("tab-view-deck");
+    deck.addEventListener("transitionend", function customizeTransitionEnd() {
+      deck.removeEventListener("transitionend", customizeTransitionEnd);
+
+      // Move the mainView in the panel to the holder so that we can see it
+      // while customizing.
+      let panelHolder = document.getElementById("customization-panelHolder");
+      panelHolder.appendChild(window.PanelUI.mainView);
+
+      // Add drag-and-drop event handlers to all of the customizable areas.
+      self.areas = [];
+      for (let area of CustomizableUI.areas) {
+        let target = CustomizableUI.getCustomizeTargetForArea(area, window);
+        target.addEventListener("dragstart", self);
+        target.addEventListener("dragover", self);
+        target.addEventListener("drop", self);
+        for (let toolbarItem of target.children) {
+          self.wrapToolbarItem(toolbarItem, "");
+        }
+        self.areas.push(target);
+      }
+
+      self.populatePalette();
+    });
+
+    this.visiblePalette.addEventListener("dragstart", this);
+    this.visiblePalette.addEventListener("dragover", this);
+    this.visiblePalette.addEventListener("drop", this);
+
+    document.documentElement.setAttribute("customizing", true);
+  },
+
+  exit: function(aToolboxChanged) {
+    CustomizableUI.removeListener(this);
+
+    this.depopulatePalette();
+
+    this.visiblePalette.removeEventListener("dragstart", this);
+    this.visiblePalette.removeEventListener("dragover", this);
+    this.visiblePalette.removeEventListener("drop", this);
+
+    let window = this.window;
+    let document = this.document;
+
+    // Let everybody in this window know that we're finished customizing.
+    let evt = document.createEvent("CustomEvent");
+    evt.initCustomEvent("CustomizationEnd", true, true, {changed: this._changed});
+    window.dispatchEvent(evt);
+
+    if (this._changed) {
+      // XXXmconley: At first, it seems strange to also persist the old way with
+      //             currentset - but this might actually be useful for switching
+      //             to old builds. We might want to keep this around for a little
+      //             bit.
+      this.persistCurrentSets();
+    }
+
+    document.documentElement.removeAttribute("customizing");
+
+    for (let target of this.areas) {
+      for (let toolbarItem of target.children) {
+        this.unwrapToolbarItem(toolbarItem);
+      }
+      target.removeEventListener("dragstart", this);
+      target.removeEventListener("dragover", this);
+      target.removeEventListener("drop", this);
+    }
+
+    // And drop all area references.
+    this.areas = [];
+
+    window.PanelUI.replaceMainView(window.PanelUI.mainView);
+
+    let browser = document.getElementById("browser");
+    browser.parentNode.selectedPanel = browser;
+    this._changed = false;
+  },
+
+  populatePalette: function() {
+    let toolboxPalette = this.window.gNavToolbox.palette;
+
+    let unusedWidgets = CustomizableUI.getUnusedWidgets(toolboxPalette);
+    for (let widget of unusedWidgets) {
+      let paletteItem = this.makePaletteItem(widget, "palette");
+      this.visiblePalette.appendChild(paletteItem);
+    }
+
+    this._stowedPalette = this.window.gNavToolbox.palette;
+    this.window.gNavToolbox.palette = this.visiblePalette;
+  },
+
+  //XXXunf Maybe this should use -moz-element instead of wrapping the node?
+  //       Would ensure no weird interactions/event handling from original node,
+  //       and makes it possible to put this in a lazy-loaded iframe/real tab
+  //       while still getting rid of the need for overlays.
+  makePaletteItem: function(aWidget, aPlace) {
+    let widgetNode = aWidget.forWindow(this.window).node;
+    let wrapper = this.createWrapper(widgetNode, aPlace);
+    wrapper.appendChild(widgetNode);
+    return wrapper;
+  },
+
+  depopulatePalette: function() {
+    let wrapper = this.visiblePalette.firstChild;
+
+    while (wrapper) {
+      let widgetNode = wrapper.firstChild;
+
+      let provider = CustomizableUI.getWidget(widgetNode.id);
+      // If provider is PROVIDER_SPECIAL, then it just gets thrown away.
+      if (provider = CustomizableUI.PROVIDER_XUL) {
+        if (wrapper.hasAttribute("itemdisabled")) {
+          widgetNode.disabled = true;
+        }
+
+        if (wrapper.hasAttribute("itemchecked")) {
+          widgetNode.checked = true;
+        }
+
+        if (wrapper.hasAttribute("itemcommand")) {
+          let commandID = wrapper.getAttribute("itemcommand");
+          widgetNode.setAttribute("command", commandID);
+
+          // Ensure node is in sync with its command after customizing.
+          let command = this.document.getElementById(commandID);
+          if (command && command.hasAttribute("disabled")) {
+            widgetNode.setAttribute("disabled",
+                                    command.getAttribute("disabled"));
+          }
+        }
+
+        this._stowedPalette.appendChild(widgetNode);
+      } else if (provider = CustomizableUI.PROVIDER_API) {
+        //XXXunf Currently this doesn't destroy the (now unused) node. It would
+        //       be good to do so, but we need to keep strong refs to it in
+        //       CustomizableUI (can't iterate of WeakMaps), and there's the
+        //       question of what behavior wrappers should have if consumers
+        //       keep hold of them.
+        //widget.destroyInstance(widgetNode);
+      }
+
+      this.visiblePalette.removeChild(wrapper);
+      wrapper = this.visiblePalette.firstChild;
+    }
+    this.window.gNavToolbox.palette = this._stowedPalette;
+  },
+
+  wrapToolbarItem: function(aNode, aPlace) {
+    let wrapper = this.createWrapper(aNode, aPlace);
+    aNode = aNode.parentNode.replaceChild(wrapper, aNode);
+    wrapper.appendChild(aNode);
+    return wrapper;
+  },
+
+  createWrapper: function(aNode, aPlace) {
+    let wrapper = this.document.createElement("toolbarpaletteitem");
+
+    // "place" is used by toolkit to add the toolbarpaletteitem-palette
+    // binding to a toolbarpaletteitem, which gives it a label node for when
+    // it's sitting in the palette.
+    wrapper.setAttribute("place", aPlace);
+
+    // Ensure the wrapped item doesn't look like it's in any special state, and
+    // can't be interactved with when in the customization palette.
+    if (aNode.hasAttribute("command")) {
+      wrapper.setAttribute("itemcommand", aNode.getAttribute("command"));
+      aNode.removeAttribute("command");
+    }
+
+    if (aNode.checked) {
+      wrapper.setAttribute("itemchecked", "true");
+      aNode.checked = false;
+    }
+
+    if (aNode.disabled) {
+      wrapper.setAttribute("itemdisabled", "true");
+      aNode.disabled = false;
+    }
+
+    if (aNode.hasAttribute("id")) {
+      wrapper.setAttribute("id", "wrapper-" + aNode.getAttribute("id"));
+    }
+
+    if (aNode.hasAttribute("title")) {
+      wrapper.setAttribute("title", aNode.getAttribute("title"));
+    } else if (aNode.hasAttribute("label")) {
+      wrapper.setAttribute("title", aNode.getAttribute("label"));
+    }
+
+    if (aNode.hasAttribute("flex")) {
+      wrapper.setAttribute("flex", aNode.getAttribute("flex"));
+    }
+
+    return wrapper;
+  },
+
+  unwrapToolbarItem: function(aWrapper) {
+    let toolbarItem = aWrapper.firstChild;
+
+    if (aWrapper.hasAttribute("itemdisabled")) {
+      toolbarItem.disabled = true;
+    }
+
+    if (aWrapper.hasAttribute("itemchecked")) {
+      toolbarItem.checked = true;
+    }
+
+    if (aWrapper.hasAttribute("itemcommand")) {
+      let commandID = aWrapper.getAttribute("itemcommand");
+      toolbarItem.setAttribute("command", commandID);
+
+      //XXX Bug 309953 - toolbarbuttons aren't in sync with their commands after customizing
+      let command = this.document.getElementById(commandID);
+      if (command && command.hasAttribute("disabled")) {
+        toolbarItem.setAttribute("disabled", command.getAttribute("disabled"));
+      }
+    }
+
+    aWrapper.parentNode.replaceChild(toolbarItem, aWrapper);
+    return toolbarItem;
+  },
+
+  //XXXjaws This doesn't handle custom toolbars.
+  //XXXmconley While CustomizableUI.jsm uses prefs to preserve state, we might
+  //           also want to (try) persisting with currentset as well to make it
+  //           less painful to switch to older builds.
+  persistCurrentSets: function()  {
+    //XXXjaws The toolbar bindings that are included in this changeset (/browser/base/content/toolbar.xml)
+    //        don't implement currentSet. They probably need to inherit the toolkit bindings.
+    return;
+
+    let document = this.document;
+    let toolbar = document.getElementById("nav-bar");
+
+    // Calculate currentset and store it in the attribute.
+    let currentSet = toolbar.currentSet;
+    toolbar.setAttribute("currentset", currentSet);
+
+    // Persist the currentset attribute directly on hardcoded toolbars.
+    document.persist(toolbar.id, "currentset");
+  },
+
+  reset: function() {
+    CustomizableUI.reset();
+  },
+
+  onWidgetMoved: function(aWidgetId, aArea, aOldPosition, aNewPosition) {
+    this._changed = true;
+  },
+
+  onWidgetAdded: function(aWidgetId, aArea, aPosition) {
+    this._changed = true;
+  },
+
+  onWidgetRemoved: function(aWidgetId, aArea) {
+    this._changed = true;
+  },
+
+  onWidgetCreated: function(aWidgetId) {
+  },
+
+  onWidgetDestroyed: function(aWidgetId) {
+  },
+
+  handleEvent: function(aEvent) {
+    switch(aEvent.type) {
+      case "dragstart":
+        this._onDragStart(aEvent);
+        break;
+      case "dragover":
+        this._onDragOver(aEvent);
+        break;
+      case "drop":
+        this._onDragDrop(aEvent);
+        break;
+    }
+  },
+
+  _onDragStart: function(aEvent) {
+    __dumpDragData(aEvent);
+    let item = aEvent.target;
+    while (item && item.localName != "toolbarpaletteitem") {
+      if (item.localName == "toolbar") {
+        return;
+      }
+      item = item.parentNode;
+    }
+
+    let dt = aEvent.dataTransfer;
+    let documentId = aEvent.target.ownerDocument.documentElement.id;
+    dt.setData("text/toolbarwrapper-id/" + documentId, item.firstChild.id);
+    dt.effectAllowed = "move";
+  },
+
+  _onDragOver: function(aEvent) {
+    __dumpDragData(aEvent);
+
+    let documentId = aEvent.target.ownerDocument.documentElement.id;
+    if (!aEvent.dataTransfer.types.contains("text/toolbarwrapper-id/"
+                                            + documentId.toLowerCase())) {
+      return;
+    }
+
+    aEvent.preventDefault();
+    aEvent.stopPropagation();
+  },
+
+  _onDragDrop: function(aEvent) {
+    __dumpDragData(aEvent);
+
+    let document = aEvent.target.ownerDocument;
+    let documentId = document.documentElement.id;
+    let draggedItemId = aEvent.dataTransfer.getData("text/toolbarwrapper-id/" + documentId);
+    let draggedWrapper = document.getElementById("wrapper-" + draggedItemId);
+
+    let targetNode = aEvent.target;
+    let targetParent = targetNode.parentNode;
+    let targetArea = this._getCustomizableParent(targetNode);
+    let originArea = this._getCustomizableParent(draggedWrapper);
+
+    // Do nothing if the target area or origin area are not customizable.
+    if (!targetArea || !originArea) {
+      return;
+    }
+
+    // We need to determine the place that the widget is being dropped in
+    // the target.
+    let position = Array.indexOf(targetParent.children, targetNode);
+
+    // 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) {
+      if (originArea.id !== kPaletteId) {
+        this._removeParentFlex(draggedWrapper);
+        let widget = this.unwrapToolbarItem(draggedWrapper);
+        CustomizableUI.removeWidgetFromArea(draggedItemId);
+        draggedWrapper = this.wrapToolbarItem(widget, "palette");
+      }
+      this.visiblePalette.appendChild(draggedWrapper);
+      return;
+    }
+
+    // Is the target area the same as the origin? Since we've already handled
+    // the possibility that the target is the customization palette, we know
+    // that the widget is moving within a customizable area.
+    if (targetArea === originArea) {
+      let widget = this.unwrapToolbarItem(draggedWrapper);
+      CustomizableUI.moveWidgetWithinArea(draggedItemId, position);
+      this.wrapToolbarItem(widget);
+      return;
+    }
+
+    // We're moving from one customization area to another. Remove any flexing
+    // that we might have added.
+    this._removeParentFlex(draggedWrapper);
+
+    // A little hackery - we quickly unwrap the item and use CustomizableUI's
+    // addWidgetToArea to move the widget to the right place for every window,
+    // then we re-wrap the widget.
+    let widget = this.unwrapToolbarItem(draggedWrapper);
+    CustomizableUI.addWidgetToArea(draggedItemId, targetArea.id, position);
+    LOG("Re-wrapping " + draggedItemId);
+    draggedWrapper = this.wrapToolbarItem(widget, "");
+
+    // If necessary, add flex to accomodate new child.
+    if (draggedWrapper.hasAttribute("flex")) {
+      let parent = draggedWrapper.parentNode;
+      let parentFlex = parent.hasAttribute("flex") ? parseInt(parent.getAttribute("flex"), 10) : 0;
+      let itemFlex = parseInt(draggedWrapper.getAttribute("flex"), 10);
+      parent.setAttribute("flex", parentFlex + itemFlex);
+    }
+  },
+
+  _removeParentFlex: function(aElement) {
+    if (aElement.parentNode.hasAttribute("flex") && aElement.hasAttribute("flex")) {
+      let parent = aElement.parentNode;
+      let parentFlex = parseInt(parent.getAttribute("flex"), 10);
+      let elementFlex = parseInt(aElement.getAttribute("flex"), 10);
+      parent.setAttribute("flex", Math.max(0, parentFlex - elementFlex));
+    }
+  },
+
+  _getCustomizableParent: function(aElement) {
+    let areas = CustomizableUI.areas;
+    areas.push(kPaletteId);
+    while (aElement) {
+      if (areas.indexOf(aElement.id) != -1) {
+        return aElement;
+      }
+      aElement = aElement.parentNode;
+    }
+    return null;
+  }
+};
+
+function __dumpDragData(aEvent, caller) {
+  let str = "Dumping drag data (CustomizeMode.jsm) {\n";
+  str += "  type: " + aEvent["type"] + "\n";
+  for (let el of ["target", "currentTarget", "relatedTarget"]) {
+    if (aEvent[el]) {
+      str += "  " + el + ": " + aEvent[el] + "(localName=" + aEvent[el].localName + "; id=" + aEvent[el].id + ")\n";
+    }
+  }
+  for (let prop in aEvent.dataTransfer) {
+    if (typeof aEvent.dataTransfer[prop] != "function") {
+      str += "  dataTransfer[" + prop + "]: " + aEvent.dataTransfer[prop] + "\n";
+    }
+  }
+  str += "}";
+  LOG(str);
+}
diff --git a/browser/modules/Makefile.in b/browser/modules/Makefile.in
index 983a3c91e56e..315f5ee59053 100644
--- a/browser/modules/Makefile.in
+++ b/browser/modules/Makefile.in
@@ -13,6 +13,7 @@ include $(topsrcdir)/config/config.mk
 
 EXTRA_JS_MODULES = \
 	BrowserNewTabPreloader.jsm \
+	CustomizableUI.jsm \
 	openLocationLastURL.jsm \
 	NetworkPrioritizer.jsm \
 	offlineAppCache.jsm \
@@ -25,6 +26,7 @@ EXTRA_JS_MODULES = \
 
 EXTRA_PP_JS_MODULES = \
 	AboutHomeUtils.jsm \
+	CustomizeMode.jsm \
 	RecentWindow.jsm \
 	$(NULL)
 
diff --git a/browser/themes/linux/appmenu.png b/browser/themes/linux/appmenu.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d0f12492fe643ade04a8ffaf333f7c729fa2f33
GIT binary patch
literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%``#fD7Ln>~ay|9<>AcIKT!^dVh
zPL~`nny9FX3QF0_hAc6;6tcysgRf4^t^C677rbS5HPZ`DB~%<wuk4)Jec#12dB&70
zX5l8mB0M@P+otl$&VQS#!NoRhkAa_i-U;LXK(-kF7yrj|Uf%a#Q@&=&9fQb=)r%4m
zJYV}6S8siM^qCG&@t?z{rA;&T{*4vkc_Z(0<&5Vdlix9>I)Mfou1K9RHs4iHP}kMe
uxHR{V$Mxmx?%StpNZgq3<I+0kqV!JNQte+wg;Rk(VeoYIb6Mw<&;$VPyJO}6

literal 0
HcmV?d00001

diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index bc9a1190e4e1..7a4d8912b5e4 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -18,6 +18,7 @@ browser.jar:
   skin/classic/browser/aboutSyncTabs.css
 #endif
   skin/classic/browser/actionicon-tab.png
+  skin/classic/browser/appmenu.png
 * skin/classic/browser/browser.css
   skin/classic/browser/click-to-play-warning-stripes.png
 * skin/classic/browser/engineManager.css
@@ -39,6 +40,7 @@ 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
diff --git a/browser/themes/linux/panelUIOverlay.css b/browser/themes/linux/panelUIOverlay.css
new file mode 100644
index 000000000000..f73f3c46e989
--- /dev/null
+++ b/browser/themes/linux/panelUIOverlay.css
@@ -0,0 +1,8 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+%filter substitution
+%define menuPanelWidth 23em
+
+%include ../shared/panelUIOverlay.inc.css
diff --git a/browser/themes/osx/appmenu.png b/browser/themes/osx/appmenu.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d0f12492fe643ade04a8ffaf333f7c729fa2f33
GIT binary patch
literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%``#fD7Ln>~ay|9<>AcIKT!^dVh
zPL~`nny9FX3QF0_hAc6;6tcysgRf4^t^C677rbS5HPZ`DB~%<wuk4)Jec#12dB&70
zX5l8mB0M@P+otl$&VQS#!NoRhkAa_i-U;LXK(-kF7yrj|Uf%a#Q@&=&9fQb=)r%4m
zJYV}6S8siM^qCG&@t?z{rA;&T{*4vkc_Z(0<&5Vdlix9>I)Mfou1K9RHs4iHP}kMe
uxHR{V$Mxmx?%StpNZgq3<I+0kqV!JNQte+wg;Rk(VeoYIb6Mw<&;$VPyJO}6

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index 6d54e9a0895d..e2fb06869fa3 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -18,6 +18,7 @@ browser.jar:
 #endif
   skin/classic/browser/actionicon-tab.png
   skin/classic/browser/actionicon-tab@2x.png
+  skin/classic/browser/appmenu.png
 * skin/classic/browser/browser.css                          (browser.css)
   skin/classic/browser/click-to-play-warning-stripes.png
 * skin/classic/browser/engineManager.css                    (engineManager.css)
@@ -58,6 +59,7 @@ 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
diff --git a/browser/themes/osx/panelUIOverlay.css b/browser/themes/osx/panelUIOverlay.css
new file mode 100644
index 000000000000..f73f3c46e989
--- /dev/null
+++ b/browser/themes/osx/panelUIOverlay.css
@@ -0,0 +1,8 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+%filter substitution
+%define menuPanelWidth 23em
+
+%include ../shared/panelUIOverlay.inc.css
diff --git a/browser/themes/shared/panelUIOverlay.inc.css b/browser/themes/shared/panelUIOverlay.inc.css
new file mode 100644
index 000000000000..3130eb4675ba
--- /dev/null
+++ b/browser/themes/shared/panelUIOverlay.inc.css
@@ -0,0 +1,249 @@
+/* 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/. */
+
+
+#PanelUI-contents[type="list"] > toolbarbutton {
+  -moz-binding: url("chrome://browser/content/panelUI.xml#toolbarbutton");
+}
+
+#app-extension-point-end > #PanelUI-menu-button {
+  padding: 2px 5px;
+}
+#app-extension-point-end > #PanelUI-menu-button .toolbarbutton-text {
+  display: none;
+}
+#app-extension-point-end > #PanelUI-menu-button .toolbarbutton-icon {
+  margin: 0;
+}
+
+#PanelUI-popup > arrowscrollbox > autorepeatbutton {
+  display: none;
+}
+#PanelUI-popup > arrowscrollbox > scrollbox {
+  overflow: visible;
+}
+
+#PanelUI-popup > .panel-arrowcontainer > .panel-arrowcontent {
+  padding: 0;
+}
+
+#PanelUI-menu-button > .toolbarbutton-icon {
+  list-style-image: url("chrome://browser/skin/appmenu.png");
+}
+
+#PanelUI-menu-button {
+  list-style-image: none;
+}
+
+#PanelUI-mainView .toolbarbutton-text {
+  display: -moz-box;
+  font-size: 10px;
+}
+
+#PanelUI-contents {
+  max-width: @menuPanelWidth@;
+  padding: 0 1em;
+}
+
+#PanelUI-container {
+  overflow: hidden;
+}
+
+#PanelUI-popup[panelopen="true"] > #PanelUI-container {
+  transition: height 150ms;
+}
+
+#PanelUI-popup[panelopen="true"] > #PanelUI-container > #PanelUI-viewStack > #PanelUI-mainView {
+  transition: transform 150ms;
+}
+
+#PanelUI-viewStack[view="main"] > #PanelUI-clickCapturer {
+  pointer-events: none;
+}
+
+#PanelUI-viewStack {
+  position: relative;
+}
+
+#PanelUI-viewStack,
+#PanelUI-container {
+  min-width: @menuPanelWidth@;
+}
+
+#PanelUI-mainView-springy {
+  height: 0;
+  transition: height 150ms;
+}
+
+#PanelUI-subViews {
+  -moz-stack-sizing: ignore;
+  background-image: linear-gradient(to bottom, white 1px, rgba(255, 255, 255, 0) 15px);
+  background-color: -moz-dialog;
+  box-shadow: -1px 0px 0px rgba(0, 0, 0, 0.2), -1px 0px 2px rgba(0, 0, 0, 0.1), 1px 0px 0px rgba(255, 255, 255, 0.2) inset;
+  margin-left: 38px;
+  position: absolute;
+  transform: translateX(@menuPanelWidth@);
+  transition: transform 150ms;
+}
+
+#PanelUI-viewStack[view="subview"] > #PanelUI-subViews {
+  transform: translateX(0);
+}
+
+#PanelUI-contents[type="list"] > toolbarbutton {
+  -moz-box-orient: horizontal;
+}
+
+#PanelUI-contents[type="list"] toolbarbutton .toolbarbutton-text,
+#PanelUI-subViews toolbarbutton .toolbarbutton-text {
+  text-align: start;
+  -moz-padding-start: 8px;
+  font-size: 12px;
+}
+
+#PanelUI-contents[type="list"] toolbarbutton .toolbarbutton-acceltext {
+  font-size: 10px;
+  color: GrayText;
+  margin-left: 0;
+  margin-right: 0;
+}
+
+#PanelUI-contents[type="list"] toolbarbutton .toolbarbutton-icon {
+  min-width: 24px;
+  max-width: 24px;
+  min-height: 24px;
+  max-height: 24px;
+}
+
+#PanelUI-contents[type="grid"] {
+  display: block;
+}
+
+#PanelUI-contents[type="grid"] toolbarbutton {
+  -moz-box-orient: vertical;
+  min-width: 72px;
+  max-width: 72px;
+  min-height: 72px;
+  max-height: 72px;
+}
+
+#PanelUI-contents[type="grid"] toolbarbutton .toolbarbutton-icon {
+  min-width: 32px;
+  max-width: 32px;
+  min-height: 32px;
+  max-height: 32px;
+  margin: 5px;
+}
+
+.PanelUI-pageControls {
+  padding: 12px 20px;
+}
+
+.PanelUI-editControls,
+.PanelUI-zoomControls {
+  padding: 6px 0;
+}
+
+
+.PanelUI-pageControls toolbarbutton {
+  list-style-image: url("chrome://browser/skin/Toolbar.png");
+}
+
+#PanelUI-cut-btn {
+  -moz-image-region: rect(0, 216px, 18px, 198px);
+}
+#PanelUI-copy-btn {
+  -moz-image-region: rect(0, 234px, 18px, 216px);
+}
+#PanelUI-paste-btn {
+  -moz-image-region: rect(0, 252px, 18px, 234px);
+}
+
+#PanelUI-zoomOut-btn {
+  -moz-image-region: rect(0, 288px, 18px, 270px);
+  padding-left: 12px;
+  padding-right: 12px;
+}
+#PanelUI-zoomIn-btn {
+  -moz-image-region: rect(0, 306px, 18px, 288px);
+  padding-left: 12px;
+  padding-right: 12px;
+}
+
+.PanelUI-editControls #PanelUI-copy-btn,
+.PanelUI-zoomControls #PanelUI-zoomReset-btn {
+  border-left: none;
+  border-right: none;
+  border-radius: 0;
+}
+
+#PanelUI-zoomIn-btn .toolbarbutton-text,
+#PanelUI-zoomOut-btn .toolbarbutton-text,
+#PanelUI-zoomReset-btn .toolbarbutton-icon {
+  display: none;
+}
+
+.PanelUI-footer {
+  padding: 9px 12px;
+  background-color: rgba(0, 0, 0, 0.05);
+  border-top: 1px solid rgba(0,0,0,.1);
+}
+
+.PanelUI-footer toolbarbutton > .toolbarbutton-icon {
+  display: none;
+}
+
+#PanelUI-help-btn {
+  -moz-appearance: none;
+  border: none;
+  box-shadow: none;
+  background: transparent;
+  text-decoration: underline;
+  cursor: pointer;
+}
+
+#customization-palette .toolbarbutton-text {
+  display: none;
+}
+
+#PanelUI-subViews toolbarbutton, 
+#PanelUI-mainView toolbarbutton {
+  -moz-appearance: none;
+  padding: 2px 6px;
+  background: hsla(210,32%,93%,0) padding-box;
+  border-radius: 2px;
+  border: 1px solid;
+  border-color: hsla(210,54%,20%,0) hsla(210,54%,20%,0) hsla(210,54%,20%,0);
+  box-shadow: 0 1px hsla(0,0%,100%,0) inset,
+              0 1px hsla(210,54%,20%,0),
+              0 0 2px hsla(210,54%,20%,0);
+  transition-property: background-color, border-color, box-shadow;
+  transition-duration: 150ms;
+}
+
+#PanelUI-subViews toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
+#PanelUI-mainView toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
+#PanelUI-mainView .PanelUI-pageControls toolbarbutton,
+#PanelUI-mainView #PanelUI-customize-btn {
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
+  border-color: hsla(210,54%,20%,.15) hsla(210,54%,20%,.2) hsla(210,54%,20%,.25);
+  box-shadow: 0 1px hsla(0,0%,100%,.3) inset,
+              0 1px hsla(210,54%,20%,.03),
+              0 0 2px hsla(210,54%,20%,.1);
+}
+
+#PanelUI-subViews toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
+#PanelUI-mainView toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active) {
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
+  background-color: hsla(210,54%,20%,.15);
+  border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);
+  box-shadow: 0 1px 1px hsla(210,54%,20%,.1) inset,
+              0 0 1px hsla(210,54%,20%,.2) inset,
+              0 1px 0 hsla(210,54%,20%,0),
+              0 0 2px hsla(210,54%,20%,0);
+  text-shadow: none;
+  transition: none;
+}
+
+
diff --git a/browser/themes/windows/appmenu.png b/browser/themes/windows/appmenu.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d0f12492fe643ade04a8ffaf333f7c729fa2f33
GIT binary patch
literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%``#fD7Ln>~ay|9<>AcIKT!^dVh
zPL~`nny9FX3QF0_hAc6;6tcysgRf4^t^C677rbS5HPZ`DB~%<wuk4)Jec#12dB&70
zX5l8mB0M@P+otl$&VQS#!NoRhkAa_i-U;LXK(-kF7yrj|Uf%a#Q@&=&9fQb=)r%4m
zJYV}6S8siM^qCG&@t?z{rA;&T{*4vkc_Z(0<&5Vdlix9>I)Mfou1K9RHs4iHP}kMe
uxHR{V$Mxmx?%StpNZgq3<I+0kqV!JNQte+wg;Rk(VeoYIb6Mw<&;$VPyJO}6

literal 0
HcmV?d00001

diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 2a823c05f617..b43d0904e3c6 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -811,7 +811,7 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-box-pack: center;
 }
 
-@navbarLargeIcons@ .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#social-provider-button) {
+@navbarLargeIcons@ .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#social-provider-button):not(#PanelUI-menu-button) {
   padding-left: 5px;
   padding-right: 5px;
 }
@@ -851,7 +851,7 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   padding: 3px 7px;
 }
 
-@navbarLargeIcons@ .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#social-provider-button) > .toolbarbutton-icon,
+@navbarLargeIcons@ .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#social-provider-button):not(#PanelUI-menu-button) > .toolbarbutton-icon,
 @navbarLargeIcons@ .toolbarbutton-1[type=menu] > .toolbarbutton-text /* hack for add-ons that forcefully display the label */ {
   -moz-padding-end: 17px;
 }
@@ -2929,6 +2929,45 @@ chatbox {
   border-top-right-radius: 2.5px;
 }
 
+/* Customization mode */
+#main-window[customizing] {
+  background-image: linear-gradient(to bottom, #3A75AD, #134F94);
+}
+
+#main-window[customizing] #tab-view-deck {
+  transition-property: padding;
+  transition-duration: 150ms;
+  transition-timing-function: ease-in-out;
+  padding: 3em;
+  -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox")
+}
+
+#main-window:not([customizing]) #tab-view-deck {
+  transition-property: padding;
+  transition-duration: 150ms;
+  transition-timing-function: ease-in-out;
+  padding: 0;
+}
+
+#main-window[customizing] .tabbrowser-tab:not([selected]),
+#main-window[customizing] .tabs-newtab-button {
+  opacity: 0.4;
+}
+
+#main-window[customizing] .customization-target,
+#customization-panelHolder > #PanelUI-mainView {
+  box-shadow: inset 0 0 3px blue;
+  border-radius: 2px;
+}
+
+#customization-palette > toolbarpaletteitem {
+  display: inline-block;
+  -moz-orient: vertical;
+  padding: 1em;
+}
+
+/* end Customization mode */
+
 .click-to-play-plugins-notification-content {
   margin: -10px;
   border-radius: 4px;
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index cd94d096ec64..81e2c7451ab8 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -20,6 +20,7 @@ browser.jar:
         skin/classic/browser/aboutSyncTabs.css
 #endif
         skin/classic/browser/actionicon-tab.png
+        skin/classic/browser/appmenu.png
         skin/classic/browser/appmenu-icons.png
         skin/classic/browser/appmenu-dropmarker.png
 *       skin/classic/browser/browser.css
@@ -47,6 +48,7 @@ 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
@@ -270,6 +272,7 @@ browser.jar:
         skin/classic/aero/browser/aboutSyncTabs.css
 #endif
         skin/classic/aero/browser/actionicon-tab.png
+        skin/classic/aero/browser/appmenu.png
         skin/classic/aero/browser/appmenu-dropmarker.png
         skin/classic/aero/browser/appmenu-icons.png
 *       skin/classic/aero/browser/browser.css                        (browser-aero.css)
@@ -297,6 +300,7 @@ 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)
diff --git a/browser/themes/windows/panelUIOverlay.css b/browser/themes/windows/panelUIOverlay.css
new file mode 100644
index 000000000000..f73f3c46e989
--- /dev/null
+++ b/browser/themes/windows/panelUIOverlay.css
@@ -0,0 +1,8 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+%filter substitution
+%define menuPanelWidth 23em
+
+%include ../shared/panelUIOverlay.inc.css
diff --git a/toolkit/themes/linux/global/inContentUI.css b/toolkit/themes/linux/global/inContentUI.css
index 98a430ee7adc..aa12377a345d 100644
--- a/toolkit/themes/linux/global/inContentUI.css
+++ b/toolkit/themes/linux/global/inContentUI.css
@@ -9,7 +9,6 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
 
-
 /* Page background */
 *|*:root {
   -moz-appearance: none;

From fa5e4431ef1d7e93b31f2e0f3a74128449583467 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 22 Mar 2013 15:15:57 -0400
Subject: [PATCH 011/230] Bug 770135 - When exiting customization mode, make
 sure the container in the panel is synced up with the main view. r=mconley.

---
 browser/base/content/panelUI.js | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/browser/base/content/panelUI.js b/browser/base/content/panelUI.js
index 93e9cf4b5b3c..caa040ad509e 100644
--- a/browser/base/content/panelUI.js
+++ b/browser/base/content/panelUI.js
@@ -53,9 +53,7 @@ const PanelUI = {
       this.container.style.height = this.subViews.scrollHeight + "px";
     } else {
       this.viewStack.setAttribute("view", "main");
-      let springHeight = this.mainViewSpring.getBoundingClientRect().height;
-      this.container.style.height = (this.mainView.scrollHeight - springHeight) + "px";
-      this.mainViewSpring.style.height = "";
+      this._syncContainerWithMainView();
     }
 
     return aVal;
@@ -99,6 +97,7 @@ const PanelUI = {
    */
   replaceMainView: function(aMainView) {
     this.viewStack.insertBefore(aMainView, this.viewStack.firstChild);
+    this._syncContainerWithMainView();
   },
 
   /**
@@ -206,6 +205,17 @@ const PanelUI = {
     this._showingSubView = true;
   },
 
+  /**
+   * Ensures that the container has the same height as the main view, minus
+   * any spring height. This is usually done after customization completes, or
+   * when switching back from a subview.
+   */
+  _syncContainerWithMainView: function() {
+    let springHeight = this.mainViewSpring.getBoundingClientRect().height;
+    this.container.style.height = (this.mainView.scrollHeight - springHeight) + "px";
+    this.mainViewSpring.style.height = "";
+  },
+
   /**
    * Sets the anchor node into the open or closed state, depending
    * on the state of the panel.
@@ -237,6 +247,10 @@ const PanelUI = {
     }
   },
 
+  /**
+   * When viewing a subview, any click on the main view gets intercepted by our
+   * capturer, and then we switch to the main view.
+   */
   _onCapturerClick: function(aEvent) {
     PanelUI.showMainView();
   },

From 6100612e6f00567d768981899bb0f92bdfe3f293 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 22 Mar 2013 15:15:58 -0400
Subject: [PATCH 012/230] Bug 844281 - When dropping items into the palette,
 make it possible to drop amongst the items instead of just appending to the
 list. r=Unfocused.

---
 browser/modules/CustomizeMode.jsm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/modules/CustomizeMode.jsm b/browser/modules/CustomizeMode.jsm
index 85839b136e48..d574151932f5 100644
--- a/browser/modules/CustomizeMode.jsm
+++ b/browser/modules/CustomizeMode.jsm
@@ -409,7 +409,7 @@ CustomizeMode.prototype = {
         CustomizableUI.removeWidgetFromArea(draggedItemId);
         draggedWrapper = this.wrapToolbarItem(widget, "palette");
       }
-      this.visiblePalette.appendChild(draggedWrapper);
+      this.visiblePalette.insertBefore(draggedWrapper, targetNode);
       return;
     }
 

From ed1d7b1c44ed223dac5c97745fd2e1eb9fa097ac Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 22 Mar 2013 15:15:58 -0400
Subject: [PATCH 013/230] Bug 770135 - Make it so that programmatically
 generated widgets behave properly when customizing. r=Unfocused.

---
 browser/modules/CustomizableUI.jsm | 10 +++++++++-
 browser/modules/CustomizeMode.jsm  | 26 ++++++++++++++++++++------
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/browser/modules/CustomizableUI.jsm b/browser/modules/CustomizableUI.jsm
index 6af465b4656b..0a72ba6cf674 100644
--- a/browser/modules/CustomizableUI.jsm
+++ b/browser/modules/CustomizableUI.jsm
@@ -401,6 +401,14 @@ let CustomizableUIInternal = {
 
     let widget = gPalette.get(aWidgetId);
     if (widget) {
+      // If we have an instance of this widget already, just use that.
+      if (widget.instances.has(aDocument)) {
+        LOG("An instance of widget " + aWidgetId + " already exists in this "
+            + "document. Reusing.");
+        return [ CustomizableUI.PROVIDER_API,
+                 widget.instances.get(aDocument) ];
+      }
+
       return [ CustomizableUI.PROVIDER_API,
                this.buildWidget(aDocument, null, widget) ];
     }
@@ -489,7 +497,7 @@ let CustomizableUIInternal = {
     if (!areaNodes) {
       return;
     }
-    
+
     for (let areaNode of areaNodes) {
       let container = areaNode.customizationTarget;
       let widgetNode = container.ownerDocument.getElementById(aWidgetId);
diff --git a/browser/modules/CustomizeMode.jsm b/browser/modules/CustomizeMode.jsm
index d574151932f5..4bad0abccd08 100644
--- a/browser/modules/CustomizeMode.jsm
+++ b/browser/modules/CustomizeMode.jsm
@@ -55,11 +55,11 @@ CustomizeMode.prototype = {
   _stowedPalette: null,
 
   enter: function() {
-    CustomizableUI.addListener(this);
-
     let window = this.window;
     let document = this.document;
 
+    CustomizableUI.addListener(this);
+
     // Let everybody in this window know that we're about to customize.
     let evt = document.createEvent("CustomEvent");
     evt.initCustomEvent("CustomizationStart", true, true, window);
@@ -220,7 +220,14 @@ CustomizeMode.prototype = {
 
   wrapToolbarItem: function(aNode, aPlace) {
     let wrapper = this.createWrapper(aNode, aPlace);
-    aNode = aNode.parentNode.replaceChild(wrapper, aNode);
+    // It's possible that this toolbar node is "mid-flight" and doesn't have
+    // a parent, in which case we skip replacing it. This can happen if a
+    // toolbar item has been dragged into the palette. In that case, we tell
+    // CustomizableUI to remove the widget from its area before putting the
+    // widget in the palette - so the node will have no parent.
+    if (aNode.parentNode) {
+      aNode = aNode.parentNode.replaceChild(wrapper, aNode);
+    }
     wrapper.appendChild(aNode);
     return wrapper;
   },
@@ -289,7 +296,9 @@ CustomizeMode.prototype = {
       }
     }
 
-    aWrapper.parentNode.replaceChild(toolbarItem, aWrapper);
+    if (aWrapper.parentNode) {
+      aWrapper.parentNode.replaceChild(toolbarItem, aWrapper);
+    }
     return toolbarItem;
   },
 
@@ -409,7 +418,13 @@ CustomizeMode.prototype = {
         CustomizableUI.removeWidgetFromArea(draggedItemId);
         draggedWrapper = this.wrapToolbarItem(widget, "palette");
       }
-      this.visiblePalette.insertBefore(draggedWrapper, targetNode);
+
+      // If the targetNode is the palette itself, just append
+      if (targetNode == this.visiblePalette) {
+        this.visiblePalette.appendChild(draggedWrapper);
+      } else {
+        this.visiblePalette.insertBefore(draggedWrapper, targetNode);
+      }
       return;
     }
 
@@ -432,7 +447,6 @@ CustomizeMode.prototype = {
     // then we re-wrap the widget.
     let widget = this.unwrapToolbarItem(draggedWrapper);
     CustomizableUI.addWidgetToArea(draggedItemId, targetArea.id, position);
-    LOG("Re-wrapping " + draggedItemId);
     draggedWrapper = this.wrapToolbarItem(widget, "");
 
     // If necessary, add flex to accomodate new child.

From 629ee0029a859b39f43773cb8ee97dbcf2da35fe Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 22 Mar 2013 15:15:58 -0400
Subject: [PATCH 014/230] Bug 770135 - Make going into customization mode more
 stylish and splendid. r=jaws.

---
 browser/themes/linux/browser.css              |  41 ++++++++++++++++++
 .../customization-mode-background.jpg         | Bin 0 -> 92662 bytes
 browser/themes/linux/jar.mn                   |   1 +
 browser/themes/osx/browser.css                |  41 ++++++++++++++++++
 .../customization-mode-background.jpg         | Bin 0 -> 92662 bytes
 browser/themes/osx/jar.mn                     |   1 +
 browser/themes/windows/browser.css            |  14 +++---
 .../customization-mode-background.jpg         | Bin 0 -> 92662 bytes
 browser/themes/windows/jar.mn                 |   2 +
 9 files changed, 94 insertions(+), 6 deletions(-)
 create mode 100644 browser/themes/linux/customization/customization-mode-background.jpg
 create mode 100644 browser/themes/osx/customization/customization-mode-background.jpg
 create mode 100644 browser/themes/windows/customization/customization-mode-background.jpg

diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 7787ff156735..4aa9955684c3 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -2166,6 +2166,47 @@ chatbox {
   border-top-right-radius: 2.5px;
 }
 
+/* Customization mode */
+#main-window[customizing] {
+  background-image: url("chrome://browser/skin/customization/customization-mode-background.jpg");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+}
+
+#main-window[customizing] #tab-view-deck {
+  transition-property: padding;
+  transition-duration: 300ms;
+  transition-timing-function: ease-out;
+  padding: 8em;
+  -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox")
+}
+
+#main-window:not([customizing]) #tab-view-deck {
+  transition-property: padding;
+  transition-duration: 200ms;
+  transition-timing-function: ease-out;
+  padding: 0;
+}
+
+#main-window[customizing] .tabbrowser-tab:not([selected]),
+#main-window[customizing] .tabs-newtab-button {
+  opacity: 0.4;
+}
+
+#main-window[customizing] .customization-target,
+#customization-panelHolder > #PanelUI-mainView {
+  box-shadow: inset 0 0 3px blue;
+  border-radius: 2px;
+}
+
+#customization-palette > toolbarpaletteitem {
+  display: inline-block;
+  -moz-orient: vertical;
+  padding: 1em;
+}
+
+/* end Customization mode */
+
 .click-to-play-plugins-notification-content {
   margin: -10px;
 }
diff --git a/browser/themes/linux/customization/customization-mode-background.jpg b/browser/themes/linux/customization/customization-mode-background.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..465cdb71f9bff80e491341780634956f8921d254
GIT binary patch
literal 92662
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

literal 0
HcmV?d00001

diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index 7a4d8912b5e4..317616afa84d 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -21,6 +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/engineManager.css
   skin/classic/browser/Geolocation-16.png
   skin/classic/browser/Geolocation-64.png
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index aee73ac01d85..3cfae76adeda 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -3598,6 +3598,47 @@ chatbox {
   border-top-right-radius: @toolbarbuttonCornerRadius@;
 }
 
+/* Customization mode */
+#main-window[customizing] {
+  background-image: url("chrome://browser/skin/customization/customization-mode-background.jpg");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+}
+
+#main-window[customizing] #tab-view-deck {
+  transition-property: padding;
+  transition-duration: 300ms;
+  transition-timing-function: ease-out;
+  padding: 8em;
+  -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox")
+}
+
+#main-window:not([customizing]) #tab-view-deck {
+  transition-property: padding;
+  transition-duration: 200ms;
+  transition-timing-function: ease-out;
+  padding: 0;
+}
+
+#main-window[customizing] .tabbrowser-tab:not([selected]),
+#main-window[customizing] .tabs-newtab-button {
+  opacity: 0.4;
+}
+
+#main-window[customizing] .customization-target,
+#customization-panelHolder > #PanelUI-mainView {
+  box-shadow: inset 0 0 3px blue;
+  border-radius: 2px;
+}
+
+#customization-palette > toolbarpaletteitem {
+  display: inline-block;
+  -moz-orient: vertical;
+  padding: 1em;
+}
+
+/* end Customization mode */
+
 panel[type="arrow"][popupid="click-to-play-plugins"] > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="top"],
 panel[type="arrow"][popupid="click-to-play-plugins"] > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="bottom"] {
   list-style-image: url("chrome://global/skin/arrow/panelarrow-light-vertical.png");
diff --git a/browser/themes/osx/customization/customization-mode-background.jpg b/browser/themes/osx/customization/customization-mode-background.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..465cdb71f9bff80e491341780634956f8921d254
GIT binary patch
literal 92662
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

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index e2fb06869fa3..f12bee2165ec 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -21,6 +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/engineManager.css                    (engineManager.css)
   skin/classic/browser/Geolocation-16.png
   skin/classic/browser/Geolocation-16@2x.png
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index b43d0904e3c6..b84df347b7cd 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2931,21 +2931,23 @@ chatbox {
 
 /* Customization mode */
 #main-window[customizing] {
-  background-image: linear-gradient(to bottom, #3A75AD, #134F94);
+  background-image: url("chrome://browser/skin/customization/customization-mode-background.jpg");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
 }
 
 #main-window[customizing] #tab-view-deck {
   transition-property: padding;
-  transition-duration: 150ms;
-  transition-timing-function: ease-in-out;
-  padding: 3em;
+  transition-duration: 300ms;
+  transition-timing-function: ease-out;
+  padding: 8em;
   -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox")
 }
 
 #main-window:not([customizing]) #tab-view-deck {
   transition-property: padding;
-  transition-duration: 150ms;
-  transition-timing-function: ease-in-out;
+  transition-duration: 200ms;
+  transition-timing-function: ease-out;
   padding: 0;
 }
 
diff --git a/browser/themes/windows/customization/customization-mode-background.jpg b/browser/themes/windows/customization/customization-mode-background.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..465cdb71f9bff80e491341780634956f8921d254
GIT binary patch
literal 92662
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

literal 0
HcmV?d00001

diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index 81e2c7451ab8..b4cbb6478e4e 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -25,6 +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/engineManager.css
         skin/classic/browser/Geolocation-16.png
         skin/classic/browser/Geolocation-64.png
@@ -277,6 +278,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/engineManager.css
         skin/classic/aero/browser/Geolocation-16.png
         skin/classic/aero/browser/Geolocation-64.png

From c6e20a59c6efce6c4636808606436cbfd12f71b3 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 22 Mar 2013 15:15:58 -0400
Subject: [PATCH 015/230] Bug 770135 - Make it possible to exit customize mode
 by pressing Esc or clicking the menu button. r=jaws.

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

diff --git a/browser/modules/CustomizeMode.jsm b/browser/modules/CustomizeMode.jsm
index 4bad0abccd08..a26e963ceeb9 100644
--- a/browser/modules/CustomizeMode.jsm
+++ b/browser/modules/CustomizeMode.jsm
@@ -60,6 +60,14 @@ CustomizeMode.prototype = {
 
     CustomizableUI.addListener(this);
 
+    // Add a keypress listener to the tab-view-deck so that we can quickly
+    // exit customization mode when pressing ESC
+    let tabViewDeck = document.getElementById("tab-view-deck");
+    tabViewDeck.addEventListener("keypress", this, false);
+    // Same goes for the menu button - if we're customizing, a click to the
+    // menu button means a quick exit from customization mode.
+    window.PanelUI.menuButton.addEventListener("click", this, false);
+
     // Let everybody in this window know that we're about to customize.
     let evt = document.createEvent("CustomEvent");
     evt.initCustomEvent("CustomizationStart", true, true, window);
@@ -106,6 +114,10 @@ CustomizeMode.prototype = {
   exit: function(aToolboxChanged) {
     CustomizableUI.removeListener(this);
 
+    let tabViewDeck = this.document.getElementById("tab-view-deck");
+    tabViewDeck.removeEventListener("keypress", this, false);
+    this.window.PanelUI.menuButton.removeEventListener("click", this, false);
+
     this.depopulatePalette();
 
     this.visiblePalette.removeEventListener("dragstart", this);
@@ -355,6 +367,18 @@ CustomizeMode.prototype = {
       case "drop":
         this._onDragDrop(aEvent);
         break;
+      case "keypress":
+        if (aEvent.keyCode === aEvent.DOM_VK_ESCAPE) {
+          this.exit();
+        }
+        break;
+      case "click":
+        if (aEvent.button == 0 &&
+            aEvent.originalTarget == this.window.PanelUI.menuButton) {
+          this.exit();
+          aEvent.preventDefault();
+        }
+        break;
     }
   },
 

From e4a2508259d167f42d80941caa6746746ced5a67 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Fri, 22 Mar 2013 15:26:26 -0400
Subject: [PATCH 016/230] Bug 770135 - Add back the rudimentary drop indicator.
 r=jaws,mconley.

---
 browser/modules/CustomizeMode.jsm | 95 +++++++++++++++++++++++++++++--
 1 file changed, 90 insertions(+), 5 deletions(-)

diff --git a/browser/modules/CustomizeMode.jsm b/browser/modules/CustomizeMode.jsm
index a26e963ceeb9..db8bda19613f 100644
--- a/browser/modules/CustomizeMode.jsm
+++ b/browser/modules/CustomizeMode.jsm
@@ -53,6 +53,7 @@ CustomizeMode.prototype = {
   // restore gNavToolbox.palette to its original state after exiting
   // customization mode.
   _stowedPalette: null,
+  _dragOverItem: null,
 
   enter: function() {
     let window = this.window;
@@ -94,9 +95,10 @@ CustomizeMode.prototype = {
         let target = CustomizableUI.getCustomizeTargetForArea(area, window);
         target.addEventListener("dragstart", self);
         target.addEventListener("dragover", self);
+        target.addEventListener("dragexit", self);
         target.addEventListener("drop", self);
-        for (let toolbarItem of target.children) {
-          self.wrapToolbarItem(toolbarItem, "");
+        for (let child of target.children) {
+          self.wrapToolbarItem(child, getPlaceForItem(child));
         }
         self.areas.push(target);
       }
@@ -106,6 +108,7 @@ CustomizeMode.prototype = {
 
     this.visiblePalette.addEventListener("dragstart", this);
     this.visiblePalette.addEventListener("dragover", this);
+    this.visiblePalette.addEventListener("dragexit", this);
     this.visiblePalette.addEventListener("drop", this);
 
     document.documentElement.setAttribute("customizing", true);
@@ -122,6 +125,7 @@ CustomizeMode.prototype = {
 
     this.visiblePalette.removeEventListener("dragstart", this);
     this.visiblePalette.removeEventListener("dragover", this);
+    this.visiblePalette.removeEventListener("dragexit", this);
     this.visiblePalette.removeEventListener("drop", this);
 
     let window = this.window;
@@ -148,6 +152,7 @@ CustomizeMode.prototype = {
       }
       target.removeEventListener("dragstart", this);
       target.removeEventListener("dragover", this);
+      target.removeEventListener("dragexit", this);
       target.removeEventListener("drop", this);
     }
 
@@ -367,6 +372,9 @@ CustomizeMode.prototype = {
       case "drop":
         this._onDragDrop(aEvent);
         break;
+      case "dragexit":
+        this._onDragExit(aEvent);
+        break;
       case "keypress":
         if (aEvent.keyCode === aEvent.DOM_VK_ESCAPE) {
           this.exit();
@@ -401,12 +409,41 @@ CustomizeMode.prototype = {
   _onDragOver: function(aEvent) {
     __dumpDragData(aEvent);
 
-    let documentId = aEvent.target.ownerDocument.documentElement.id;
+    let document = aEvent.target.ownerDocument;
+    let documentId = document.documentElement.id;
     if (!aEvent.dataTransfer.types.contains("text/toolbarwrapper-id/"
                                             + documentId.toLowerCase())) {
       return;
     }
 
+    let draggedItemId = aEvent.dataTransfer.getData("text/toolbarwrapper-id/" + documentId);
+    let draggedWrapper = document.getElementById("wrapper-" + draggedItemId);
+    let targetNode = aEvent.target;
+    let targetParent = targetNode.parentNode;
+    let targetArea = this._getCustomizableParent(targetNode);
+    let originArea = this._getCustomizableParent(draggedWrapper);
+
+    // Do nothing if the target or origin are not customizable.
+    if (!targetArea || !originArea) {
+      gCurrentDragOverItem = null;
+      return;
+    }
+
+    // We need to determine the place that the widget is being dropped in
+    // the target.
+    let position = Array.indexOf(targetParent.children, targetNode);
+    let dragOverItem = position == -1 ? targetParent.lastChild : targetParent.children[position];
+
+    if (this._dragOverItem && dragOverItem != this._dragOverItem) {
+      this._setDragActive(this._dragOverItem, false);
+    }
+
+    // XXXjaws Only handling the toolbar case first.
+    if (targetArea.localName === "toolbar") {
+      this._setDragActive(dragOverItem, true);
+    }
+    this._dragOverItem = dragOverItem;
+
     aEvent.preventDefault();
     aEvent.stopPropagation();
   },
@@ -414,6 +451,8 @@ CustomizeMode.prototype = {
   _onDragDrop: function(aEvent) {
     __dumpDragData(aEvent);
 
+    this._setDragActive(this._dragOverItem, false);
+
     let document = aEvent.target.ownerDocument;
     let documentId = document.documentElement.id;
     let draggedItemId = aEvent.dataTransfer.getData("text/toolbarwrapper-id/" + documentId);
@@ -458,7 +497,7 @@ CustomizeMode.prototype = {
     if (targetArea === originArea) {
       let widget = this.unwrapToolbarItem(draggedWrapper);
       CustomizableUI.moveWidgetWithinArea(draggedItemId, position);
-      this.wrapToolbarItem(widget);
+      this.wrapToolbarItem(widget, getPlaceForItem(targetNode));
       return;
     }
 
@@ -471,7 +510,7 @@ CustomizeMode.prototype = {
     // then we re-wrap the widget.
     let widget = this.unwrapToolbarItem(draggedWrapper);
     CustomizableUI.addWidgetToArea(draggedItemId, targetArea.id, position);
-    draggedWrapper = this.wrapToolbarItem(widget, "");
+    draggedWrapper = this.wrapToolbarItem(widget, getPlaceForItem(targetNode));
 
     // If necessary, add flex to accomodate new child.
     if (draggedWrapper.hasAttribute("flex")) {
@@ -482,6 +521,36 @@ CustomizeMode.prototype = {
     }
   },
 
+  _onDragExit: function(aEvent) {
+    if (this._dragOverItem) {
+      this._setDragActive(this._dragOverItem, false);
+    }
+  },
+
+  // XXXjaws Show a ghost image or blank area where the item could be added, instead of black bar
+  _setDragActive: function(aItem, aValue) {
+    let node = aItem;
+    let window = aItem.ownerDocument.defaultView;
+    let direction = window.getComputedStyle(aItem, null).direction;
+    let value = direction == "ltr"? "left" : "right";
+    if (aItem.localName == "toolbar") {
+      node = aItem.lastChild;
+      value = direction == "ltr"? "right" : "left";
+    }
+
+    if (!node) {
+      return;
+    }
+
+    if (aValue) {
+      if (!node.hasAttribute("dragover")) {
+        node.setAttribute("dragover", value);
+      }
+    } else {
+      node.removeAttribute("dragover");
+    }
+  },
+
   _removeParentFlex: function(aElement) {
     if (aElement.parentNode.hasAttribute("flex") && aElement.hasAttribute("flex")) {
       let parent = aElement.parentNode;
@@ -504,6 +573,22 @@ CustomizeMode.prototype = {
   }
 };
 
+function getPlaceForItem(aElement) {
+  let place;
+  let node = aElement;
+  while (node && !place) {
+    if (node.localName == "toolbar")
+      place = "toolbar";
+    else if (node.id == CustomizableUI.AREA_PANEL)
+      place = "panel";
+    else if (node.id == kPaletteId)
+      place = "palette";
+
+    node = node.parentNode;
+  }
+  return place;
+}
+
 function __dumpDragData(aEvent, caller) {
   let str = "Dumping drag data (CustomizeMode.jsm) {\n";
   str += "  type: " + aEvent["type"] + "\n";

From 65240f3639e5333a843eac72aeafdea2673e82fa Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 22 Mar 2013 17:27:57 -0400
Subject: [PATCH 017/230] Bug 770135 - Make customization targets more blue
 instead of purple. r=jaws.

---
 browser/themes/windows/browser.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index b84df347b7cd..24333dbb407a 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2958,7 +2958,7 @@ chatbox {
 
 #main-window[customizing] .customization-target,
 #customization-panelHolder > #PanelUI-mainView {
-  box-shadow: inset 0 0 3px blue;
+  box-shadow: inset 0 0 3px hsl(204,100%,40%);
   border-radius: 2px;
 }
 

From 2f35fc425d06ad7bf6358f03f1cc958c093bb9ac Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 22 Mar 2013 17:28:31 -0400
Subject: [PATCH 018/230] Bug 770135 - Disable the menu button when in
 customization mode. r=mconley.

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

diff --git a/browser/modules/CustomizeMode.jsm b/browser/modules/CustomizeMode.jsm
index db8bda19613f..29bdac75fb31 100644
--- a/browser/modules/CustomizeMode.jsm
+++ b/browser/modules/CustomizeMode.jsm
@@ -68,6 +68,7 @@ CustomizeMode.prototype = {
     // Same goes for the menu button - if we're customizing, a click to the
     // menu button means a quick exit from customization mode.
     window.PanelUI.menuButton.addEventListener("click", this, false);
+    window.PanelUI.menuButton.disabled = true;
 
     // Let everybody in this window know that we're about to customize.
     let evt = document.createEvent("CustomEvent");
@@ -120,6 +121,7 @@ CustomizeMode.prototype = {
     let tabViewDeck = this.document.getElementById("tab-view-deck");
     tabViewDeck.removeEventListener("keypress", this, false);
     this.window.PanelUI.menuButton.removeEventListener("click", this, false);
+    this.window.PanelUI.menuButton.disabled = false;
 
     this.depopulatePalette();
 

From bd11626ef811d6118ba00f301706c3fa57a35eeb Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 22 Mar 2013 17:28:34 -0400
Subject: [PATCH 019/230] Bug 770135 - Add a grabbing item effect when
 customizing, as well as some CSS polish. r=jaws.

---
 browser/modules/CustomizeMode.jsm  | 37 ++++++++++++++++++++++++++++++
 browser/themes/linux/browser.css   | 14 +++++++++++
 browser/themes/osx/browser.css     | 14 +++++++++++
 browser/themes/windows/browser.css | 14 +++++++++++
 4 files changed, 79 insertions(+)

diff --git a/browser/modules/CustomizeMode.jsm b/browser/modules/CustomizeMode.jsm
index 29bdac75fb31..d66277b25aa3 100644
--- a/browser/modules/CustomizeMode.jsm
+++ b/browser/modules/CustomizeMode.jsm
@@ -290,10 +290,16 @@ CustomizeMode.prototype = {
       wrapper.setAttribute("flex", aNode.getAttribute("flex"));
     }
 
+    wrapper.addEventListener("mousedown", this);
+    wrapper.addEventListener("mouseup", this);
+
     return wrapper;
   },
 
   unwrapToolbarItem: function(aWrapper) {
+    aWrapper.removeEventListener("mousedown", this);
+    aWrapper.removeEventListener("mouseup", this);
+
     let toolbarItem = aWrapper.firstChild;
 
     if (aWrapper.hasAttribute("itemdisabled")) {
@@ -377,6 +383,12 @@ CustomizeMode.prototype = {
       case "dragexit":
         this._onDragExit(aEvent);
         break;
+      case "mousedown":
+        this._onMouseDown(aEvent);
+        break;
+      case "mouseup":
+        this._onMouseUp(aEvent);
+        break;
       case "keypress":
         if (aEvent.keyCode === aEvent.DOM_VK_ESCAPE) {
           this.exit();
@@ -460,6 +472,8 @@ CustomizeMode.prototype = {
     let draggedItemId = aEvent.dataTransfer.getData("text/toolbarwrapper-id/" + documentId);
     let draggedWrapper = document.getElementById("wrapper-" + draggedItemId);
 
+    draggedWrapper.removeAttribute("mousedown");
+
     let targetNode = aEvent.target;
     let targetParent = targetNode.parentNode;
     let targetArea = this._getCustomizableParent(targetNode);
@@ -572,6 +586,29 @@ CustomizeMode.prototype = {
       aElement = aElement.parentNode;
     }
     return null;
+  },
+
+  _onMouseDown: function(aEvent) {
+    let item = this._getWrapper(aEvent.target);
+    if (item) {
+      item.setAttribute("mousedown", "true");
+    }
+  },
+
+  _onMouseUp: function(aEvent) {
+    let item = this._getWrapper(aEvent.target);
+    if (item) {
+      item.removeAttribute("mousedown");
+    }
+  },
+
+  _getWrapper: function(aElement) {
+    while (aElement && aElement.localName != "toolbarpaletteitem") {
+      if (aElement.localName == "toolbar")
+        return null;
+      aElement = aElement.parentNode;
+    }
+    return aElement;
   }
 };
 
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 4aa9955684c3..10904ae78770 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -2205,6 +2205,20 @@ chatbox {
   padding: 1em;
 }
 
+toolbarpaletteitem {
+  cursor: -moz-grab;
+  transition: transform, background-color, border-color, box-shadow;
+  transition-duration: 0.5s, 10ms, 10ms, 10ms;
+  transition-timing-function: ease-in-out, linear, linear, linear;
+}
+
+toolbarpaletteitem[mousedown] {
+  box-shadow: inset 0 0 3px hsl(204,100%,40%);
+  cursor: -moz-grabbing;
+  opacity: 0.8;
+  transform: scale(1.1);
+}
+
 /* end Customization mode */
 
 .click-to-play-plugins-notification-content {
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 3cfae76adeda..638d1ca59a14 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -3637,6 +3637,20 @@ chatbox {
   padding: 1em;
 }
 
+toolbarpaletteitem {
+  cursor: -moz-grab;
+  transition: transform, background-color, border-color, box-shadow;
+  transition-duration: 0.5s, 10ms, 10ms, 10ms;
+  transition-timing-function: ease-in-out, linear, linear, linear;
+}
+
+toolbarpaletteitem[mousedown] {
+  box-shadow: inset 0 0 3px hsl(204,100%,40%);
+  cursor: -moz-grabbing;
+  opacity: 0.8;
+  transform: scale(1.1);
+}
+
 /* end Customization mode */
 
 panel[type="arrow"][popupid="click-to-play-plugins"] > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="top"],
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 24333dbb407a..ead04851c863 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2968,6 +2968,20 @@ chatbox {
   padding: 1em;
 }
 
+toolbarpaletteitem {
+  cursor: -moz-grab;
+  transition: transform, background-color, border-color, box-shadow;
+  transition-duration: 0.5s, 10ms, 10ms, 10ms;
+  transition-timing-function: ease-in-out, linear, linear, linear;
+}
+
+toolbarpaletteitem[mousedown] {
+  box-shadow: inset 0 0 3px hsl(204,100%,40%);
+  cursor: -moz-grabbing;
+  opacity: 0.8;
+  transform: scale(1.1);
+}
+
 /* end Customization mode */
 
 .click-to-play-plugins-notification-content {

From e72b6d46d5f26ab657d509eaccd9adf7d7acee94 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Tue, 26 Mar 2013 19:37:47 -0400
Subject: [PATCH 020/230] Bug 770135 - Follow-up to use correct
 cut/copy/paste/zoom button graphics on OSX and Linux, also makes grid
 background work on Linux. r=jaws

---
 browser/themes/linux/browser.css             |  1 +
 browser/themes/linux/panelUIOverlay.css      | 35 ++++++++++++++++-
 browser/themes/osx/panelUIOverlay.css        | 40 +++++++++++++++++++-
 browser/themes/shared/panelUIOverlay.inc.css | 32 +---------------
 browser/themes/windows/panelUIOverlay.css    | 25 ++++++++++++
 5 files changed, 101 insertions(+), 32 deletions(-)

diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 10904ae78770..19678519bae1 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -2168,6 +2168,7 @@ chatbox {
 
 /* Customization mode */
 #main-window[customizing] {
+  -moz-appearance: none;
   background-image: url("chrome://browser/skin/customization/customization-mode-background.jpg");
   background-size: 100% 100%;
   background-repeat: no-repeat;
diff --git a/browser/themes/linux/panelUIOverlay.css b/browser/themes/linux/panelUIOverlay.css
index f73f3c46e989..11e8c6c0be35 100644
--- a/browser/themes/linux/panelUIOverlay.css
+++ b/browser/themes/linux/panelUIOverlay.css
@@ -3,6 +3,39 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 %filter substitution
-%define menuPanelWidth 23em
+%define menuPanelWidth 21em
 
 %include ../shared/panelUIOverlay.inc.css
+
+#PanelUI-cut-btn {
+  list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar");
+}
+#PanelUI-cut-btn[disabled="true"] {
+  list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar&state=disabled");
+}
+
+#PanelUI-copy-btn {
+  list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar");
+}
+#PanelUI-copy-btn[disabled="true"] {
+  list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar&state=disabled");
+}
+
+#PanelUI-paste-btn {
+  list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar");
+}
+#PanelUI-paste-btn[disabled="true"] {
+  list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar&state=disabled");
+}
+
+#PanelUI-zoomOut-btn {
+  list-style-image: url("moz-icon://stock/gtk-zoom-out?size=toolbar");
+  padding-left: 12px;
+  padding-right: 12px;
+}
+
+#PanelUI-zoomIn-btn {
+  list-style-image: url("moz-icon://stock/gtk-zoom-in?size=toolbar");
+  padding-left: 12px;
+  padding-right: 12px;
+}
diff --git a/browser/themes/osx/panelUIOverlay.css b/browser/themes/osx/panelUIOverlay.css
index f73f3c46e989..eccce5a230fe 100644
--- a/browser/themes/osx/panelUIOverlay.css
+++ b/browser/themes/osx/panelUIOverlay.css
@@ -3,6 +3,44 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 %filter substitution
-%define menuPanelWidth 23em
+%define menuPanelWidth 26em
 
 %include ../shared/panelUIOverlay.inc.css
+
+.PanelUI-pageControls toolbarbutton {
+  list-style-image: url("chrome://browser/skin/Toolbar.png");
+}
+
+#PanelUI-cut-btn {
+  -moz-image-region: rect(0, 260px, 20px, 240px);
+}
+#PanelUI-copy-btn {
+  -moz-image-region: rect(0, 280px, 20px, 260px);
+}
+#PanelUI-paste-btn {
+  -moz-image-region: rect(0, 300px, 20px, 280px);
+}
+
+#PanelUI-zoomOut-btn {
+  -moz-image-region: rect(0, 400px, 20px, 380px);
+  padding-left: 12px;
+  padding-right: 12px;
+}
+#PanelUI-zoomIn-btn {
+  -moz-image-region: rect(0, 420px, 20px, 400px);
+  padding-left: 12px;
+  padding-right: 12px;
+}
+
+.PanelUI-editControls #PanelUI-copy-btn,
+.PanelUI-zoomControls #PanelUI-zoomReset-btn {
+  border-left: none;
+  border-right: none;
+  border-radius: 0;
+}
+
+#PanelUI-zoomIn-btn .toolbarbutton-text,
+#PanelUI-zoomOut-btn .toolbarbutton-text,
+#PanelUI-zoomReset-btn .toolbarbutton-icon {
+  display: none;
+}
\ No newline at end of file
diff --git a/browser/themes/shared/panelUIOverlay.inc.css b/browser/themes/shared/panelUIOverlay.inc.css
index 3130eb4675ba..9ae55035ae80 100644
--- a/browser/themes/shared/panelUIOverlay.inc.css
+++ b/browser/themes/shared/panelUIOverlay.inc.css
@@ -145,32 +145,6 @@
   padding: 6px 0;
 }
 
-
-.PanelUI-pageControls toolbarbutton {
-  list-style-image: url("chrome://browser/skin/Toolbar.png");
-}
-
-#PanelUI-cut-btn {
-  -moz-image-region: rect(0, 216px, 18px, 198px);
-}
-#PanelUI-copy-btn {
-  -moz-image-region: rect(0, 234px, 18px, 216px);
-}
-#PanelUI-paste-btn {
-  -moz-image-region: rect(0, 252px, 18px, 234px);
-}
-
-#PanelUI-zoomOut-btn {
-  -moz-image-region: rect(0, 288px, 18px, 270px);
-  padding-left: 12px;
-  padding-right: 12px;
-}
-#PanelUI-zoomIn-btn {
-  -moz-image-region: rect(0, 306px, 18px, 288px);
-  padding-left: 12px;
-  padding-right: 12px;
-}
-
 .PanelUI-editControls #PanelUI-copy-btn,
 .PanelUI-zoomControls #PanelUI-zoomReset-btn {
   border-left: none;
@@ -207,7 +181,7 @@
   display: none;
 }
 
-#PanelUI-subViews toolbarbutton, 
+#PanelUI-subViews toolbarbutton,
 #PanelUI-mainView toolbarbutton {
   -moz-appearance: none;
   padding: 2px 6px;
@@ -244,6 +218,4 @@
               0 0 2px hsla(210,54%,20%,0);
   text-shadow: none;
   transition: none;
-}
-
-
+}
\ No newline at end of file
diff --git a/browser/themes/windows/panelUIOverlay.css b/browser/themes/windows/panelUIOverlay.css
index f73f3c46e989..17989b9e90e4 100644
--- a/browser/themes/windows/panelUIOverlay.css
+++ b/browser/themes/windows/panelUIOverlay.css
@@ -6,3 +6,28 @@
 %define menuPanelWidth 23em
 
 %include ../shared/panelUIOverlay.inc.css
+
+.PanelUI-pageControls toolbarbutton {
+  list-style-image: url("chrome://browser/skin/Toolbar.png");
+}
+
+#PanelUI-cut-btn {
+  -moz-image-region: rect(0, 216px, 18px, 198px);
+}
+#PanelUI-copy-btn {
+  -moz-image-region: rect(0, 234px, 18px, 216px);
+}
+#PanelUI-paste-btn {
+  -moz-image-region: rect(0, 252px, 18px, 234px);
+}
+
+#PanelUI-zoomOut-btn {
+  -moz-image-region: rect(0, 288px, 18px, 270px);
+  padding-left: 12px;
+  padding-right: 12px;
+}
+#PanelUI-zoomIn-btn {
+  -moz-image-region: rect(0, 306px, 18px, 288px);
+  padding-left: 12px;
+  padding-right: 12px;
+}
\ No newline at end of file

From 84d181778f3d3dae1608d5627e35b71c6aa5d663 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Wed, 27 Mar 2013 23:37:50 -0400
Subject: [PATCH 021/230] Bug 855830 - 'this.button is null' in
 WebRTCIndicator.init since the webrtc-status-button was not included in the
 default placements of the new customization interface for the navbar.
 r=mconley

---
 browser/modules/CustomizableUI.jsm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/browser/modules/CustomizableUI.jsm b/browser/modules/CustomizableUI.jsm
index 0a72ba6cf674..22fa33a2ae4c 100644
--- a/browser/modules/CustomizableUI.jsm
+++ b/browser/modules/CustomizableUI.jsm
@@ -170,6 +170,7 @@ let gFuturePlacements = new Map();
 let gDefaultPlacements = new Map([
   ["nav-bar", [
     "search-container",
+    "webrtc-status-button",
     "bookmarks-menu-button-container",
     "downloads-button",
     "social-toolbar-button",

From f48518fcb5b8d03a3cfab3eb1bb67ab56aea74a8 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Thu, 28 Mar 2013 15:47:31 -0400
Subject: [PATCH 022/230] Bug 855799 - Ensure menu panel is registered when
 entering customization mode. r=jaws.

---
 browser/base/content/panelUI.js   | 12 +++++++++++-
 browser/modules/CustomizeMode.jsm |  5 +++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/panelUI.js b/browser/base/content/panelUI.js
index caa040ad509e..caf2e80cbbc7 100644
--- a/browser/base/content/panelUI.js
+++ b/browser/base/content/panelUI.js
@@ -131,7 +131,7 @@ const PanelUI = {
   handleEvent: function(aEvent) {
     switch (aEvent.type) {
       case "popupshowing":
-        CustomizableUI.registerMenuPanel(this.contents);
+        this.ensureRegistered();
         let cstyle = window.getComputedStyle(this.viewStack, null);
         this.container.style.height = cstyle.getPropertyValue("height");
         this.container.style.width = cstyle.getPropertyValue("width");
@@ -147,6 +147,16 @@ const PanelUI = {
     }
   },
 
+  /**
+   * Registering the menu panel is done lazily for performance reasons. This
+   * method is exposed so that CustomizationMode can force registration in the
+   * event that customization mode is started before the panel has had a chance
+   * to register itself.
+   */
+  ensureRegistered: function() {
+    CustomizableUI.registerMenuPanel(this.contents);
+  },
+
   /**
    * Switch the panel to the main view if it's not already
    * in that view.
diff --git a/browser/modules/CustomizeMode.jsm b/browser/modules/CustomizeMode.jsm
index d66277b25aa3..e0c7e511bd2b 100644
--- a/browser/modules/CustomizeMode.jsm
+++ b/browser/modules/CustomizeMode.jsm
@@ -61,6 +61,11 @@ CustomizeMode.prototype = {
 
     CustomizableUI.addListener(this);
 
+    // The menu panel is lazy, and registers itself when the popup shows. We
+    // need to force the menu panel to register itself, or else customization
+    // is really not going to work.
+    window.PanelUI.ensureRegistered();
+
     // Add a keypress listener to the tab-view-deck so that we can quickly
     // exit customization mode when pressing ESC
     let tabViewDeck = document.getElementById("tab-view-deck");

From 8ce3973362a52717c7701b4ca93427527d8a2d18 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Fri, 29 Mar 2013 10:28:38 -0400
Subject: [PATCH 023/230] Bug 855830 - this.button is null at
 chrome://browser/content/browser.js:6605 r=mconley

---
 browser/base/content/browser.xul   | 24 ++++++++++++------------
 browser/modules/CustomizableUI.jsm |  1 -
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 578d2503416d..d5b668c16129 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -661,6 +661,18 @@
 
       <hbox id="nav-bar-customizationtarget" class="customization-target" flex="100"/>
 
+      <toolbarbutton id="webrtc-status-button"
+                     class="toolbarbutton-1 chromeclass-toolbar-additional"
+                     type="menu"
+                     hidden="true"
+                     orient="horizontal"
+                     label="&webrtcIndicatorButton.label;"
+                     tooltiptext="&webrtcIndicatorButton.tooltip;">
+        <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);"
+                   onpopuphiding="WebrtcIndicator.clearPopup(this);"
+                   oncommand="WebrtcIndicator.menuCommand(event.target);"/>
+      </toolbarbutton>
+
       <toolbaritem id="PanelUI-button"
                    class="chromeclass-toolbar-additional"
                    removable="false"
@@ -832,18 +844,6 @@
         <searchbar id="searchbar" flex="1"/>
       </toolbaritem>
 
-      <toolbarbutton id="webrtc-status-button"
-                     class="toolbarbutton-1 chromeclass-toolbar-additional"
-                     type="menu"
-                     hidden="true"
-                     orient="horizontal"
-                     label="&webrtcIndicatorButton.label;"
-                     tooltiptext="&webrtcIndicatorButton.tooltip;">
-        <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);"
-                   onpopuphiding="WebrtcIndicator.clearPopup(this);"
-                   oncommand="WebrtcIndicator.menuCommand(event.target);"/>
-      </toolbarbutton>
-
       <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                      persist="class" removable="true"
                      label="&homeButton.label;"
diff --git a/browser/modules/CustomizableUI.jsm b/browser/modules/CustomizableUI.jsm
index 22fa33a2ae4c..0a72ba6cf674 100644
--- a/browser/modules/CustomizableUI.jsm
+++ b/browser/modules/CustomizableUI.jsm
@@ -170,7 +170,6 @@ let gFuturePlacements = new Map();
 let gDefaultPlacements = new Map([
   ["nav-bar", [
     "search-container",
-    "webrtc-status-button",
     "bookmarks-menu-button-container",
     "downloads-button",
     "social-toolbar-button",

From 2802eed7d0c63e702ed2687e8b3ae1baa896be49 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Wed, 3 Apr 2013 09:58:07 -0400
Subject: [PATCH 024/230] Bug 856639 - Fix CSS to allow menu panel subview deck
 to work properly. r=Unfocused.

---
 browser/themes/shared/panelUIOverlay.inc.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/browser/themes/shared/panelUIOverlay.inc.css b/browser/themes/shared/panelUIOverlay.inc.css
index 9ae55035ae80..0291a291de16 100644
--- a/browser/themes/shared/panelUIOverlay.inc.css
+++ b/browser/themes/shared/panelUIOverlay.inc.css
@@ -82,7 +82,6 @@
   background-color: -moz-dialog;
   box-shadow: -1px 0px 0px rgba(0, 0, 0, 0.2), -1px 0px 2px rgba(0, 0, 0, 0.1), 1px 0px 0px rgba(255, 255, 255, 0.2) inset;
   margin-left: 38px;
-  position: absolute;
   transform: translateX(@menuPanelWidth@);
   transition: transform 150ms;
 }

From 94b305cced15092b23c423f9ac051c637d4a9de1 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Thu, 4 Apr 2013 11:07:09 -0400
Subject: [PATCH 025/230] Bug 855295 - nav-bar is not preserving order of
 customized items on session restore. r=Unfocused.

---
 browser/modules/CustomizableUI.jsm | 27 +++++++++++++++++++++++----
 browser/modules/CustomizeMode.jsm  | 26 ++++++++++++++++++++++----
 2 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/browser/modules/CustomizableUI.jsm b/browser/modules/CustomizableUI.jsm
index 0a72ba6cf674..577a40b8cce6 100644
--- a/browser/modules/CustomizableUI.jsm
+++ b/browser/modules/CustomizableUI.jsm
@@ -452,6 +452,15 @@ let CustomizableUIInternal = {
       return;
     }
 
+    let placements = gPlacements.get(aArea);
+    if (!placements) {
+      Cu.reportError("Could not find any placements for " + aArea +
+                     " when adding a widget.");
+      return;
+    }
+
+    let nextNodeId = placements[aPosition + 1];
+
     // Go through each of the nodes associated with this area and move the
     // widget to the requested location.
     for (let areaNode of areaNodes) {
@@ -465,7 +474,7 @@ let CustomizableUIInternal = {
         this.ensureButtonClosesPanel(widgetNode);
       }
 
-      let nextNode = container.children.item(aPosition);
+      let nextNode = container.querySelector("#" + nextNodeId);
       container.insertBefore(widgetNode, nextNode);
     }
   },
@@ -498,6 +507,15 @@ let CustomizableUIInternal = {
       return;
     }
 
+    let placements = gPlacements.get(aArea);
+    if (!placements) {
+      Cu.reportError("Could not find any placements for " + aArea +
+                     " when moving a widget.");
+      return;
+    }
+
+    let nextNodeId = placements[aNewPosition + 1];
+
     for (let areaNode of areaNodes) {
       let container = areaNode.customizationTarget;
       let widgetNode = container.ownerDocument.getElementById(aWidgetId);
@@ -506,9 +524,7 @@ let CustomizableUIInternal = {
         continue;
       }
 
-      let nextNode = container.children.item(aNewPosition > aOldPosition ?
-                                             aNewPosition + 1 :
-                                             aNewPosition);
+      let nextNode = container.querySelector("#" + nextNodeId);
       container.insertBefore(widgetNode, nextNode);
     }
   },
@@ -1435,6 +1451,9 @@ this.CustomizableUI = {
   },
   reset: function() {
     CustomizableUIInternal.reset();
+  },
+  getPlacementOfWidget: function(aWidgetId) {
+    return CustomizableUIInternal.getPlacementOfWidget(aWidgetId);
   }
 };
 Object.freeze(this.CustomizableUI);
diff --git a/browser/modules/CustomizeMode.jsm b/browser/modules/CustomizeMode.jsm
index e0c7e511bd2b..2f64aebe207b 100644
--- a/browser/modules/CustomizeMode.jsm
+++ b/browser/modules/CustomizeMode.jsm
@@ -22,6 +22,8 @@ function LOG(str) {
   }
 }
 
+function ERROR(aMsg) Cu.reportError("[CustomizeMode] " + aMsg);
+
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource:///modules/CustomizableUI.jsm");
 
@@ -491,7 +493,13 @@ CustomizeMode.prototype = {
 
     // We need to determine the place that the widget is being dropped in
     // the target.
-    let position = Array.indexOf(targetParent.children, targetNode);
+    let placement = CustomizableUI.getPlacementOfWidget(targetNode.firstChild.id);
+    if (!placement) {
+      ERROR("Could not get a position for " + targetNode.firstChild.id);
+      return;
+    }
+
+    let position = placement.position;
 
     // Is the target area the customization palette? If so, we have two cases -
     // either the originArea was the palette, or a customizable area.
@@ -516,9 +524,15 @@ CustomizeMode.prototype = {
     // the possibility that the target is the customization palette, we know
     // that the widget is moving within a customizable area.
     if (targetArea === originArea) {
+      let properPlace = getPlaceForItem(targetNode);
+      // We unwrap the moving widget, as well as the widget that we're dropping
+      // on (the target) so that moveWidgetWithinArea can correctly insert the
+      // moving widget before the target widget.
       let widget = this.unwrapToolbarItem(draggedWrapper);
+      let targetWidget = this.unwrapToolbarItem(targetNode);
       CustomizableUI.moveWidgetWithinArea(draggedItemId, position);
-      this.wrapToolbarItem(widget, getPlaceForItem(targetNode));
+      this.wrapToolbarItem(targetWidget, properPlace);
+      this.wrapToolbarItem(widget, properPlace);
       return;
     }
 
@@ -528,10 +542,14 @@ CustomizeMode.prototype = {
 
     // A little hackery - we quickly unwrap the item and use CustomizableUI's
     // addWidgetToArea to move the widget to the right place for every window,
-    // then we re-wrap the widget.
+    // then we re-wrap the widget. We have to unwrap the target widget too so
+    // that addWidgetToArea inserts the new widget into the right place.
+    let properPlace = getPlaceForItem(targetNode);
     let widget = this.unwrapToolbarItem(draggedWrapper);
+    let targetWidget = this.unwrapToolbarItem(targetNode);
     CustomizableUI.addWidgetToArea(draggedItemId, targetArea.id, position);
-    draggedWrapper = this.wrapToolbarItem(widget, getPlaceForItem(targetNode));
+    this.wrapToolbarItem(targetWidget, properPlace);
+    draggedWrapper = this.wrapToolbarItem(widget, properPlace);
 
     // If necessary, add flex to accomodate new child.
     if (draggedWrapper.hasAttribute("flex")) {

From 646814d727460687b48cbadc900ecfec541aa01f Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 5 Apr 2013 09:56:30 -0400
Subject: [PATCH 026/230] Bug 858132 - Move CustomizationStart and
 CustomizationEnd event handler registration before defferedStart signals its
 completion. r=Unfocused.

---
 browser/base/content/browser.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 85acc0837039..31bdce6ae897 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1276,6 +1276,9 @@ var gBrowserInit = {
     window.addEventListener("mousemove", MousePosTracker, false);
     window.addEventListener("dragover", MousePosTracker, false);
 
+    window.addEventListener("CustomizationStart", CustomizationHandler, false);
+    window.addEventListener("CustomizationEnd", CustomizationHandler, false);
+
     // End startup crash tracking after a delay to catch crashes while restoring
     // tabs and to postpone saving the pref to disk.
     try {
@@ -1288,9 +1291,6 @@ var gBrowserInit = {
     Services.obs.notifyObservers(window, "browser-delayed-startup-finished", "");
     setTimeout(function () { BrowserChromeTest.markAsReady(); }, 0);
     TelemetryTimestamps.add("delayedStartupFinished");
-
-    window.addEventListener("CustomizationStart", CustomizationHandler, false);
-    window.addEventListener("CustomizationEnd", CustomizationHandler, false);
   },
 
   onUnload: function() {

From 4fae036bba63bbc8c443ab3938dd3d4172ad41c7 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 5 Apr 2013 09:58:31 -0400
Subject: [PATCH 027/230] Bug 855295 - Follow-up - Fix dragging widgets back
 into the palette when customizing. r=Unfocused.

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

diff --git a/browser/modules/CustomizeMode.jsm b/browser/modules/CustomizeMode.jsm
index 2f64aebe207b..87ce158f3661 100644
--- a/browser/modules/CustomizeMode.jsm
+++ b/browser/modules/CustomizeMode.jsm
@@ -491,16 +491,6 @@ CustomizeMode.prototype = {
       return;
     }
 
-    // We need to determine the place that the widget is being dropped in
-    // the target.
-    let placement = CustomizableUI.getPlacementOfWidget(targetNode.firstChild.id);
-    if (!placement) {
-      ERROR("Could not get a position for " + targetNode.firstChild.id);
-      return;
-    }
-
-    let position = placement.position;
-
     // 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) {
@@ -520,6 +510,16 @@ CustomizeMode.prototype = {
       return;
     }
 
+    // We need to determine the place that the widget is being dropped in
+    // the target.
+    let placement = CustomizableUI.getPlacementOfWidget(targetNode.firstChild.id);
+    if (!placement) {
+      ERROR("Could not get a position for " + targetNode.firstChild.id);
+      return;
+    }
+
+    let position = placement.position;
+
     // Is the target area the same as the origin? Since we've already handled
     // the possibility that the target is the customization palette, we know
     // that the widget is moving within a customizable area.

From b50ecc2741b11a7a5c042fe7feab5b3076ad7920 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 5 Apr 2013 09:59:41 -0400
Subject: [PATCH 028/230] Bug 858219 - Menu panel should automatically switch
 back to main view after closing. r=Unfocused.

---
 browser/base/content/panelUI.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/base/content/panelUI.js b/browser/base/content/panelUI.js
index caf2e80cbbc7..693adde90f9b 100644
--- a/browser/base/content/panelUI.js
+++ b/browser/base/content/panelUI.js
@@ -125,7 +125,6 @@ const PanelUI = {
    */
   hide: function() {
     this.panel.hidePopup();
-    this.showMainView();
   },
 
   handleEvent: function(aEvent) {
@@ -141,6 +140,7 @@ const PanelUI = {
       case "popuphiding":
         // Fall through
       case "popuphidden": {
+        this.showMainView();
         this._updatePanelButton(aEvent.target);
         break;
       }

From 10fa391d90e6c90c0e7983e1c693f9c17d5ce88c Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Tue, 9 Apr 2013 20:48:34 -0400
Subject: [PATCH 029/230] Bug 857542 - CustomizableUI.registerBuildWindow()
 should be called by every window that registers a toolbar. r=Unfocused.

---
 browser/modules/CustomizableUI.jsm | 15 ++++++++-------
 browser/modules/CustomizeMode.jsm  |  4 ----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/browser/modules/CustomizableUI.jsm b/browser/modules/CustomizableUI.jsm
index 577a40b8cce6..9436145c2780 100644
--- a/browser/modules/CustomizableUI.jsm
+++ b/browser/modules/CustomizableUI.jsm
@@ -316,6 +316,10 @@ let CustomizableUIInternal = {
 
     let placements = gPlacements.get(area);
     this.buildArea(area, placements, aToolbar);
+
+    // We register this window to have its customization data cleaned up when
+    // unloading.
+    this.registerBuildWindow(document.defaultView);
   },
 
   buildArea: function(aArea, aPlacements, aAreaNode) {
@@ -442,10 +446,6 @@ let CustomizableUIInternal = {
     this.registerBuildArea(CustomizableUI.AREA_PANEL, aPanel);
   },
 
-  registerWindow: function(aWindow) {
-    aWindow.addEventListener("unload", this, false);
-  },
-
   onWidgetAdded: function(aWidgetId, aArea, aPosition) {
     let areaNodes = gBuildAreas.get(aArea);
     if (!areaNodes) {
@@ -544,6 +544,10 @@ let CustomizableUIInternal = {
     gBuildAreas.get(aArea).add(aNode);
   },
 
+  registerBuildWindow: function(aWindow) {
+    aWindow.addEventListener("unload", this, false);
+  },
+
   unregisterBuildWindow: function(aWindow) {
     let document = aWindow.document;
 
@@ -1395,9 +1399,6 @@ this.CustomizableUI = {
   registerMenuPanel: function(aPanel) {
     CustomizableUIInternal.registerMenuPanel(aPanel);
   },
-  registerWindow: function(aWindow) {
-    CustomizableUIInternal.registerWindow(aWindow);
-  },
   addWidgetToArea: function(aWidgetId, aArea, aPosition) {
     CustomizableUIInternal.addWidgetToArea(aWidgetId, aArea, aPosition);
   },
diff --git a/browser/modules/CustomizeMode.jsm b/browser/modules/CustomizeMode.jsm
index 87ce158f3661..65883ca4b34f 100644
--- a/browser/modules/CustomizeMode.jsm
+++ b/browser/modules/CustomizeMode.jsm
@@ -29,10 +29,6 @@ Cu.import("resource:///modules/CustomizableUI.jsm");
 
 function CustomizeMode(aWindow) {
   this.window = aWindow;
-  // We register this window to have its customization data cleaned up when
-  // unloading.
-  CustomizableUI.registerWindow(this.window);
-
   this.document = aWindow.document;
   // There are two palettes - there's the palette that can be overlayed with
   // toolbar items in browser.xul. This is invisible, and never seen by the

From e7c2444298b9030be8fc1d9f1efb18e3a18703ea Mon Sep 17 00:00:00 2001
From: Blake Winton <bwinton@mozilla.com>
Date: Tue, 9 Apr 2013 21:50:05 -0400
Subject: [PATCH 030/230] Bug 858067 - Make the customize panel look more
 panel-y when in customization mode. r,ui-r=mconley

---
 browser/base/content/browser.xul   |  1 +
 browser/base/content/customize.inc | 11 ++++++++++-
 browser/modules/CustomizeMode.jsm  | 10 +++++-----
 browser/themes/linux/browser.css   |  4 ++++
 browser/themes/osx/browser.css     |  4 ++++
 browser/themes/windows/browser.css |  4 ++++
 6 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index d5b668c16129..b89477606f31 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -11,6 +11,7 @@
 <?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/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/popup.css" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 <?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?>
diff --git a/browser/base/content/customize.inc b/browser/base/content/customize.inc
index 4a03070435cc..6f32b11c2846 100644
--- a/browser/base/content/customize.inc
+++ b/browser/base/content/customize.inc
@@ -20,7 +20,16 @@
           <vbox id="customization-palette" flex="1" style="display: block;"/>
         </vbox>
         <vbox>
-          <hbox id="customization-panelHolder"/>
+          <vbox id="customization-panelWrapper">
+            <box anonid="arrowbox" class="panel-arrowbox">
+              <box flex="1"/>
+              <image anonid="arrow" class="panel-arrow" side="top"/>
+            </box>
+            <box class="panel-arrowcontent" flex="1">
+              <hbox id="customization-panelHolder"/>
+              <box class="panel-inner-arrowcontentfooter" hidden="true"/>
+            </box>
+          </vbox>
           <spacer flex="1"/>
         </vbox>
       </hbox>
diff --git a/browser/modules/CustomizeMode.jsm b/browser/modules/CustomizeMode.jsm
index 65883ca4b34f..6bb6b85bcef0 100644
--- a/browser/modules/CustomizeMode.jsm
+++ b/browser/modules/CustomizeMode.jsm
@@ -82,17 +82,17 @@ CustomizeMode.prototype = {
     customizer.parentNode.selectedPanel = customizer;
 
     window.PanelUI.hide();
+    // Move the mainView in the panel to the holder so that we can see it
+    // while customizing.
+    let panelHolder = document.getElementById("customization-panelHolder");
+    panelHolder.appendChild(window.PanelUI.mainView);
+
 
     let self = this;
     let deck = document.getElementById("tab-view-deck");
     deck.addEventListener("transitionend", function customizeTransitionEnd() {
       deck.removeEventListener("transitionend", customizeTransitionEnd);
 
-      // Move the mainView in the panel to the holder so that we can see it
-      // while customizing.
-      let panelHolder = document.getElementById("customization-panelHolder");
-      panelHolder.appendChild(window.PanelUI.mainView);
-
       // Add drag-and-drop event handlers to all of the customizable areas.
       self.areas = [];
       for (let area of CustomizableUI.areas) {
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 19678519bae1..4c3a7f3b6611 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -2200,6 +2200,10 @@ chatbox {
   border-radius: 2px;
 }
 
+#customization-panelWrapper {
+  padding: 0px 8px;
+}
+
 #customization-palette > toolbarpaletteitem {
   display: inline-block;
   -moz-orient: vertical;
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 638d1ca59a14..dbc5e5fd2add 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -3631,6 +3631,10 @@ chatbox {
   border-radius: 2px;
 }
 
+#customization-panelWrapper {
+  padding: 0px 8px;
+}
+
 #customization-palette > toolbarpaletteitem {
   display: inline-block;
   -moz-orient: vertical;
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index ead04851c863..aa5f6b67405f 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2962,6 +2962,10 @@ chatbox {
   border-radius: 2px;
 }
 
+#customization-panelWrapper {
+  padding: 0px 8px;
+}
+
 #customization-palette > toolbarpaletteitem {
   display: inline-block;
   -moz-orient: vertical;

From 4fab96d5cc87d24c5e5eb9da4b161d098605cbba Mon Sep 17 00:00:00 2001
From: Blake Winton <bwinton@mozilla.com>
Date: Wed, 10 Apr 2013 12:33:41 -0400
Subject: [PATCH 031/230] Bug 858067 - Make the customize panel look more
 panel-y when in customize mode - follow-up. r=dao

---
 browser/base/content/browser.xul   | 2 +-
 browser/base/content/customize.inc | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index b89477606f31..fe552474265b 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -11,7 +11,6 @@
 <?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/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/popup.css" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 <?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?>
@@ -24,6 +23,7 @@
 <window id="main-window"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns:svg="http://www.w3.org/2000/svg"
+        xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="gBrowserInit.onLoad()" onunload="gBrowserInit.onUnload()" onclose="return WindowIsClosing();"
         title="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
diff --git a/browser/base/content/customize.inc b/browser/base/content/customize.inc
index 6f32b11c2846..f943d12a1485 100644
--- a/browser/base/content/customize.inc
+++ b/browser/base/content/customize.inc
@@ -21,9 +21,12 @@
         </vbox>
         <vbox>
           <vbox id="customization-panelWrapper">
-            <box anonid="arrowbox" class="panel-arrowbox">
+            <html:style html:type="text/html" scoped="scoped">
+              @import url(chrome://global/skin/popup.css);
+            </html:style>
+            <box class="panel-arrowbox">
               <box flex="1"/>
-              <image anonid="arrow" class="panel-arrow" side="top"/>
+              <image class="panel-arrow" side="top"/>
             </box>
             <box class="panel-arrowcontent" flex="1">
               <hbox id="customization-panelHolder"/>

From a1ff60cb864da24d69c2b9c85c1b8a65b43ccde7 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Wed, 10 Apr 2013 13:37:25 -0400
Subject: [PATCH 032/230] Bug 858597 - Make switching to and from
 about:customization cause enter and exit from customization mode. r=jaws

---
 browser/base/content/browser-customization.js |  6 --
 browser/base/content/browser.js               |  3 +
 browser/modules/CustomizeMode.jsm             | 86 +++++++++++++++++--
 3 files changed, 80 insertions(+), 15 deletions(-)

diff --git a/browser/base/content/browser-customization.js b/browser/base/content/browser-customization.js
index 7af29dddd82a..522139143899 100644
--- a/browser/base/content/browser-customization.js
+++ b/browser/base/content/browser-customization.js
@@ -39,8 +39,6 @@ let CustomizationHandler = {
     BookmarksMenuButton.customizeStart();
     DownloadsButton.customizeStart();
     TabsInTitlebar.allowedBy("customizing-toolbars", false);
-
-    gBrowser.selectedTab = window.gBrowser.addTab("about:customizing");
   },
 
   _customizationEnd: function(aDetails) {
@@ -71,10 +69,6 @@ let CustomizationHandler = {
     BookmarksMenuButton.customizeDone();
     DownloadsButton.customizeDone();
 
-    if (gBrowser.selectedBrowser.currentURI.spec == "about:customizing") {
-      gBrowser.removeCurrentTab();
-    }
-
     // The url bar splitter state is dependent on whether stop/reload
     // and the location bar are combined, so we need this ordering
     CombinedStopReload.init();
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 31bdce6ae897..63a7d376e301 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1279,6 +1279,8 @@ var gBrowserInit = {
     window.addEventListener("CustomizationStart", CustomizationHandler, false);
     window.addEventListener("CustomizationEnd", CustomizationHandler, false);
 
+    gCustomizeMode.init();
+
     // End startup crash tracking after a delay to catch crashes while restoring
     // tabs and to postpone saving the pref to disk.
     try {
@@ -1374,6 +1376,7 @@ var gBrowserInit = {
       IndexedDBPromptHelper.uninit();
       AddonManager.removeAddonListener(AddonsMgrListener);
       SocialUI.uninit();
+      gCustomizeMode.uninit();
       PanelUI.uninit();
     }
 
diff --git a/browser/modules/CustomizeMode.jsm b/browser/modules/CustomizeMode.jsm
index 6bb6b85bcef0..79fd5dab8abf 100644
--- a/browser/modules/CustomizeMode.jsm
+++ b/browser/modules/CustomizeMode.jsm
@@ -10,6 +10,7 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 
 const kPrefCustomizationDebug = "browser.uiCustomization.debug";
 const kPaletteId = "customization-palette";
+const kAboutURI = "about:customizing";
 
 let gDebug = false;
 try {
@@ -30,11 +31,7 @@ Cu.import("resource:///modules/CustomizableUI.jsm");
 function CustomizeMode(aWindow) {
   this.window = aWindow;
   this.document = aWindow.document;
-  // There are two palettes - there's the palette that can be overlayed with
-  // toolbar items in browser.xul. This is invisible, and never seen by the
-  // user. Then there's the visible palette, which gets populated and displayed
-  // to the user when in customizing mode.
-  this.visiblePalette = this.document.getElementById(kPaletteId);
+  this.browser = aWindow.gBrowser;
 };
 
 CustomizeMode.prototype = {
@@ -52,11 +49,34 @@ CustomizeMode.prototype = {
   // customization mode.
   _stowedPalette: null,
   _dragOverItem: null,
+  _customizing: false,
+
+  init: function() {
+    // There are two palettes - there's the palette that can be overlayed with
+    // toolbar items in browser.xul. This is invisible, and never seen by the
+    // user. Then there's the visible palette, which gets populated and displayed
+    // to the user when in customizing mode.
+    this.visiblePalette = this.document.getElementById(kPaletteId);
+
+    this.browser.tabContainer.addEventListener("TabSelect", this, false);
+    this.browser.addTabsProgressListener(this);
+  },
+
+  uninit: function() {
+    this.browser.tabContainer.removeEventListener("TabSelect", this, false);
+    this.browser.removeTabsProgressListener(this);
+  },
 
   enter: function() {
     let window = this.window;
     let document = this.document;
 
+    // We don't need to switch to kAboutURI, or open a new tab at
+    // kAboutURI if we're already on it.
+    if (this.browser.selectedBrowser.currentURI.spec != kAboutURI) {
+      this.window.switchToTabHavingURI(kAboutURI, true);
+    }
+
     CustomizableUI.addListener(this);
 
     // The menu panel is lazy, and registers itself when the popup shows. We
@@ -116,9 +136,10 @@ CustomizeMode.prototype = {
     this.visiblePalette.addEventListener("drop", this);
 
     document.documentElement.setAttribute("customizing", true);
+    this._customizing = true;
   },
 
-  exit: function(aToolboxChanged) {
+  exit: function() {
     CustomizableUI.removeListener(this);
 
     let tabViewDeck = this.document.getElementById("tab-view-deck");
@@ -168,7 +189,23 @@ CustomizeMode.prototype = {
 
     let browser = document.getElementById("browser");
     browser.parentNode.selectedPanel = browser;
+
+    if (this.browser.selectedBrowser.currentURI.spec == kAboutURI) {
+      let custBrowser = this.browser.selectedBrowser;
+      if (custBrowser.canGoBack) {
+        // If there's history to this tab, just go back.
+        custBrowser.goBack();
+      } else {
+        let customizationTab = this.browser.selectedTab;
+        if (this.browser.browsers.length == 1) {
+          this.window.BrowserOpenTab();
+        }
+        this.browser.removeTab(customizationTab);
+      }
+    }
+
     this._changed = false;
+    this._customizing = false;
   },
 
   populatePalette: function() {
@@ -404,6 +441,9 @@ CustomizeMode.prototype = {
           aEvent.preventDefault();
         }
         break;
+      case "TabSelect":
+        this._onTabSelect(aEvent);
+        break;
     }
   },
 
@@ -456,7 +496,7 @@ CustomizeMode.prototype = {
     }
 
     // XXXjaws Only handling the toolbar case first.
-    if (targetArea.localName === "toolbar") {
+    if (targetArea.localName == "toolbar") {
       this._setDragActive(dragOverItem, true);
     }
     this._dragOverItem = dragOverItem;
@@ -489,7 +529,7 @@ CustomizeMode.prototype = {
 
     // 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) {
+    if (targetArea.id == kPaletteId) {
       if (originArea.id !== kPaletteId) {
         this._removeParentFlex(draggedWrapper);
         let widget = this.unwrapToolbarItem(draggedWrapper);
@@ -519,7 +559,7 @@ CustomizeMode.prototype = {
     // Is the target area the same as the origin? Since we've already handled
     // the possibility that the target is the customization palette, we know
     // that the widget is moving within a customizable area.
-    if (targetArea === originArea) {
+    if (targetArea == originArea) {
       let properPlace = getPlaceForItem(targetNode);
       // We unwrap the moving widget, as well as the widget that we're dropping
       // on (the target) so that moveWidgetWithinArea can correctly insert the
@@ -628,6 +668,34 @@ CustomizeMode.prototype = {
       aElement = aElement.parentNode;
     }
     return aElement;
+  },
+
+  _onTabSelect: function(aEvent) {
+    this._toggleCustomizationModeIfNecessary();
+  },
+
+  onLocationChange: function(aBrowser, aProgress, aRequest, aLocation, aFlags) {
+    if (this.browser.selectedBrowser != aBrowser) {
+      return;
+    }
+
+    this._toggleCustomizationModeIfNecessary();
+  },
+
+  /**
+   * Looks at the currently selected browser tab, and if the location
+   * is set to kAboutURI and we're not customizing, enters customize mode.
+   * If we're not at kAboutURI and we are customizing, exits customize mode.
+   */
+  _toggleCustomizationModeIfNecessary: function() {
+    let browser = this.browser.selectedBrowser;
+    if (browser.currentURI.spec == kAboutURI &&
+        !this._customizing) {
+      this.enter();
+    } else if (browser.currentURI.spec != kAboutURI &&
+               this._customizing) {
+      this.exit();
+    }
   }
 };
 

From e2ed671a12399536a4a67f7a867a94f7ae3e1461 Mon Sep 17 00:00:00 2001
From: Blake Winton <bwinton@mozilla.com>
Date: Wed, 10 Apr 2013 16:24:45 -0400
Subject: [PATCH 033/230] Bug 858662 - Make clicking on the blue grid in
 customization mode exit customization mode. r+ui-r=mconley.

---
 browser/modules/CustomizeMode.jsm  | 22 +++++++++++++---------
 browser/themes/linux/browser.css   |  1 -
 browser/themes/osx/browser.css     |  1 -
 browser/themes/windows/browser.css |  1 -
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/browser/modules/CustomizeMode.jsm b/browser/modules/CustomizeMode.jsm
index 79fd5dab8abf..d0f8de79056f 100644
--- a/browser/modules/CustomizeMode.jsm
+++ b/browser/modules/CustomizeMode.jsm
@@ -84,10 +84,13 @@ CustomizeMode.prototype = {
     // is really not going to work.
     window.PanelUI.ensureRegistered();
 
-    // Add a keypress listener to the tab-view-deck so that we can quickly
-    // exit customization mode when pressing ESC
-    let tabViewDeck = document.getElementById("tab-view-deck");
-    tabViewDeck.addEventListener("keypress", this, false);
+    // Add a keypress listener and click listener to the tab-view-deck so that
+    // we can quickly exit customization mode when pressing ESC or clicking on
+    // the blueprint outside the customization container.
+    let deck = document.getElementById("tab-view-deck");
+    deck.addEventListener("keypress", this, false);
+    deck.addEventListener("click", this, false);
+
     // Same goes for the menu button - if we're customizing, a click to the
     // menu button means a quick exit from customization mode.
     window.PanelUI.menuButton.addEventListener("click", this, false);
@@ -109,7 +112,6 @@ CustomizeMode.prototype = {
 
 
     let self = this;
-    let deck = document.getElementById("tab-view-deck");
     deck.addEventListener("transitionend", function customizeTransitionEnd() {
       deck.removeEventListener("transitionend", customizeTransitionEnd);
 
@@ -142,8 +144,9 @@ CustomizeMode.prototype = {
   exit: function() {
     CustomizableUI.removeListener(this);
 
-    let tabViewDeck = this.document.getElementById("tab-view-deck");
-    tabViewDeck.removeEventListener("keypress", this, false);
+    let deck = this.document.getElementById("tab-view-deck");
+    deck.removeEventListener("keypress", this, false);
+    deck.removeEventListener("click", this, false);
     this.window.PanelUI.menuButton.removeEventListener("click", this, false);
     this.window.PanelUI.menuButton.disabled = false;
 
@@ -430,13 +433,14 @@ CustomizeMode.prototype = {
         this._onMouseUp(aEvent);
         break;
       case "keypress":
-        if (aEvent.keyCode === aEvent.DOM_VK_ESCAPE) {
+        if (aEvent.keyCode == aEvent.DOM_VK_ESCAPE) {
           this.exit();
         }
         break;
       case "click":
         if (aEvent.button == 0 &&
-            aEvent.originalTarget == this.window.PanelUI.menuButton) {
+            (aEvent.originalTarget == this.window.PanelUI.menuButton) ||
+            (aEvent.originalTarget == this.document.getElementById("tab-view-deck"))) {
           this.exit();
           aEvent.preventDefault();
         }
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 4c3a7f3b6611..0a46bd537b09 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -2179,7 +2179,6 @@ chatbox {
   transition-duration: 300ms;
   transition-timing-function: ease-out;
   padding: 8em;
-  -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox")
 }
 
 #main-window:not([customizing]) #tab-view-deck {
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index dbc5e5fd2add..06a9dc68cb65 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -3610,7 +3610,6 @@ chatbox {
   transition-duration: 300ms;
   transition-timing-function: ease-out;
   padding: 8em;
-  -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox")
 }
 
 #main-window:not([customizing]) #tab-view-deck {
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index aa5f6b67405f..b23f428e4a84 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2941,7 +2941,6 @@ chatbox {
   transition-duration: 300ms;
   transition-timing-function: ease-out;
   padding: 8em;
-  -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox")
 }
 
 #main-window:not([customizing]) #tab-view-deck {

From 15a3cf5bced59d9448f88e4810fbe4e80de9e589 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Wed, 10 Apr 2013 17:55:50 -0400
Subject: [PATCH 034/230] Bug 860487 - Exiting customiation mode is broken if
 the downloads button has been clicked. r=jaws.

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

diff --git a/browser/modules/CustomizeMode.jsm b/browser/modules/CustomizeMode.jsm
index d0f8de79056f..2dbeec6e7b89 100644
--- a/browser/modules/CustomizeMode.jsm
+++ b/browser/modules/CustomizeMode.jsm
@@ -160,11 +160,6 @@ CustomizeMode.prototype = {
     let window = this.window;
     let document = this.document;
 
-    // Let everybody in this window know that we're finished customizing.
-    let evt = document.createEvent("CustomEvent");
-    evt.initCustomEvent("CustomizationEnd", true, true, {changed: this._changed});
-    window.dispatchEvent(evt);
-
     if (this._changed) {
       // XXXmconley: At first, it seems strange to also persist the old way with
       //             currentset - but this might actually be useful for switching
@@ -188,6 +183,11 @@ CustomizeMode.prototype = {
     // And drop all area references.
     this.areas = [];
 
+    // Let everybody in this window know that we're finished customizing.
+    let evt = document.createEvent("CustomEvent");
+    evt.initCustomEvent("CustomizationEnd", true, true, {changed: this._changed});
+    window.dispatchEvent(evt);
+
     window.PanelUI.replaceMainView(window.PanelUI.mainView);
 
     let browser = document.getElementById("browser");

From ddeef40873dd96aaf28db32ca51fcf63ab34f7a1 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Thu, 11 Apr 2013 15:50:07 -0400
Subject: [PATCH 035/230] Bug 860562 - CSS fixups for toolbarpalette items and
 customization mode. r=jaws.

---
 browser/base/content/customize.inc          |  2 +-
 browser/themes/linux/browser.css            | 57 +--------------
 browser/themes/osx/browser.css              | 56 +--------------
 browser/themes/shared/customization.inc.css | 80 +++++++++++++++++++++
 browser/themes/windows/browser.css          | 56 +--------------
 5 files changed, 87 insertions(+), 164 deletions(-)
 create mode 100644 browser/themes/shared/customization.inc.css

diff --git a/browser/base/content/customize.inc b/browser/base/content/customize.inc
index f943d12a1485..49ab3c42de10 100644
--- a/browser/base/content/customize.inc
+++ b/browser/base/content/customize.inc
@@ -17,7 +17,7 @@
       <hbox id="customization-widgets">
         <vbox flex="1">
           <label value="&customizeMode.menuAndToolbars.header;"/>
-          <vbox id="customization-palette" flex="1" style="display: block;"/>
+          <vbox id="customization-palette" flex="1"/>
         </vbox>
         <vbox>
           <vbox id="customization-panelWrapper">
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 0a46bd537b09..f11d26c0fcf5 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -2167,63 +2167,10 @@ chatbox {
 }
 
 /* Customization mode */
-#main-window[customizing] {
-  -moz-appearance: none;
-  background-image: url("chrome://browser/skin/customization/customization-mode-background.jpg");
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-}
 
-#main-window[customizing] #tab-view-deck {
-  transition-property: padding;
-  transition-duration: 300ms;
-  transition-timing-function: ease-out;
-  padding: 8em;
-}
+%include ../shared/customization.inc.css
 
-#main-window:not([customizing]) #tab-view-deck {
-  transition-property: padding;
-  transition-duration: 200ms;
-  transition-timing-function: ease-out;
-  padding: 0;
-}
-
-#main-window[customizing] .tabbrowser-tab:not([selected]),
-#main-window[customizing] .tabs-newtab-button {
-  opacity: 0.4;
-}
-
-#main-window[customizing] .customization-target,
-#customization-panelHolder > #PanelUI-mainView {
-  box-shadow: inset 0 0 3px blue;
-  border-radius: 2px;
-}
-
-#customization-panelWrapper {
-  padding: 0px 8px;
-}
-
-#customization-palette > toolbarpaletteitem {
-  display: inline-block;
-  -moz-orient: vertical;
-  padding: 1em;
-}
-
-toolbarpaletteitem {
-  cursor: -moz-grab;
-  transition: transform, background-color, border-color, box-shadow;
-  transition-duration: 0.5s, 10ms, 10ms, 10ms;
-  transition-timing-function: ease-in-out, linear, linear, linear;
-}
-
-toolbarpaletteitem[mousedown] {
-  box-shadow: inset 0 0 3px hsl(204,100%,40%);
-  cursor: -moz-grabbing;
-  opacity: 0.8;
-  transform: scale(1.1);
-}
-
-/* end Customization mode */
+/* End customization mode */
 
 .click-to-play-plugins-notification-content {
   margin: -10px;
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 06a9dc68cb65..dc0f00f7e123 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -3599,62 +3599,10 @@ chatbox {
 }
 
 /* Customization mode */
-#main-window[customizing] {
-  background-image: url("chrome://browser/skin/customization/customization-mode-background.jpg");
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-}
 
-#main-window[customizing] #tab-view-deck {
-  transition-property: padding;
-  transition-duration: 300ms;
-  transition-timing-function: ease-out;
-  padding: 8em;
-}
+%include ../shared/customization.inc.css
 
-#main-window:not([customizing]) #tab-view-deck {
-  transition-property: padding;
-  transition-duration: 200ms;
-  transition-timing-function: ease-out;
-  padding: 0;
-}
-
-#main-window[customizing] .tabbrowser-tab:not([selected]),
-#main-window[customizing] .tabs-newtab-button {
-  opacity: 0.4;
-}
-
-#main-window[customizing] .customization-target,
-#customization-panelHolder > #PanelUI-mainView {
-  box-shadow: inset 0 0 3px blue;
-  border-radius: 2px;
-}
-
-#customization-panelWrapper {
-  padding: 0px 8px;
-}
-
-#customization-palette > toolbarpaletteitem {
-  display: inline-block;
-  -moz-orient: vertical;
-  padding: 1em;
-}
-
-toolbarpaletteitem {
-  cursor: -moz-grab;
-  transition: transform, background-color, border-color, box-shadow;
-  transition-duration: 0.5s, 10ms, 10ms, 10ms;
-  transition-timing-function: ease-in-out, linear, linear, linear;
-}
-
-toolbarpaletteitem[mousedown] {
-  box-shadow: inset 0 0 3px hsl(204,100%,40%);
-  cursor: -moz-grabbing;
-  opacity: 0.8;
-  transform: scale(1.1);
-}
-
-/* end Customization mode */
+/* End customization mode */
 
 panel[type="arrow"][popupid="click-to-play-plugins"] > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="top"],
 panel[type="arrow"][popupid="click-to-play-plugins"] > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="bottom"] {
diff --git a/browser/themes/shared/customization.inc.css b/browser/themes/shared/customization.inc.css
new file mode 100644
index 000000000000..0da4c26ea1f9
--- /dev/null
+++ b/browser/themes/shared/customization.inc.css
@@ -0,0 +1,80 @@
+/* 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/. */
+
+/* Customization mode */
+
+#main-window[customizing] {
+  background-image: url("chrome://browser/skin/customization/customization-mode-background.jpg");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+}
+
+#main-window[customizing] #tab-view-deck {
+  transition-property: padding;
+  transition-duration: 300ms;
+  transition-timing-function: ease-out;
+  padding: 8em;
+}
+
+#main-window:not([customizing]) #tab-view-deck {
+  transition-property: padding;
+  transition-duration: 200ms;
+  transition-timing-function: ease-out;
+  padding: 0;
+}
+
+#main-window[customizing] .tabbrowser-tab:not([selected]),
+#main-window[customizing] .tabs-newtab-button {
+  opacity: 0.4;
+}
+
+#main-window[customizing] .customization-target,
+#customization-panelHolder > #PanelUI-mainView {
+  box-shadow: inset 0 0 3px hsl(204,100%,40%);
+  border-radius: 2px;
+}
+
+#customization-panelWrapper {
+  padding: 0px 8px;
+}
+
+toolbarpaletteitem {
+  cursor: -moz-grab;
+  transition: transform, background-color, border-color, box-shadow;
+  transition-duration: 50ms, 10ms, 10ms, 10ms;
+  transition-timing-function: ease-in-out, linear, linear, linear;
+}
+
+toolbarpaletteitem[mousedown] {
+  box-shadow: inset 0 0 3px hsl(204,100%,40%);
+  cursor: -moz-grabbing;
+  opacity: 0.8;
+  transform: scale(1.1);
+}
+
+#customization-palette {
+  display: block;
+  overflow: auto;
+  min-height: 3em;
+}
+
+#customization-palette > toolbarpaletteitem {
+  width: 110px;
+  height: 94px;
+  overflow: hidden;
+  display: inline-block;
+}
+
+#customization-palette .toolbarpaletteitem-box {
+  -moz-box-pack: center;
+  -moz-box-flex: 1;
+  width: 110px;
+  max-width: 110px;
+}
+
+#customization-palette > toolbarpaletteitem > label {
+  text-align: center;
+  margin-left: 0;
+  margin-right: 0;
+}
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index b23f428e4a84..084c656228ca 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2930,62 +2930,10 @@ chatbox {
 }
 
 /* Customization mode */
-#main-window[customizing] {
-  background-image: url("chrome://browser/skin/customization/customization-mode-background.jpg");
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-}
 
-#main-window[customizing] #tab-view-deck {
-  transition-property: padding;
-  transition-duration: 300ms;
-  transition-timing-function: ease-out;
-  padding: 8em;
-}
+%include ../shared/customization.inc.css
 
-#main-window:not([customizing]) #tab-view-deck {
-  transition-property: padding;
-  transition-duration: 200ms;
-  transition-timing-function: ease-out;
-  padding: 0;
-}
-
-#main-window[customizing] .tabbrowser-tab:not([selected]),
-#main-window[customizing] .tabs-newtab-button {
-  opacity: 0.4;
-}
-
-#main-window[customizing] .customization-target,
-#customization-panelHolder > #PanelUI-mainView {
-  box-shadow: inset 0 0 3px hsl(204,100%,40%);
-  border-radius: 2px;
-}
-
-#customization-panelWrapper {
-  padding: 0px 8px;
-}
-
-#customization-palette > toolbarpaletteitem {
-  display: inline-block;
-  -moz-orient: vertical;
-  padding: 1em;
-}
-
-toolbarpaletteitem {
-  cursor: -moz-grab;
-  transition: transform, background-color, border-color, box-shadow;
-  transition-duration: 0.5s, 10ms, 10ms, 10ms;
-  transition-timing-function: ease-in-out, linear, linear, linear;
-}
-
-toolbarpaletteitem[mousedown] {
-  box-shadow: inset 0 0 3px hsl(204,100%,40%);
-  cursor: -moz-grabbing;
-  opacity: 0.8;
-  transform: scale(1.1);
-}
-
-/* end Customization mode */
+/* End customization mode */
 
 .click-to-play-plugins-notification-content {
   margin: -10px;

From 3592a8f1c739c343601c0e626eb789b62a476ff6 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Thu, 11 Apr 2013 15:50:45 -0400
Subject: [PATCH 036/230] Bug 860535 - Make it possible to add widgets to the
 ends of customization areas when customizing. r=jaws.

---
 browser/modules/CustomizableUI.jsm          | 23 +++++++++++++++
 browser/modules/CustomizeMode.jsm           | 31 ++++++---------------
 browser/themes/shared/customization.inc.css |  6 ++++
 3 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/browser/modules/CustomizableUI.jsm b/browser/modules/CustomizableUI.jsm
index 9436145c2780..0625ae2fa1fd 100644
--- a/browser/modules/CustomizableUI.jsm
+++ b/browser/modules/CustomizableUI.jsm
@@ -350,6 +350,7 @@ let CustomizableUIInternal = {
       }
 
       container.insertBefore(node, currentNode);
+      this._addParentFlex(node);
     }
 
     if (currentNode) {
@@ -476,6 +477,7 @@ let CustomizableUIInternal = {
 
       let nextNode = container.querySelector("#" + nextNodeId);
       container.insertBefore(widgetNode, nextNode);
+      this._addParentFlex(widgetNode);
     }
   },
 
@@ -493,6 +495,8 @@ let CustomizableUIInternal = {
         continue;
       }
 
+      this._removeParentFlex(widgetNode);
+
       if (gPalette.has(aWidgetId) || this.isSpecialWidget(aWidgetId)) {
         container.removeChild(widgetNode);
       } else {
@@ -1366,6 +1370,25 @@ let CustomizableUIInternal = {
   reset: function() {
     Services.prefs.clearUserPref(kPrefCustomizationState);
     LOG("State reset");
+  },
+
+  _addParentFlex: function(aElement) {
+    // If necessary, add flex to accomodate new child.
+    if (aElement.hasAttribute("flex")) {
+      let parent = aElement.parentNode;
+      let parentFlex = parent.hasAttribute("flex") ? parseInt(parent.getAttribute("flex"), 10) : 0;
+      let elementFlex = parseInt(aElement.getAttribute("flex"), 10);
+      parent.setAttribute("flex", parentFlex + elementFlex);
+    }
+  },
+
+  _removeParentFlex: function(aElement) {
+    if (aElement.parentNode.hasAttribute("flex") && aElement.hasAttribute("flex")) {
+      let parent = aElement.parentNode;
+      let parentFlex = parseInt(parent.getAttribute("flex"), 10);
+      let elementFlex = parseInt(aElement.getAttribute("flex"), 10);
+      parent.setAttribute("flex", Math.max(0, parentFlex - elementFlex));
+    }
   }
 };
 Object.freeze(CustomizableUIInternal);
diff --git a/browser/modules/CustomizeMode.jsm b/browser/modules/CustomizeMode.jsm
index 2dbeec6e7b89..115abbd7a514 100644
--- a/browser/modules/CustomizeMode.jsm
+++ b/browser/modules/CustomizeMode.jsm
@@ -535,7 +535,6 @@ CustomizeMode.prototype = {
     // either the originArea was the palette, or a customizable area.
     if (targetArea.id == kPaletteId) {
       if (originArea.id !== kPaletteId) {
-        this._removeParentFlex(draggedWrapper);
         let widget = this.unwrapToolbarItem(draggedWrapper);
         CustomizableUI.removeWidgetFromArea(draggedItemId);
         draggedWrapper = this.wrapToolbarItem(widget, "palette");
@@ -550,6 +549,15 @@ CustomizeMode.prototype = {
       return;
     }
 
+    // Is the target the customization area itself? If so, we just add the
+    // widget to the end of the area.
+    if (targetNode == targetArea.customizationTarget) {
+      let widget = this.unwrapToolbarItem(draggedWrapper);
+      CustomizableUI.addWidgetToArea(draggedItemId, targetArea.id);
+      this.wrapToolbarItem(widget, getPlaceForItem(targetNode));
+      return;
+    }
+
     // We need to determine the place that the widget is being dropped in
     // the target.
     let placement = CustomizableUI.getPlacementOfWidget(targetNode.firstChild.id);
@@ -576,10 +584,6 @@ CustomizeMode.prototype = {
       return;
     }
 
-    // We're moving from one customization area to another. Remove any flexing
-    // that we might have added.
-    this._removeParentFlex(draggedWrapper);
-
     // A little hackery - we quickly unwrap the item and use CustomizableUI's
     // addWidgetToArea to move the widget to the right place for every window,
     // then we re-wrap the widget. We have to unwrap the target widget too so
@@ -590,14 +594,6 @@ CustomizeMode.prototype = {
     CustomizableUI.addWidgetToArea(draggedItemId, targetArea.id, position);
     this.wrapToolbarItem(targetWidget, properPlace);
     draggedWrapper = this.wrapToolbarItem(widget, properPlace);
-
-    // If necessary, add flex to accomodate new child.
-    if (draggedWrapper.hasAttribute("flex")) {
-      let parent = draggedWrapper.parentNode;
-      let parentFlex = parent.hasAttribute("flex") ? parseInt(parent.getAttribute("flex"), 10) : 0;
-      let itemFlex = parseInt(draggedWrapper.getAttribute("flex"), 10);
-      parent.setAttribute("flex", parentFlex + itemFlex);
-    }
   },
 
   _onDragExit: function(aEvent) {
@@ -630,15 +626,6 @@ CustomizeMode.prototype = {
     }
   },
 
-  _removeParentFlex: function(aElement) {
-    if (aElement.parentNode.hasAttribute("flex") && aElement.hasAttribute("flex")) {
-      let parent = aElement.parentNode;
-      let parentFlex = parseInt(parent.getAttribute("flex"), 10);
-      let elementFlex = parseInt(aElement.getAttribute("flex"), 10);
-      parent.setAttribute("flex", Math.max(0, parentFlex - elementFlex));
-    }
-  },
-
   _getCustomizableParent: function(aElement) {
     let areas = CustomizableUI.areas;
     areas.push(kPaletteId);
diff --git a/browser/themes/shared/customization.inc.css b/browser/themes/shared/customization.inc.css
index 0da4c26ea1f9..a6836c1cb9c4 100644
--- a/browser/themes/shared/customization.inc.css
+++ b/browser/themes/shared/customization.inc.css
@@ -35,6 +35,12 @@
   border-radius: 2px;
 }
 
+#main-window[customizing] .customization-target {
+  min-width: 100px;
+  padding-left: 10px;
+  padding-right: 10px;
+}
+
 #customization-panelWrapper {
   padding: 0px 8px;
 }

From 265cbf137d6d61db21320da0b5fe7495ea715ec2 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 12 Apr 2013 03:42:52 -0400
Subject: [PATCH 037/230] Bug 860646 - Panel isn't resizing reliably when
 entering sub-views. r=jaws,feedback=Unfocused.

---
 browser/base/content/panelUI.inc             | 11 +++-
 browser/base/content/panelUI.js              | 64 ++++++++++++--------
 browser/modules/CustomizableUI.jsm           |  6 --
 browser/themes/shared/panelUIOverlay.inc.css | 16 +++--
 4 files changed, 59 insertions(+), 38 deletions(-)

diff --git a/browser/base/content/panelUI.inc b/browser/base/content/panelUI.inc
index 8a8cb2cf687b..32e30c5e069c 100644
--- a/browser/base/content/panelUI.inc
+++ b/browser/base/content/panelUI.inc
@@ -61,8 +61,13 @@
       <box id="PanelUI-clickCapturer">
       </box>
 
-      <deck id="PanelUI-subViews" flex="1">
-        <vbox id="PanelUI-bookmarks" flex="1">
+      <!-- We manually set display: none (via a CSS attribute selector) on the
+           subviews that are not being displayed. We're using this over a deck
+           because a deck assumes the size of its largest child, regardless of
+           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">
           <label value="&appMenuBookmarks.label;"/>
           <vbox flex="1">
             <toolbarbutton label="&bookmarkThisPageCmd.label;"/>
@@ -72,7 +77,7 @@
           </vbox>
           <vbox id="PanelUI-bookmarks-tall-maker" />
         </vbox>
-      </deck>
+      </box>
     </stack>
   </box>
 </panel>
diff --git a/browser/base/content/panelUI.js b/browser/base/content/panelUI.js
index 693adde90f9b..f0527a160889 100644
--- a/browser/base/content/panelUI.js
+++ b/browser/base/content/panelUI.js
@@ -38,27 +38,6 @@ const PanelUI = {
             this.viewStack.getAttribute("view") == "subview");
   },
 
-  /**
-   * If true, puts us into subview mode, which slides the subview deck over
-   * and adjusts the height of the panel accordingly.
-   *
-   * @param aVal
-   *        True if we should be in subview mode.
-   */
-  set _showingSubView(aVal) {
-    if (aVal) {
-      let oldHeight = this.mainView.clientHeight;
-      this.viewStack.setAttribute("view", "subview");
-      this.mainViewSpring.style.height = this.subViews.scrollHeight - oldHeight + "px";
-      this.container.style.height = this.subViews.scrollHeight + "px";
-    } else {
-      this.viewStack.setAttribute("view", "main");
-      this._syncContainerWithMainView();
-    }
-
-    return aVal;
-  },
-
   init: function() {
     for (let [k, v] of Iterator(this.kElements)) {
       // Need to do fresh let-bindings per iteration
@@ -76,6 +55,12 @@ const PanelUI = {
 
     this.clickCapturer.addEventListener("click", this._onCapturerClick,
                                         true);
+
+    // 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) {
+      this._syncContainerWithSubView();
+    }.bind(this));
   },
 
   uninit: function() {
@@ -164,14 +149,20 @@ const PanelUI = {
   showMainView: function() {
     // Are we showing a subview? If so, fire the ViewHiding event on it.
     if (this._showingSubView) {
-      let viewNode = this.subViews.selectedPanel;
+      let viewNode = this._currentSubView;
       let evt = document.createEvent("CustomEvent");
       evt.initCustomEvent("ViewHiding", true, true, viewNode);
       viewNode.dispatchEvent(evt);
+
+      viewNode.removeAttribute("current");
+      this._currentSubView = null;
+      this._subViewObserver.disconnect();
     }
 
+    this.viewStack.setAttribute("view", "main");
+    this._syncContainerWithMainView();
+
     this._shiftMainView();
-    this._showingSubView = false;
   },
 
   /**
@@ -191,13 +182,19 @@ const PanelUI = {
       return;
     }
 
+    let oldHeight = this.mainView.clientHeight;
+    viewNode.setAttribute("current", true);
+    this._currentSubView = viewNode;
+
     // Emit the ViewShowing event so that the widget definition has a chance
     // to lazily populate the subview with things.
     let evt = document.createEvent("CustomEvent");
     evt.initCustomEvent("ViewShowing", true, true, viewNode);
     viewNode.dispatchEvent(evt);
 
-    this.subViews.selectedPanel = viewNode;
+    this.viewStack.setAttribute("view", "subview");
+    this.mainViewSpring.style.height = this.subViews.scrollHeight - oldHeight + "px";
+    this.container.style.height = this.subViews.scrollHeight + "px";
 
     // Now we have to transition to transition the panel. There are a few parts
     // to this:
@@ -212,7 +209,12 @@ const PanelUI = {
     // All three of these actions make use of CSS transformations, so they
     // should all occur simultaneously.
     this._shiftMainView(aAnchor);
-    this._showingSubView = true;
+    this._subViewObserver.observe(viewNode, {
+      attributes: true,
+      characterData: true,
+      childList: true,
+      subtree: true
+    });
   },
 
   /**
@@ -226,6 +228,18 @@ const PanelUI = {
     this.mainViewSpring.style.height = "";
   },
 
+  /**
+   * Ensures that the container has the same height as the subview holder.
+   * This is usually done when switching to a subview, or if a subview changes
+   * in size.
+   */
+  _syncContainerWithSubView: function() {
+    let springHeight = this.mainViewSpring.getBoundingClientRect().height;
+    let mainViewHeight = this.mainView.clientHeight - springHeight;
+    this.container.style.height = this.subViews.scrollHeight + "px";
+    this.mainViewSpring.style.height = (this.subViews.scrollHeight - mainViewHeight) + "px";
+  },
+
   /**
    * Sets the anchor node into the open or closed state, depending
    * on the state of the panel.
diff --git a/browser/modules/CustomizableUI.jsm b/browser/modules/CustomizableUI.jsm
index 0625ae2fa1fd..7d06ef1462ca 100644
--- a/browser/modules/CustomizableUI.jsm
+++ b/browser/modules/CustomizableUI.jsm
@@ -42,13 +42,7 @@ XPCOMUtils.defineLazyGetter(this, "gBuiltInWidgets", function() {
     // viewId.
     // XXXmconley: Is this too magical?
     onViewShowing: function(aEvent) {
-      // Populate our list of bookmarks
-      // Right now, I just jam in a tall vbox to simulate making the view
-      // tall before switching to it.
       LOG("Bookmark view is being shown!");
-      let doc = aEvent.detail.ownerDocument;
-      let vbox = doc.getElementById("PanelUI-bookmarks-tall-maker");
-      vbox.style.height = "500px";
     },
     onViewHiding: function(aEvent) {
       LOG("Bookmark view is being hidden!");
diff --git a/browser/themes/shared/panelUIOverlay.inc.css b/browser/themes/shared/panelUIOverlay.inc.css
index 0291a291de16..7a186346d65a 100644
--- a/browser/themes/shared/panelUIOverlay.inc.css
+++ b/browser/themes/shared/panelUIOverlay.inc.css
@@ -50,7 +50,8 @@
   overflow: hidden;
 }
 
-#PanelUI-popup[panelopen="true"] > #PanelUI-container {
+#PanelUI-popup[panelopen="true"] > #PanelUI-container,
+#PanelUI-mainView-spring {
   transition: height 150ms;
 }
 
@@ -71,9 +72,8 @@
   min-width: @menuPanelWidth@;
 }
 
-#PanelUI-mainView-springy {
+#PanelUI-mainView-spring {
   height: 0;
-  transition: height 150ms;
 }
 
 #PanelUI-subViews {
@@ -86,10 +86,18 @@
   transition: transform 150ms;
 }
 
+#PanelUI-subViews > .PanelUI-subView:not([current]) {
+  display: none;
+}
+
 #PanelUI-viewStack[view="subview"] > #PanelUI-subViews {
   transform: translateX(0);
 }
 
+#PanelUI-viewStack:not([view="subview"]) > #PanelUI-subViews {
+  display: none;
+}
+
 #PanelUI-contents[type="list"] > toolbarbutton {
   -moz-box-orient: horizontal;
 }
@@ -217,4 +225,4 @@
               0 0 2px hsla(210,54%,20%,0);
   text-shadow: none;
   transition: none;
-}
\ No newline at end of file
+}

From 10e96b78f351b7acc90ca9027181c165c8de4eb5 Mon Sep 17 00:00:00 2001
From: Jared Wein <jaws@mozilla.com>
Date: Fri, 12 Apr 2013 03:43:21 -0400
Subject: [PATCH 038/230] Bug 855803 - Create the History widget with subview.
 r=mconley

---
 browser/base/content/panelUI.inc              | 10 ++-
 .../locales/en-US/chrome/browser/browser.dtd  |  2 +
 browser/modules/CustomizableUI.jsm            | 71 +++++++++++++++++--
 browser/modules/Makefile.in                   |  2 +-
 browser/themes/shared/panelUIOverlay.inc.css  |  4 ++
 5 files changed, 82 insertions(+), 7 deletions(-)

diff --git a/browser/base/content/panelUI.inc b/browser/base/content/panelUI.inc
index 32e30c5e069c..26f09b560fe3 100644
--- a/browser/base/content/panelUI.inc
+++ b/browser/base/content/panelUI.inc
@@ -75,7 +75,15 @@
             <toolbarbutton label="&showAllBookmarks2.label;"/>
             <spacer flex="1"/>
           </vbox>
-          <vbox id="PanelUI-bookmarks-tall-maker" />
+          <vbox id="PanelUI-bookmarks-tall-maker"/>
+        </vbox>
+        <vbox id="PanelUI-history" flex="1">
+          <label value="&appMenuHistory.label;"/>
+          <vbox id="PanelUI-historyItems"/>
+          <label value="&appMenuHistoryMore.label;"
+                 id="PanelUI-historyMore"
+                 class="text-link"
+                 onclick="PlacesCommandHook.showPlacesOrganizer('History'); PanelUI.hide();"/>
         </vbox>
       </box>
     </stack>
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index aa185ac769a2..5362007cca46 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -323,6 +323,8 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY appMenuSafeMode.accesskey "R">
 <!ENTITY appMenuBack.label "Back">
 <!ENTITY appMenuBookmarks.label "Bookmarks">
+<!ENTITY appMenuHistory.label "History">
+<!ENTITY appMenuHistoryMore.label "More…">
 
 <!ENTITY openCmd.commandkey           "l">
 <!ENTITY urlbar.placeholder2          "Search or enter address">
diff --git a/browser/modules/CustomizableUI.jsm b/browser/modules/CustomizableUI.jsm
index 7d06ef1462ca..eb6d65605a84 100644
--- a/browser/modules/CustomizableUI.jsm
+++ b/browser/modules/CustomizableUI.jsm
@@ -11,6 +11,8 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
+  "resource://gre/modules/PlacesUtils.jsm");
 
 const kNSXUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
@@ -107,16 +109,75 @@ XPCOMUtils.defineLazyGetter(this, "gBuiltInWidgets", function() {
       "48": "chrome://branding/content/icon48.png"
     }
   }, {
-    id: "share-page-5",
-    name: "Share 5",
-    shortcut: "Ctrl+Alt+S",
-    description: "Share this page",
+    id: "history-panelmenu",
+    type: "view",
+    viewId: "PanelUI-history",
+    name: "History...",
+    description: "History repeats itself!",
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL],
     icons: {
       "16": "chrome://branding/content/icon16.png",
       "32": "chrome://branding/content/icon48.png",
       "48": "chrome://branding/content/icon48.png"
+    },
+    onViewShowing: function(aEvent) {
+      // Populate our list of history
+      const kMaxResults = 10;
+      let doc = aEvent.detail.ownerDocument;
+
+      let options = PlacesUtils.history.getNewQueryOptions();
+      options.excludeQueries = true;
+      options.includeHidden = false;
+      options.resultType = options.RESULTS_AS_URI;
+      options.queryType = options.QUERY_TYPE_HISTORY;
+      options.sortingMode = options.SORT_BY_DATE_DESCENDING;
+      options.maxResults = kMaxResults;
+      let query = PlacesUtils.history.getNewQuery();
+
+      let items = doc.getElementById("PanelUI-historyItems");
+      // Clear previous history items.
+      while (items.firstChild) {
+        items.removeChild(items.firstChild);
+      }
+
+      PlacesUtils.history.QueryInterface(Ci.nsPIPlacesDatabase)
+                         .asyncExecuteLegacyQueries([query], 1, options, {
+        handleResult: function (aResultSet) {
+          let fragment = doc.createDocumentFragment();
+          for (let row, i = 0; (row = aResultSet.getNextRow()); i++) {
+            try {
+              let uri = row.getResultByIndex(1);
+              let title = row.getResultByIndex(2);
+              let icon = row.getResultByIndex(6);
+
+              let item = doc.createElementNS(kNSXUL, "toolbarbutton");
+              item.setAttribute("label", title || uri);
+              item.addEventListener("click", function(aEvent) {
+                if (aEvent.button == 0) {
+                  doc.defaultView.openUILink(uri, aEvent);
+                  doc.defaultView.PanelUI.hide();
+                }
+              });
+              if (icon)
+                item.setAttribute("image", "moz-anno:favicon:" + icon);
+              fragment.appendChild(item);
+            } catch (e) {
+              Cu.reportError("Error while showing history subview: " + e);
+            }
+          }
+          items.appendChild(fragment);
+        },
+        handleError: function (aError) {
+          LOG("History view tried to show but had an error: " + aError);
+        },
+        handleCompletion: function (aReason) {
+          LOG("History view is being shown!");
+        },
+      });
+    },
+    onViewHiding: function(aEvent) {
+      LOG("History view is being hidden!");
     }
   }];
 });
@@ -175,7 +236,7 @@ let gDefaultPlacements = new Map([
     "print-button",
     "history-button",
     "fullscreen-button",
-    "share-page-5",
+    "history-panelmenu",
     "bookmarks-panelmenu",
   ]]
 ]);
diff --git a/browser/modules/Makefile.in b/browser/modules/Makefile.in
index 315f5ee59053..a713c35844d5 100644
--- a/browser/modules/Makefile.in
+++ b/browser/modules/Makefile.in
@@ -14,6 +14,7 @@ include $(topsrcdir)/config/config.mk
 EXTRA_JS_MODULES = \
 	BrowserNewTabPreloader.jsm \
 	CustomizableUI.jsm \
+	CustomizeMode.jsm \
 	openLocationLastURL.jsm \
 	NetworkPrioritizer.jsm \
 	offlineAppCache.jsm \
@@ -26,7 +27,6 @@ EXTRA_JS_MODULES = \
 
 EXTRA_PP_JS_MODULES = \
 	AboutHomeUtils.jsm \
-	CustomizeMode.jsm \
 	RecentWindow.jsm \
 	$(NULL)
 
diff --git a/browser/themes/shared/panelUIOverlay.inc.css b/browser/themes/shared/panelUIOverlay.inc.css
index 7a186346d65a..cb211a696c4f 100644
--- a/browser/themes/shared/panelUIOverlay.inc.css
+++ b/browser/themes/shared/panelUIOverlay.inc.css
@@ -226,3 +226,7 @@
   text-shadow: none;
   transition: none;
 }
+
+#PanelUI-historyItems > toolbarbutton {
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+}

From 1efcb055868fbd624f5b3993c390e4042af3c03b Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 12 Apr 2013 18:33:01 -0400
Subject: [PATCH 039/230] Bug 861401 - Make subview transitions work again -
 fixes fallout from bug 860562. r=jaws.

---
 browser/themes/shared/panelUIOverlay.inc.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/browser/themes/shared/panelUIOverlay.inc.css b/browser/themes/shared/panelUIOverlay.inc.css
index cb211a696c4f..5866971c83a7 100644
--- a/browser/themes/shared/panelUIOverlay.inc.css
+++ b/browser/themes/shared/panelUIOverlay.inc.css
@@ -94,10 +94,6 @@
   transform: translateX(0);
 }
 
-#PanelUI-viewStack:not([view="subview"]) > #PanelUI-subViews {
-  display: none;
-}
-
 #PanelUI-contents[type="list"] > toolbarbutton {
   -moz-box-orient: horizontal;
 }

From b8cfbb428ee18942aa17186269a4d871cf115fe8 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Fri, 29 Mar 2013 14:53:01 -0700
Subject: [PATCH 040/230] Bug 855229 -  Adjust focus-rect on tabs for
 Australis. r=mconley,ui-r=shorlander

---
 browser/themes/linux/browser.css   | 2 +-
 browser/themes/osx/browser.css     | 2 +-
 browser/themes/windows/browser.css | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index f11d26c0fcf5..054cbe48f15c 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -1599,7 +1599,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   background-image: linear-gradient(to top, rgba(0,0,0,.3) 1px, rgba(0,0,0,.05) 1px, transparent 50%);
 }
 
-.tabbrowser-tab:focus > .tab-stack {
+.tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-label {
   outline: 1px dotted;
 }
 
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index dc0f00f7e123..b4da79f7d6bc 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -2261,7 +2261,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   border-width: 0 11px;
 }
 
-.tabbrowser-tab:focus > .tab-stack {
+.tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-label {
   box-shadow: @focusRingShadow@;
 }
 
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 084c656228ca..7cc9371f71e0 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1998,7 +1998,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 
 /* tabbrowser-tab focus ring */
-.tabbrowser-tab:focus > .tab-stack {
+.tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-label {
   outline: 1px dotted;
 }
 

From f8450d453628fe199f33ffd8cc67adcda4c2f49b Mon Sep 17 00:00:00 2001
From: Blair McBride <bmcbride@mozilla.com>
Date: Mon, 15 Apr 2013 10:52:24 +1200
Subject: [PATCH 041/230] 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 115abbd7a514..d1ee9ccd54aa 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 b2f4f2d178b1806e642c7cf3b6429fb39f308912 Mon Sep 17 00:00:00 2001
From: Blair McBride <bmcbride@mozilla.com>
Date: Mon, 15 Apr 2013 13:35:16 +1200
Subject: [PATCH 042/230] 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 26f09b560fe3..11515c4b2631 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 eb6d65605a84..baf71bda40ad 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 85d5b39713cd1d1dbd48770355074d992a2ca33b Mon Sep 17 00:00:00 2001
From: Jared Wein <jaws@mozilla.com>
Date: Fri, 19 Apr 2013 17:06:53 -0400
Subject: [PATCH 043/230] 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 f0527a160889..373c5cd71de1 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 baf71bda40ad..da5ce0f734d6 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 5866971c83a7..0f99f41113c6 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 a3484779937a8a48cdff27216a1d1c7a99b1e955 Mon Sep 17 00:00:00 2001
From: Blair McBride <bmcbride@mozilla.com>
Date: Mon, 15 Apr 2013 17:34:52 +1200
Subject: [PATCH 044/230] 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 14615818af4a..3822ef1bd569 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 63a7d376e301..373c7707dbfa 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 fe552474265b..3b1c24e70582 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 a02805edaba1..22b61aeae84d 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 f9cac5b2df3d..6e3c97e2c4bf 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 ec843c4cc841..1151ae43aeef 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 000000000000..e2b78b4b66be
--- /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 000000000000..895d11993cfb
--- /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 b8245cff1802..8f49fa9b0818 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 000000000000..ecda062b9991
--- /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 000000000000..1509df583485
--- /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 000000000000..895d11993cfb
--- /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 a781c598826e..52f479ff6972 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 a713c35844d5..983a3c91e56e 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 054cbe48f15c..873e2484d5fe 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 11e8c6c0be35..acf69a84fbb7 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 bedc616da938..ccb1ba5ec6aa 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 b4da79f7d6bc..9410f7a2aee6 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 eccce5a230fe..3d65a4a0391f 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 7281146fd8e4..aeab0d0dc4df 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 a6836c1cb9c4..c315bbdfe2d0 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 7cc9371f71e0..6625499f317d 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 17989b9e90e4..0afbeb7780da 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 3d58fa92a1c4..89ddad456df9 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 deacc9c427db7bf37f339220290f9cbe7ec24430 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Mon, 22 Apr 2013 17:01:31 -0700
Subject: [PATCH 045/230] Bug 813786 - Australis tabs Windows lightweight theme
 support. r=mconley

---
 browser/base/content/browser-addons.js        |  55 ++++++++++++++++++
 browser/base/content/browser.js               |   2 +
 browser/base/content/browser.xul              |   1 +
 browser/themes/shared/tabs.inc.css            |  14 +++--
 browser/themes/windows/browser-aero.css       |  22 ++++---
 .../windows/browser-lightweightTheme.css      |  29 +++++++++
 browser/themes/windows/browser.css            |  16 +++--
 browser/themes/windows/jar.mn                 |   4 ++
 .../tabbrowser/tab-active-middle-lwtheme.png  | Bin 0 -> 226 bytes
 browser/themes/windows/windowsShared.inc      |   8 +++
 10 files changed, 128 insertions(+), 23 deletions(-)
 create mode 100644 browser/themes/windows/browser-lightweightTheme.css
 create mode 100644 browser/themes/windows/tabbrowser/tab-active-middle-lwtheme.png
 create mode 100644 browser/themes/windows/windowsShared.inc

diff --git a/browser/base/content/browser-addons.js b/browser/base/content/browser-addons.js
index b638f31f9ea2..c63fea50b885 100644
--- a/browser/base/content/browser-addons.js
+++ b/browser/base/content/browser-addons.js
@@ -415,3 +415,58 @@ var LightWeightThemeWebInstaller = {
                                     node.baseURI);
   }
 }
+
+/*
+ * Listen for Lightweight Theme styling changes and update the browser's theme accordingly.
+ */
+let LightweightThemeListener = {
+  _modifiedStyles: [],
+
+  init: function () {
+    XPCOMUtils.defineLazyGetter(this, "styleSheet", function() {
+      for (let i = document.styleSheets.length - 1; i >= 0; i--) {
+        let sheet = document.styleSheets[i];
+        if (sheet.href == "chrome://browser/skin/browser-lightweightTheme.css")
+          return sheet;
+      }
+    });
+
+    Services.obs.addObserver(this, "lightweight-theme-styling-update", false);
+    if (document.documentElement.hasAttribute("lwtheme"))
+      this.updateStyleSheet(document.documentElement.style.backgroundImage);
+  },
+
+  uninit: function () {
+    Services.obs.removeObserver(this, "lightweight-theme-styling-update");
+  },
+
+  /**
+   * Append the headerImage to the background-image property of all rulesets in
+   * browser-lightweightTheme.css.
+   *
+   * @param headerImage - a string containing a CSS image for the lightweight theme header.
+   */
+  updateStyleSheet: function(headerImage) {
+    if (!this.styleSheet)
+      return;
+    for (let i = 0; i < this.styleSheet.cssRules.length; i++) {
+      let rule = this.styleSheet.cssRules[i];
+      if (!rule.style.backgroundImage)
+        continue;
+
+      if (!this._modifiedStyles[i])
+        this._modifiedStyles[i] = { backgroundImage: rule.style.backgroundImage };
+
+      rule.style.backgroundImage = this._modifiedStyles[i].backgroundImage + ", " + headerImage;
+    }
+  },
+
+  // nsIObserver
+  observe: function (aSubject, aTopic, aData) {
+    if (aTopic != "lightweight-theme-styling-update" || !this.styleSheet)
+      return;
+
+    let themeData = JSON.parse(aData);
+    this.updateStyleSheet("url(" + themeData.headerURL + ")");
+  },
+};
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index e6f2cac4db73..7e10539af9da 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1040,6 +1040,7 @@ var gBrowserInit = {
     gFormSubmitObserver.init();
     PanelUI.init();
     SocialUI.init();
+    LightweightThemeListener.init();
     AddonManager.addAddonListener(AddonsMgrListener);
     WebrtcIndicator.init();
 
@@ -1376,6 +1377,7 @@ var gBrowserInit = {
       IndexedDBPromptHelper.uninit();
       AddonManager.removeAddonListener(AddonsMgrListener);
       SocialUI.uninit();
+      LightweightThemeListener.uninit();
       gCustomizeMode.uninit();
       PanelUI.uninit();
     }
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index fe552474265b..693fe1c8deb6 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -11,6 +11,7 @@
 <?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/" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/browser-lightweightTheme.css" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 <?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?>
diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
index 61ebf18deffd..c73b89ee2974 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -110,13 +110,13 @@
   background-repeat: no-repeat;
 }
 
-.tab-background-start[selected=true]:not(:-moz-lwtheme):-moz-locale-dir(ltr)::after,
-.tab-background-end[selected=true]:not(:-moz-lwtheme):-moz-locale-dir(rtl)::after {
+.tab-background-start[selected=true]:-moz-locale-dir(ltr)::after,
+.tab-background-end[selected=true]:-moz-locale-dir(rtl)::after {
   background-image: url(chrome://browser/skin/tabbrowser/tab-stroke-start.png);
 }
 
-.tab-background-end[selected=true]:not(:-moz-lwtheme):-moz-locale-dir(ltr)::after,
-.tab-background-start[selected=true]:not(:-moz-lwtheme):-moz-locale-dir(rtl)::after {
+.tab-background-end[selected=true]:-moz-locale-dir(ltr)::after,
+.tab-background-start[selected=true]:-moz-locale-dir(rtl)::after {
   background-image: url(chrome://browser/skin/tabbrowser/tab-stroke-end.png);
 }
 
@@ -134,13 +134,15 @@
   background-repeat: repeat-x;
 }
 
+.tab-background-middle[selected=true]:-moz-lwtheme {
+  background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png);
+}
+
 /* Same as above but without border or -moz-dialog background */
 .tab-background-start[selected=true]:-moz-lwtheme::before,
 .tab-background-end[selected=true]:-moz-lwtheme::before,
 .tab-background-middle[selected=true]:-moz-lwtheme {
   background-color: transparent;
-  background-image: @fgTabTexture@;
-  background-position: left 0 top 2px;
 }
 
 /* End selected tab */
diff --git a/browser/themes/windows/browser-aero.css b/browser/themes/windows/browser-aero.css
index a5de9e661781..1f919fd2a19b 100644
--- a/browser/themes/windows/browser-aero.css
+++ b/browser/themes/windows/browser-aero.css
@@ -179,9 +179,6 @@
     border-right: 1px solid @toolbarShadowColor@;
     background-clip: padding-box;
   }
-  #main-window[sizemode=normal] #navigator-toolbox > toolbar:-moz-lwtheme {
-    border-color: transparent !important;
-  }
   #main-window[sizemode=normal] #browser-border-start,
   #main-window[sizemode=normal] #browser-border-end {
     display: -moz-box;
@@ -200,29 +197,30 @@
   }
 
   /* Toolbar shadow behind tabs */
-  #nav-bar[tabsontop=true]:not(:-moz-lwtheme),
-  #main-window[disablechrome] #navigator-toolbox[tabsontop=true]:not(:-moz-lwtheme)::after {
-    border-top: 1px solid @toolbarShadowColor@;
+  #nav-bar[tabsontop=true],
+  #main-window[disablechrome] #navigator-toolbox[tabsontop=true]::after {
+    border-top: 1px solid @toolbarShadowColor@ !important;
     background-clip: padding-box;
   }
 
-  #main-window[disablechrome] #navigator-toolbox[tabsontop=true]:not(:-moz-lwtheme)::after {
+  #main-window[disablechrome] #navigator-toolbox[tabsontop=true]::after {
     visibility: visible;
   }
 
   /* This code is only needed for restored windows (i.e. sizemode=normal)
      because of the border radius on the toolbar below the tab bar. */
-  #main-window[sizemode=normal] #nav-bar[tabsontop=true]:not(:-moz-lwtheme),
-  #main-window[sizemode=normal] #nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + toolbar:not(:-moz-lwtheme),
-  #main-window[sizemode=normal] #nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme),
-  #main-window[sizemode=normal][disablechrome] #navigator-toolbox[tabsontop=true]:not(:-moz-lwtheme)::after {
+  #main-window[sizemode=normal] #nav-bar[tabsontop=true],
+  #main-window[sizemode=normal] #nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + toolbar,
+  #main-window[sizemode=normal] #nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar,
+  #main-window[sizemode=normal][disablechrome] #navigator-toolbox[tabsontop=true]::after {
     border-top: 1px solid @toolbarShadowColor@;
     border-top-left-radius: 2.5px;
     border-top-right-radius: 2.5px;
     background-clip: padding-box;
   }
 
-  #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme) {
+  /* Cover the top border of the adjacent toolbar */
+  #TabsToolbar[tabsontop=true] {
     margin-bottom: -1px;
   }
 
diff --git a/browser/themes/windows/browser-lightweightTheme.css b/browser/themes/windows/browser-lightweightTheme.css
new file mode 100644
index 000000000000..840a9ae6947e
--- /dev/null
+++ b/browser/themes/windows/browser-lightweightTheme.css
@@ -0,0 +1,29 @@
+/* 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/. */
+
+%include windowsShared.inc
+%filter substitution
+
+/*
+ * LightweightThemeListener will append the current lightweight theme's header
+ * image to the background-image for each of the following rulesets.
+ */
+
+/* Lightweight theme on tabs */
+#tabbrowser-tabs:not([movingtab]) > .tabbrowser-tab > .tab-stack > .tab-background > .tab-background-start[selected=true]:-moz-lwtheme::before,
+#tabbrowser-tabs:not([movingtab]) > .tabbrowser-tab > .tab-stack > .tab-background > .tab-background-end[selected=true]:-moz-lwtheme::before {
+  background-attachment: scroll, fixed;
+  background-color: transparent;
+  background-image: @fgTabTexture@;/*, lwtHeader;*/
+  background-position: 0 0, right top;
+}
+
+#tabbrowser-tabs:not([movingtab]) > .tabbrowser-tab > .tab-stack > .tab-background > .tab-background-middle[selected=true]:-moz-lwtheme {
+  background-attachment: scroll, scroll, fixed;
+  background-color: transparent;
+  background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle-lwtheme.png),
+                    @fgTabTexture@;/*,
+                    lwtHeader;*/
+  background-position: 0 0, 0 0, right top;
+}
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 7cc9371f71e0..0d6b3b68066e 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -8,10 +8,9 @@
 @namespace html url("http://www.w3.org/1999/xhtml");
 
 %include ../shared/browser.inc
+%include windowsShared.inc
 %filter substitution
-%define toolbarHighlight rgba(253,253,253,0.45)
 %define toolbarShadowColor hsla(209,67%,12%,0.35)
-%define fgTabTexture linear-gradient(rgba(254,254,254,0.72), rgba(254,254,254,0.72) 0px, rgba(250,250,250,0.88) 1px, rgba(250,250,250,0.88) 1px, rgba(254,254,254,0.72) 2px, @toolbarHighlight@)
 %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
@@ -93,7 +92,9 @@
                 linear-gradient(rgba(50%,50%,50%,0), InactiveCaption 85%);
     color: InactiveCaptionText;
   }
-
+  #TabsToolbar:-moz-lwtheme {
+    background: linear-gradient(to top, @toolbarShadowColor@ 1px, transparent 1px);
+  }
   #main-window[tabsintitlebar] #titlebar:-moz-lwtheme {
     visibility: hidden;
   }
@@ -1973,10 +1974,16 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   color: CaptionText;
 }
 
-.tabbrowser-tab:-moz-lwtheme {
+/* The selected tab should keep dark text with lightweight themes */
+.tabbrowser-tab:-moz-lwtheme:not([selected=true]) {
   color: inherit;
 }
 
+.tabbrowser-tab[selected=true]:-moz-lwtheme {
+  /* Copied from :root:-moz-lwtheme-darktext in global.css */
+  text-shadow: 0 -0.5px 1.5px white;
+}
+
 .tab-throbber,
 .tab-icon-image {
   width: 16px;
@@ -3058,4 +3065,3 @@ chatbox {
   width: 20px;
   height: 16px;
 }
-
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index 3d58fa92a1c4..4eb74d775adf 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -24,6 +24,7 @@ browser.jar:
         skin/classic/browser/appmenu-icons.png
         skin/classic/browser/appmenu-dropmarker.png
 *       skin/classic/browser/browser.css
+*       skin/classic/browser/browser-lightweightTheme.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/engineManager.css
@@ -134,6 +135,7 @@ browser.jar:
         skin/classic/browser/tabbrowser/loading.png                  (tabbrowser/loading.png)
         skin/classic/browser/tabbrowser/tab.png                      (tabbrowser/tab.png)
         skin/classic/browser/tabbrowser/tab-active-middle.png        (tabbrowser/tab-active-middle.png)
+        skin/classic/browser/tabbrowser/tab-active-middle-lwtheme.png (tabbrowser/tab-active-middle-lwtheme.png)
         skin/classic/browser/tabbrowser/tab-arrow-left.png           (tabbrowser/tab-arrow-left.png)
         skin/classic/browser/tabbrowser/tab-arrow-left-inverted.png  (tabbrowser/tab-arrow-left-inverted.png)
         skin/classic/browser/tabbrowser/tab-background-start.png     (tabbrowser/tab-background-start.png)
@@ -279,6 +281,7 @@ browser.jar:
         skin/classic/aero/browser/appmenu-dropmarker.png
         skin/classic/aero/browser/appmenu-icons.png
 *       skin/classic/aero/browser/browser.css                        (browser-aero.css)
+*       skin/classic/aero/browser/browser-lightweightTheme.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/engineManager.css
@@ -389,6 +392,7 @@ browser.jar:
         skin/classic/aero/browser/tabbrowser/loading.png             (tabbrowser/loading.png)
         skin/classic/aero/browser/tabbrowser/tab.png                 (tabbrowser/tab.png)
         skin/classic/aero/browser/tabbrowser/tab-active-middle.png   (tabbrowser/tab-active-middle.png)
+        skin/classic/aero/browser/tabbrowser/tab-active-middle-lwtheme.png (tabbrowser/tab-active-middle-lwtheme.png)
         skin/classic/aero/browser/tabbrowser/tab-arrow-left.png      (tabbrowser/tab-arrow-left.png)
         skin/classic/aero/browser/tabbrowser/tab-arrow-left-inverted.png (tabbrowser/tab-arrow-left-inverted.png)
         skin/classic/aero/browser/tabbrowser/tab-background-start.png    (tabbrowser/tab-background-start.png)
diff --git a/browser/themes/windows/tabbrowser/tab-active-middle-lwtheme.png b/browser/themes/windows/tabbrowser/tab-active-middle-lwtheme.png
new file mode 100644
index 0000000000000000000000000000000000000000..592aab39c29cdd122f9939feaf9644042a98a3bc
GIT binary patch
literal 226
zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol}0V0ox?vVykEa{HEjtmSN`?>!lvI6;>1s;*b
z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP*t3#
zi(`m|f9{EmyiAS)EC(-JdZ>JKoWSt&xD(HI|K!9efwKbF@BQw4?Q_-M)ValW|I?mr
te_h>S*ptYUEOA)km_Zv(=A4<O%u;^@Tb3UC84I+D!PC{xWt~$(69D^cNhAOO

literal 0
HcmV?d00001

diff --git a/browser/themes/windows/windowsShared.inc b/browser/themes/windows/windowsShared.inc
new file mode 100644
index 000000000000..9f76d90c2b88
--- /dev/null
+++ b/browser/themes/windows/windowsShared.inc
@@ -0,0 +1,8 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+%filter substitution
+
+%define toolbarHighlight rgba(253,253,253,0.45)
+%define fgTabTexture linear-gradient(transparent, transparent 2px, rgba(254,254,254,0.72) 2px, rgba(254,254,254,0.72) 2px, rgba(250,250,250,0.88) 3px, rgba(250,250,250,0.88) 3px, rgba(254,254,254,0.72) 4px, rgba(254,254,254,0.72) 4px, @toolbarHighlight@)

From 75fab37c05a4a7e175df1a73887ea733880d1a0b Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Tue, 16 Apr 2013 21:08:07 -0700
Subject: [PATCH 046/230] Bug 851009 - Australis tab separator highlights.
 ui-r=fryn,r=MattN

---
 browser/themes/linux/jar.mn                       |   1 +
 browser/themes/linux/tabbrowser/tab-separator.png | Bin 0 -> 192 bytes
 browser/themes/osx/browser.css                    |  13 ++++++++++---
 browser/themes/osx/jar.mn                         |   1 +
 browser/themes/osx/tabbrowser/tab-separator.png   | Bin 0 -> 159 bytes
 browser/themes/shared/tabs.inc.css                |  13 +++++++------
 browser/themes/windows/browser.css                |   6 ++++++
 browser/themes/windows/jar.mn                     |   3 +++
 .../windows/tabbrowser/tab-separator-aero.png     | Bin 0 -> 166 bytes
 .../tabbrowser/tab-separator-luna-blue.png        | Bin 0 -> 172 bytes
 .../themes/windows/tabbrowser/tab-separator.png   | Bin 0 -> 168 bytes
 11 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 browser/themes/linux/tabbrowser/tab-separator.png
 create mode 100644 browser/themes/osx/tabbrowser/tab-separator.png
 create mode 100644 browser/themes/windows/tabbrowser/tab-separator-aero.png
 create mode 100644 browser/themes/windows/tabbrowser/tab-separator-luna-blue.png
 create mode 100644 browser/themes/windows/tabbrowser/tab-separator.png

diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index bedc616da938..3d00542ba472 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -119,6 +119,7 @@ browser.jar:
   skin/classic/browser/tabbrowser/tab-stroke-end.png        (tabbrowser/tab-stroke-end.png)
   skin/classic/browser/tabbrowser/tab-stroke-start.png      (tabbrowser/tab-stroke-start.png)
   skin/classic/browser/tabbrowser/tabDragIndicator.png      (tabbrowser/tabDragIndicator.png)
+  skin/classic/browser/tabbrowser/tab-separator.png         (tabbrowser/tab-separator.png)
   skin/classic/browser/tabview/edit-light.png         (tabview/edit-light.png)
   skin/classic/browser/tabview/search.png             (tabview/search.png)
   skin/classic/browser/tabview/stack-expander.png     (tabview/stack-expander.png)
diff --git a/browser/themes/linux/tabbrowser/tab-separator.png b/browser/themes/linux/tabbrowser/tab-separator.png
new file mode 100644
index 0000000000000000000000000000000000000000..63f77f1b760b2e66e2fab7e739979b7cdede2116
GIT binary patch
literal 192
zcmeAS@N?(olHy`uVBq!ia0vp^%s?#1!3HE>CM@{{q$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c6(xDPIEGZ*O8WEvzdbXLfuRE9vh(lf8+&zsHf+wAz@sd%
zxhX@Uo%a}HqL@H$XdAB@^C6iNr*2G~T9^>pb}-TXSwYfM1Lv;>$)*jHEvhXFqq^=|
nO8iSata-RghnX+10qCqHCR~QDO&0Ay+Za4u{an^LB{Ts5X9_^D

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 84d7ce527ca6..20a418815eb7 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -2287,6 +2287,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 }
 
 #TabsToolbar {
+  position: relative;
   -moz-appearance: none;
   background-repeat: repeat-x;
 }
@@ -2297,10 +2298,16 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 }
 
 /*
- * Draw the bottom border of the tabstrip above ::before
+ * Draw the bottom border of the tabstrip:
  */
-#TabsToolbar[tabsontop="true"]:not(:-moz-lwtheme) {
-  background: linear-gradient(to top, hsla(0,0%,0%,.3), hsla(0,0%,0%,.3) 1px, transparent 1px);
+#TabsToolbar[tabsontop="true"]:not(:-moz-lwtheme)::after {
+  content: '';
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 0;
+  border-bottom: 1px solid hsla(0,0%,0%,.22);
 }
 
 /* In tabs-on-bottom mode, fill the whole toolbar with the chrome
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index 7281146fd8e4..e50dc79e1b22 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -196,6 +196,7 @@ browser.jar:
   skin/classic/browser/tabbrowser/tab-overflow-border.png                (tabbrowser/tab-overflow-border.png)
   skin/classic/browser/tabbrowser/tabDragIndicator.png                   (tabbrowser/tabDragIndicator.png)
   skin/classic/browser/tabbrowser/tabDragIndicator@2x.png                (tabbrowser/tabDragIndicator.png)
+  skin/classic/browser/tabbrowser/tab-separator.png                      (tabbrowser/tab-separator.png)
   skin/classic/browser/tabview/close.png                    (tabview/close.png)
   skin/classic/browser/tabview/edit-light.png               (tabview/edit-light.png)
   skin/classic/browser/tabview/search.png                   (tabview/search.png)
diff --git a/browser/themes/osx/tabbrowser/tab-separator.png b/browser/themes/osx/tabbrowser/tab-separator.png
new file mode 100644
index 0000000000000000000000000000000000000000..b643bfc6f67da9c4934f05510b5cbd296e901bcd
GIT binary patch
literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^%s?#1!2%?mGjj@olw^r(L`iUdT1k0gQ7VIDN`6wR
zf@f}GdTLN=VoGJ<$y6JlB1cab#}JO_Qom>}1_KVG*Z;!vz9i^m{8Y?pb>W*Gqu{5c
z(BiaU>8&dUlXEn9r(`;prkQUJy5C%$TD!O8WmDvLh7aqRRg!)kxdk+g!PC{xWt~$(
F698+(Gw1*S

literal 0
HcmV?d00001

diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
index c73b89ee2974..862d08a3487c 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -9,7 +9,7 @@
 %define tabCurveHalfWidth 15px
 
 /* image preloading hack */
-#TabsToolbar::after {
+#TabsToolbar::before {
   content: '';
   display: block;
   background-image:
@@ -187,20 +187,21 @@
   background-size: 85% 100%;
 }
 
-/* Background tab separators (1px wide).
+/* Background tab separators (3px wide).
    Also show separators beside the selected tab when dragging it. */
 #tabbrowser-tabs[movingtab] > .tabbrowser-tab[beforeselected]:not([last-visible-tab])::after,
 .tabbrowser-tab:not([selected]):not([afterselected-visible]):not([afterhovered]):not([first-visible-tab]):not(:hover)::before,
 #tabbrowser-tabs:not([overflow]) > .tabbrowser-tab[last-visible-tab]:not([selected]):not([beforehovered]):not(:hover)::after {
-  -moz-margin-start: -1px;
-  background-image: linear-gradient(rgba(10,31,51,0), rgba(10,31,51,0.3));
+  -moz-margin-start: -1.5px;
+  -moz-margin-end: -1.5px;
+  background-image: url("chrome://browser/skin/tabbrowser/tab-separator.png");
   background-position: left bottom;
   background-repeat: no-repeat;
-  background-size: 1px 100%;
+  background-size: 3px 100%;
   content: '';
   display: -moz-box;
   height: @tabHeight@;
-  width: 1px;
+  width: 3px;
 }
 
 /* New tab button */
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 0d6b3b68066e..75236df0ed49 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1967,6 +1967,12 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   #main-window[tabsintitlebar]:not([inFullscreen]) .tab-close-button:not(:hover):not([selected="true"]) {
     -moz-image-region: rect(0, 64px, 16px, 48px);
   }
+
+  #tabbrowser-tabs[movingtab] > .tabbrowser-tab[beforeselected]:not([last-visible-tab])::after,
+  .tabbrowser-tab:not([selected]):not([afterselected-visible]):not([afterhovered]):not([first-visible-tab]):not(:hover)::before,
+  #tabbrowser-tabs:not([overflow]) > .tabbrowser-tab[last-visible-tab]:not([selected]):not([beforehovered]):not(:hover)::after {
+    background-image: url("chrome://browser/skin/tabbrowser/tab-separator-luna-blue.png");
+  }
 }
 %endif
 
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index 4eb74d775adf..0d21ef168895 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -145,6 +145,8 @@ browser.jar:
         skin/classic/browser/tabbrowser/tab-stroke-end.png           (tabbrowser/tab-stroke-end.png)
         skin/classic/browser/tabbrowser/tab-stroke-start.png         (tabbrowser/tab-stroke-start.png)
         skin/classic/browser/tabbrowser/tabDragIndicator.png         (tabbrowser/tabDragIndicator.png)
+        skin/classic/browser/tabbrowser/tab-separator-luna-blue.png  (tabbrowser/tab-separator-luna-blue.png)
+        skin/classic/browser/tabbrowser/tab-separator.png            (tabbrowser/tab-separator.png)
         skin/classic/browser/tabview/close.png                      (tabview/close.png)
         skin/classic/browser/tabview/edit-light.png                 (tabview/edit-light.png)
         skin/classic/browser/tabview/grain.png                      (tabview/grain.png)
@@ -402,6 +404,7 @@ browser.jar:
         skin/classic/aero/browser/tabbrowser/tab-stroke-end.png      (tabbrowser/tab-stroke-end.png)
         skin/classic/aero/browser/tabbrowser/tab-stroke-start.png    (tabbrowser/tab-stroke-start.png)
         skin/classic/aero/browser/tabbrowser/tabDragIndicator.png    (tabbrowser/tabDragIndicator.png)
+        skin/classic/aero/browser/tabbrowser/tab-separator.png       (tabbrowser/tab-separator-aero.png)
         skin/classic/aero/browser/tabview/close.png                  (tabview/close.png)
         skin/classic/aero/browser/tabview/edit-light.png             (tabview/edit-light.png)
         skin/classic/aero/browser/tabview/grain.png                  (tabview/grain.png)
diff --git a/browser/themes/windows/tabbrowser/tab-separator-aero.png b/browser/themes/windows/tabbrowser/tab-separator-aero.png
new file mode 100644
index 0000000000000000000000000000000000000000..af4403a500a0e320d1fac2c4d7b9196c9f8973eb
GIT binary patch
literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^%s?#1!3HE>CM@{{q$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c6?u5NIEF}EPX6`(zdbXLv7rLvGVbm3jf=Er7&K)};E`$O
zaMNH9X0vaX)NYq-^9*Q<=I=P@G{=bNa)3^%+Qo%CYP)P59yD?=+`r6U-T80IPoS9$
Mp00i_>zopr03&8J`2YX_

literal 0
HcmV?d00001

diff --git a/browser/themes/windows/tabbrowser/tab-separator-luna-blue.png b/browser/themes/windows/tabbrowser/tab-separator-luna-blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f8cae3b3251af8c85416c09ec2b7d3b094594e2
GIT binary patch
literal 172
zcmeAS@N?(olHy`uVBq!ia0vp^%s?#1!3HE>CM@{{q$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c75RC(IEF|}P5$-&zdbXLv7rK^K>Nh#ODsNzQ)VO@`2_IA
zu&wJ6?1*$=k~o!MG($!pt@Wj1c$?^I9^p;J1=@>mSoT=dc0FXOP%t{gB+M`;oXbUr
S^MV7=WCl-HKbLh*2~7Y{h%{>e

literal 0
HcmV?d00001

diff --git a/browser/themes/windows/tabbrowser/tab-separator.png b/browser/themes/windows/tabbrowser/tab-separator.png
new file mode 100644
index 0000000000000000000000000000000000000000..c76c615fc18c37261e76ab39db98b18e19c67013
GIT binary patch
literal 168
zcmeAS@N?(olHy`uVBq!ia0vp^%s?#1!3HE>CM@{{q$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c6?u8OIEF}sC;$5Y-=3Mr*ieB{pgr((i?mNOr$XAXQ;o?p
zc(^z582hwwYBk47YKNt&oH$^4CV<bFv+BfFk)!q+j7_(fpE+TaAjNQW4OgybjNpEt
OsSKX3elF{r5}E*i4>VE$

literal 0
HcmV?d00001


From 05ed8fbb690ed5ea10c64bca13fdfde9942438e0 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Mon, 22 Apr 2013 09:43:18 -0400
Subject: [PATCH 047/230] 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 aeab0d0dc4df..ba72245ce35c 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 d14d32357577dd1e93c3f8b4056db32b0d30bbde Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Tue, 23 Apr 2013 10:54:20 -0400
Subject: [PATCH 048/230] Bug 857088 - Ensure the proper gap between tab-strip
 and titlebar when using large fonts. r=MattN.

---
 browser/base/content/browser.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index db9849a50b13..6b946974a9bd 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -4581,11 +4581,11 @@ var TabsInTitlebar = {
     let titlebarContent = $("titlebar-content");
     let menubar = $("toolbar-menubar");
 
-    // Reset the margins that _update modifies so that we can take accurate
-    // measurements.
+    // Reset the margins and padding that _update modifies so that we can take
+    // accurate measurements.
     titlebarContent.style.marginBottom = "";
     titlebar.style.marginBottom = "";
-    menubar.style.marginBottom = "";
+    menubar.style.paddingBottom = "";
 
     if (allowed) {
       // We set the tabsintitlebar attribute first so that our CSS for
@@ -4608,7 +4608,7 @@ var TabsInTitlebar = {
       // bottom of the menubar so that it matches.
       if (menuHeight && titlebarContentHeight > menuHeight) {
         let menuTitlebarDelta = titlebarContentHeight - menuHeight;
-        menubar.style.marginBottom = menuTitlebarDelta + "px";
+        menubar.style.paddingBottom = menuTitlebarDelta + "px";
         menuHeight += menuTitlebarDelta;
       }
 

From babf8ca4a46791420a1ef01cc1c52d4a8daf209c Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Wed, 24 Apr 2013 16:32:31 +0200
Subject: [PATCH 049/230] Bug 857626 - Use -moz-box-align: stretch and don't
 specify the height of the tab separator, r=dao

---
 browser/themes/osx/browser.css     | 2 --
 browser/themes/shared/tabs.inc.css | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 20a418815eb7..54e80328abe1 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -2232,12 +2232,10 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 
 .tabbrowser-tab,
 .tabs-newtab-button {
-  -moz-appearance: none;
   font: message-box;
   font-weight: bold;
   text-shadow: @loweredShadow@;
   border: none;
-  -moz-box-align: stretch;
 }
 
 .tabbrowser-tab {
diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
index 862d08a3487c..91ab917e6153 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -21,6 +21,7 @@
 .tabbrowser-tab,
 .tabs-newtab-button {
   -moz-appearance: none;
+  -moz-box-align: stretch;
   background-color: transparent;
   border-radius: 0;
   border-width: 0;
@@ -200,7 +201,6 @@
   background-size: 3px 100%;
   content: '';
   display: -moz-box;
-  height: @tabHeight@;
   width: 3px;
 }
 

From be61b42cc7a4c545055538ea8730eda8c69d6db9 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Wed, 24 Apr 2013 12:52:22 -0400
Subject: [PATCH 050/230] 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 680be2456c92..b7afb1199fde 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 736fb82b3379a754e101cf30c47c8045f52b8d4c Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Wed, 24 Apr 2013 12:52:22 -0400
Subject: [PATCH 051/230] Bug 865419 - Fix bad 3-way merge into UX branch.
 r=jaws.

---
 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 3a1fd8484791..743a8ab5e615 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 3082240f809c364dc61a1eea2db5b6a187bc95a4 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Wed, 24 Apr 2013 13:26:01 -0400
Subject: [PATCH 052/230] 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 ac195e77040f..2a04a2ac0c5d 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 0dcda6248ebf..229c04ceaa9a 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 7e922ca62110..aa2ca8f959b2 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 ec95861acac8..6bb857bb26d6 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 7fc509f66a1c..017248b50fa8 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 bf6b2002885638dd05299e25bd460fa9a79ff5e8 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Wed, 24 Apr 2013 13:32:10 -0400
Subject: [PATCH 053/230] 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 373c5cd71de1..7558637459f1 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 0f99f41113c6..ebe3e95ceed9 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 a8bc8c860c00a9bdfbc43ec2b4403d774859caef Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Wed, 24 Apr 2013 15:36:02 -0400
Subject: [PATCH 054/230] 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 b7afb1199fde..680be2456c92 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">

From 58f8f7cd173d64adbd3779852f46b27a598da143 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Wed, 24 Apr 2013 16:04:13 -0400
Subject: [PATCH 055/230] Bug 685059 - Remove empty placeholder icon in tabs
 when a page has no favicon. r=dao,ui-r=shorlander.

---
 browser/base/content/tabbrowser.css |  1 +
 browser/themes/linux/browser.css    |  3 ---
 browser/themes/osx/browser.css      |  8 +++++---
 browser/themes/shared/tabs.inc.css  | 13 +++++++++++++
 browser/themes/windows/browser.css  |  7 -------
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/browser/base/content/tabbrowser.css b/browser/base/content/tabbrowser.css
index 2dd6a05297c8..e47e3d6e4287 100644
--- a/browser/base/content/tabbrowser.css
+++ b/browser/base/content/tabbrowser.css
@@ -41,6 +41,7 @@ tabpanels {
   z-index: 2;
 }
 
+.tab-icon-image:not([src]):not([pinned]),
 .tab-throbber:not([busy]),
 .tab-throbber[busy] + .tab-icon-image {
   display: none;
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 62ea4dd19c11..d310da3f78be 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -1612,10 +1612,7 @@ toolbar[iconsize="small"] #bookmarks-menu-button[starred],
 
 .tab-throbber,
 .tab-icon-image {
-  width: 16px;
-  height: 16px;
   -moz-margin-end: 3px;
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
 .tab-throbber {
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 3737c2fed26b..ae4c63f1dd92 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -2181,11 +2181,13 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 
 %include ../shared/tabs.inc.css
 
+.tab-label {
+  margin: 0;
+}
+
 .tab-throbber,
 .tab-icon-image {
-  width: 16px;
-  height: 16px;
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+  -moz-margin-end: 6px;
 }
 
 .tab-throbber {
diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
index 91ab917e6153..e2a688eaf414 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -210,3 +210,16 @@
   clip-path: url(chrome://browser/content/browser.xul#tab-clip-path-outer);
   width: 66px;
 }
+
+
+/* Tab icons */
+
+.tab-throbber,
+.tab-icon-image {
+  width: 16px;
+  height: 16px;
+}
+
+.tab-icon-image {
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+}
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 0f64209738fd..a37625555951 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1987,13 +1987,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   text-shadow: 0 -0.5px 1.5px white;
 }
 
-.tab-throbber,
-.tab-icon-image {
-  width: 16px;
-  height: 16px;
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-}
-
 .tab-throbber {
   list-style-image: url("chrome://browser/skin/tabbrowser/connecting.png");
 }

From 48d2378234157bfdf121513294a89c56707e7700 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Wed, 24 Apr 2013 17:13:42 -0400
Subject: [PATCH 056/230] Bug 865419 - Follow-up that fixes more 3-way merge
 badness from 4741bea99fbf. Exiting customization mode no longer breaks
 things. r=jaws.

---
 browser/base/content/browser-customization.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/base/content/browser-customization.js b/browser/base/content/browser-customization.js
index 522139143899..e93602ba201a 100644
--- a/browser/base/content/browser-customization.js
+++ b/browser/base/content/browser-customization.js
@@ -79,7 +79,7 @@ let CustomizationHandler = {
     if (gURLBar) {
       URLBarSetURI();
       XULBrowserWindow.asyncUpdateUI();
-      PlacesStarButton.updateState();
+      BookmarksMenuButton.updateStarState();
       SocialShareButton.updateShareState();
     }
 

From 7daa0ff0216ddb354e7b97f199d433a56195224b Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 25 Apr 2013 00:57:28 +0200
Subject: [PATCH 057/230] Bug 857626 - fix new tab button on Windows and Linux,
 r=dao

--HG--
extra : rebase_source : 3897a736ee04936ce73ddfc5073e09e77472aa8e
---
 browser/themes/linux/browser.css   | 4 ++++
 browser/themes/windows/browser.css | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index d310da3f78be..7aacdb1885a1 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -1679,6 +1679,10 @@ toolbar[iconsize="small"] #bookmarks-menu-button[starred],
   -moz-image-region: auto;
 }
 
+.tabs-newtab-button {
+  -moz-box-align: center;
+}
+
 /* Tabstrip close button */
 .tabs-closebutton {
   list-style-image: url("moz-icon://stock/gtk-close?size=menu");
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index a37625555951..2cdf6db9b040 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2077,6 +2077,10 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   border-image: url("chrome://browser/skin/tabbrowser/tab-overflow-border.png") 0 2 0 2 fill;
 }
 
+.tabs-newtab-button {
+  -moz-box-align: center;
+}
+
 .tabs-newtab-button > .toolbarbutton-icon {
   margin-top: -1px;
   margin-bottom: -1px;

From 7718cc307e4c9a09e0a4d49df4cc2dac7726db37 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 25 Apr 2013 13:30:33 +0200
Subject: [PATCH 058/230] Bug 865487 - New Tab button should never get
 -moz-box-align: stretch in the first place, r=dao

---
 browser/themes/linux/browser.css   | 4 ----
 browser/themes/shared/tabs.inc.css | 5 ++++-
 browser/themes/windows/browser.css | 4 ----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 7aacdb1885a1..d310da3f78be 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -1679,10 +1679,6 @@ toolbar[iconsize="small"] #bookmarks-menu-button[starred],
   -moz-image-region: auto;
 }
 
-.tabs-newtab-button {
-  -moz-box-align: center;
-}
-
 /* Tabstrip close button */
 .tabs-closebutton {
   list-style-image: url("moz-icon://stock/gtk-close?size=menu");
diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
index e2a688eaf414..bf38c7693085 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -21,7 +21,6 @@
 .tabbrowser-tab,
 .tabs-newtab-button {
   -moz-appearance: none;
-  -moz-box-align: stretch;
   background-color: transparent;
   border-radius: 0;
   border-width: 0;
@@ -29,6 +28,10 @@
   padding: 0;
 }
 
+.tabbrowser-tab {
+  -moz-box-align: stretch;
+}
+
 /* The selected tab should appear above adjacent tabs and .tabs-newtab-button */
 .tabbrowser-tab[selected=true] {
   position: relative;
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 2cdf6db9b040..a37625555951 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2077,10 +2077,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   border-image: url("chrome://browser/skin/tabbrowser/tab-overflow-border.png") 0 2 0 2 fill;
 }
 
-.tabs-newtab-button {
-  -moz-box-align: center;
-}
-
 .tabs-newtab-button > .toolbarbutton-icon {
   margin-top: -1px;
   margin-bottom: -1px;

From 1672033c2c4c2b034513bed9d9522fb93fcf5344 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 25 Apr 2013 17:15:07 +0200
Subject: [PATCH 059/230] Bug 865698 - Avoid using generated content: '' as
 much as possible, r=MattN

---
 browser/themes/shared/tabs.inc.css | 17 ++++-------------
 browser/themes/windows/browser.css |  2 +-
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
index bf38c7693085..878b8a2924f0 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -88,7 +88,7 @@
 .tab-background-end[selected=true]::after {
   /* position ::after on top of its parent */
   -moz-margin-start: -@tabCurveWidth@;
-  content: "";
+  margin-bottom: -1px;
   display: -moz-box;
 }
 
@@ -109,19 +109,14 @@
   clip-path: url(chrome://browser/content/browser.xul#tab-curve-clip-path-end);
 }
 
-.tab-background-start[selected=true]:not(:-moz-lwtheme)::after,
-.tab-background-end[selected=true]:not(:-moz-lwtheme)::after {
-  background-repeat: no-repeat;
-}
-
 .tab-background-start[selected=true]:-moz-locale-dir(ltr)::after,
 .tab-background-end[selected=true]:-moz-locale-dir(rtl)::after {
-  background-image: url(chrome://browser/skin/tabbrowser/tab-stroke-start.png);
+  content: url(chrome://browser/skin/tabbrowser/tab-stroke-start.png);
 }
 
 .tab-background-end[selected=true]:-moz-locale-dir(ltr)::after,
 .tab-background-start[selected=true]:-moz-locale-dir(rtl)::after {
-  background-image: url(chrome://browser/skin/tabbrowser/tab-stroke-end.png);
+  content: url(chrome://browser/skin/tabbrowser/tab-stroke-end.png);
 }
 
 .tab-background-start[selected=true]::before,
@@ -198,11 +193,7 @@
 #tabbrowser-tabs:not([overflow]) > .tabbrowser-tab[last-visible-tab]:not([selected]):not([beforehovered]):not(:hover)::after {
   -moz-margin-start: -1.5px;
   -moz-margin-end: -1.5px;
-  background-image: url("chrome://browser/skin/tabbrowser/tab-separator.png");
-  background-position: left bottom;
-  background-repeat: no-repeat;
-  background-size: 3px 100%;
-  content: '';
+  content: url(chrome://browser/skin/tabbrowser/tab-separator.png);
   display: -moz-box;
   width: 3px;
 }
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index a37625555951..b3d7b9edc6da 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1968,7 +1968,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   #tabbrowser-tabs[movingtab] > .tabbrowser-tab[beforeselected]:not([last-visible-tab])::after,
   .tabbrowser-tab:not([selected]):not([afterselected-visible]):not([afterhovered]):not([first-visible-tab]):not(:hover)::before,
   #tabbrowser-tabs:not([overflow]) > .tabbrowser-tab[last-visible-tab]:not([selected]):not([beforehovered]):not(:hover)::after {
-    background-image: url("chrome://browser/skin/tabbrowser/tab-separator-luna-blue.png");
+    content: url("chrome://browser/skin/tabbrowser/tab-separator-luna-blue.png");
   }
 }
 %endif

From a022f71bfea50f29236d24e54ab63c42abeb4ce9 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 25 Apr 2013 20:10:21 +0200
Subject: [PATCH 060/230] Bug 865776 - pinned tab on OS X has too much space on
 the right side of the icon, r=mconley

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

diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index ae4c63f1dd92..ee2efbbe16e3 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -2185,8 +2185,8 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   margin: 0;
 }
 
-.tab-throbber,
-.tab-icon-image {
+.tab-throbber:not([pinned]),
+.tab-icon-image:not([pinned]) {
   -moz-margin-end: 6px;
 }
 

From 1b808bcff37903b72b8030710bd6d87c9a5dbc99 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Thu, 25 Apr 2013 15:28:37 -0400
Subject: [PATCH 061/230] Bug 864355 - Extend customization target across
 (almost) the entire nav-bar. r=jaws.

---
 browser/base/content/browser.js               |   3 +-
 browser/base/content/browser.xul              | 272 +++++++++---------
 .../customizableui/content/toolbar.xml        |  11 +
 .../customizableui/src/CustomizableUI.jsm     |   8 +-
 .../customizableui/src/CustomizeMode.jsm      |  18 +-
 browser/themes/linux/browser.css              |   4 +-
 browser/themes/osx/browser.css                |   2 +-
 browser/themes/windows/browser.css            |   2 +-
 8 files changed, 166 insertions(+), 154 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index ff18c60c6b20..df1d34168bf5 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -4061,8 +4061,7 @@ var CombinedStopReload = {
     var stop = document.getElementById("stop-button");
 
     if (urlbar) {
-      if (urlbar.parentNode.getAttribute("mode") != "icons" ||
-          !reload || urlbar.nextSibling != reload ||
+      if (!reload || urlbar.nextSibling != reload ||
           !stop || reload.nextSibling != stop)
         urlbar.removeAttribute("combined");
       else {
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index b7afb1199fde..01abe7ad6fc0 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -532,145 +532,145 @@
              customizationtarget="nav-bar-customizationtarget"
              context="toolbar-context-menu">
 
-      <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
-                   context="backForwardMenu" removable="true"
-                   forwarddisabled="true"
-                   title="&backForwardItem.title;">
-        <toolbarbutton id="back-button" class="toolbarbutton-1"
-                       label="&backCmd.label;"
-                       command="Browser:BackOrBackDuplicate"
-                       onclick="checkForMiddleClick(this, event);"
-                       tooltip="back-button-tooltip"/>
-        <toolbarbutton id="forward-button" class="toolbarbutton-1"
-                       label="&forwardCmd.label;"
-                       command="Browser:ForwardOrForwardDuplicate"
-                       onclick="checkForMiddleClick(this, event);"
-                       tooltip="forward-button-tooltip"/>
-        <dummyobservertarget hidden="true"
-                             onbroadcast="if (this.getAttribute('disabled') == 'true')
-                                            this.parentNode.setAttribute('forwarddisabled', 'true');
-                                          else
-                                            this.parentNode.removeAttribute('forwarddisabled');">
-          <observes element="Browser:ForwardOrForwardDuplicate" attribute="disabled"/>
-        </dummyobservertarget>
-      </toolbaritem>
-
-      <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true"
-                   title="&locationItem.title;" class="chromeclass-location" removable="true">
-        <textbox id="urlbar" flex="1"
-                 placeholder="&urlbar.placeholder2;"
-                 type="autocomplete"
-                 autocompletesearch="urlinline history"
-                 autocompletesearchparam="enable-actions"
-                 autocompletepopup="PopupAutoCompleteRichResult"
-                 completeselectedindex="true"
-                 tabscrolling="true"
-                 showcommentcolumn="true"
-                 showimagecolumn="true"
-                 enablehistory="true"
-                 maxrows="6"
-                 newlines="stripsurroundingwhitespace"
-                 oninput="gBrowser.userTypedValue = this.value;"
-                 ontextentered="this.handleCommand(param);"
-                 ontextreverted="return this.handleRevert();"
-                 pageproxystate="invalid"
-                 onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
-                 onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
-          <box id="notification-popup-box" hidden="true" align="center">
-            <image id="default-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
-          </box>
-          <!-- Use onclick instead of normal popup= syntax since the popup
-               code fires onmousedown, and hence eats our favicon drag events.
-               We only add the identity-box button to the tab order when the location bar
-               has focus, otherwise pressing F6 focuses it instead of the location bar -->
-          <box id="identity-box" role="button"
-               align="center"
-               onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
-               onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
-               ondragstart="gIdentityHandler.onDragStart(event);">
-            <image id="page-proxy-favicon"
-                   onclick="PageProxyClickHandler(event);"
-                   pageproxystate="invalid"/>
-            <hbox id="identity-icon-labels">
-              <label id="identity-icon-label" class="plain" flex="1"/>
-              <label id="identity-icon-country-label" class="plain"/>
-            </hbox>
-          </box>
-          <box id="urlbar-display-box" align="center">
-            <label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
-          </box>
-          <hbox id="urlbar-icons">
-            <image id="page-report-button"
-                   class="urlbar-icon"
-                   hidden="true"
-                   tooltiptext="&pageReportIcon.tooltip;"
-                   onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
-
-            <label id="share-button-status" collapsed="true" role="status"/>
-            <image id="share-button"
-                   class="urlbar-icon"
-                   hidden="true"
-                   onclick="SocialShareButton.onClick(event);"/>
-
-            <image id="go-button"
-                   class="urlbar-icon"
-                   tooltiptext="&goEndCap.tooltip;"
-                   onclick="gURLBar.handleCommand(event);"/>
-          </hbox>
-          <toolbarbutton id="urlbar-go-button"
-                         class="chromeclass-toolbar-additional"
-                         onclick="gURLBar.handleCommand(event);"
-                         tooltiptext="&goEndCap.tooltip;"/>
-          <toolbarbutton id="urlbar-reload-button"
-                         class="chromeclass-toolbar-additional"
-                         command="Browser:ReloadOrDuplicate"
+      <hbox id="nav-bar-customizationtarget" class="customization-target" flex="0">
+        <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
+                     context="backForwardMenu" removable="true"
+                     forwarddisabled="true"
+                     title="&backForwardItem.title;">
+          <toolbarbutton id="back-button" class="toolbarbutton-1"
+                         label="&backCmd.label;"
+                         command="Browser:BackOrBackDuplicate"
                          onclick="checkForMiddleClick(this, event);"
-                         tooltiptext="&reloadButton.tooltip;"/>
-          <toolbarbutton id="urlbar-stop-button"
-                         class="chromeclass-toolbar-additional"
-                         command="Browser:Stop"
-                         tooltiptext="&stopButton.tooltip;"/>
-        </textbox>
-      </toolbaritem>
+                         tooltip="back-button-tooltip"/>
+          <toolbarbutton id="forward-button" class="toolbarbutton-1"
+                         label="&forwardCmd.label;"
+                         command="Browser:ForwardOrForwardDuplicate"
+                         onclick="checkForMiddleClick(this, event);"
+                         tooltip="forward-button-tooltip"/>
+          <dummyobservertarget hidden="true"
+                               onbroadcast="if (this.getAttribute('disabled') == 'true')
+                                              this.parentNode.setAttribute('forwarddisabled', 'true');
+                                            else
+                                              this.parentNode.removeAttribute('forwarddisabled');">
+            <observes element="Browser:ForwardOrForwardDuplicate" attribute="disabled"/>
+          </dummyobservertarget>
+        </toolbaritem>
 
-      <toolbarbutton id="reload-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-                     label="&reloadCmd.label;" removable="true"
-                     command="Browser:ReloadOrDuplicate"
-                     onclick="checkForMiddleClick(this, event);"
-                     tooltiptext="&reloadButton.tooltip;"/>
-
-      <toolbarbutton id="stop-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-                     label="&stopCmd.label;" removable="true"
-                     command="Browser:Stop"
-                     tooltiptext="&stopButton.tooltip;"/>
-
-      <hbox id="nav-bar-customizationtarget" class="customization-target" flex="100"/>
-
-      <toolbarbutton id="webrtc-status-button"
-                     class="toolbarbutton-1 chromeclass-toolbar-additional"
-                     type="menu"
+        <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true"
+                     title="&locationItem.title;" class="chromeclass-location" removable="true">
+          <textbox id="urlbar" flex="1"
+                   placeholder="&urlbar.placeholder2;"
+                   type="autocomplete"
+                   autocompletesearch="urlinline history"
+                   autocompletesearchparam="enable-actions"
+                   autocompletepopup="PopupAutoCompleteRichResult"
+                   completeselectedindex="true"
+                   tabscrolling="true"
+                   showcommentcolumn="true"
+                   showimagecolumn="true"
+                   enablehistory="true"
+                   maxrows="6"
+                   newlines="stripsurroundingwhitespace"
+                   oninput="gBrowser.userTypedValue = this.value;"
+                   ontextentered="this.handleCommand(param);"
+                   ontextreverted="return this.handleRevert();"
+                   pageproxystate="invalid"
+                   onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
+                   onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
+            <box id="notification-popup-box" hidden="true" align="center">
+              <image id="default-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
+            </box>
+            <!-- Use onclick instead of normal popup= syntax since the popup
+                 code fires onmousedown, and hence eats our favicon drag events.
+                 We only add the identity-box button to the tab order when the location bar
+                 has focus, otherwise pressing F6 focuses it instead of the location bar -->
+            <box id="identity-box" role="button"
+                 align="center"
+                 onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
+                 onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
+                 ondragstart="gIdentityHandler.onDragStart(event);">
+              <image id="page-proxy-favicon"
+                     onclick="PageProxyClickHandler(event);"
+                     pageproxystate="invalid"/>
+              <hbox id="identity-icon-labels">
+                <label id="identity-icon-label" class="plain" flex="1"/>
+                <label id="identity-icon-country-label" class="plain"/>
+              </hbox>
+            </box>
+            <box id="urlbar-display-box" align="center">
+              <label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
+            </box>
+            <hbox id="urlbar-icons">
+              <image id="page-report-button"
+                     class="urlbar-icon"
                      hidden="true"
-                     orient="horizontal"
-                     label="&webrtcIndicatorButton.label;"
-                     tooltiptext="&webrtcIndicatorButton.tooltip;">
-        <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);"
-                   onpopuphiding="WebrtcIndicator.clearPopup(this);"
-                   oncommand="WebrtcIndicator.menuCommand(event.target);"/>
-      </toolbarbutton>
+                     tooltiptext="&pageReportIcon.tooltip;"
+                     onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
+
+              <label id="share-button-status" collapsed="true" role="status"/>
+              <image id="share-button"
+                     class="urlbar-icon"
+                     hidden="true"
+                     onclick="SocialShareButton.onClick(event);"/>
+
+              <image id="go-button"
+                     class="urlbar-icon"
+                     tooltiptext="&goEndCap.tooltip;"
+                     onclick="gURLBar.handleCommand(event);"/>
+            </hbox>
+            <toolbarbutton id="urlbar-go-button"
+                           class="chromeclass-toolbar-additional"
+                           onclick="gURLBar.handleCommand(event);"
+                           tooltiptext="&goEndCap.tooltip;"/>
+            <toolbarbutton id="urlbar-reload-button"
+                           class="chromeclass-toolbar-additional"
+                           command="Browser:ReloadOrDuplicate"
+                           onclick="checkForMiddleClick(this, event);"
+                           tooltiptext="&reloadButton.tooltip;"/>
+            <toolbarbutton id="urlbar-stop-button"
+                           class="chromeclass-toolbar-additional"
+                           command="Browser:Stop"
+                           tooltiptext="&stopButton.tooltip;"/>
+          </textbox>
+        </toolbaritem>
+
+        <toolbarbutton id="reload-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+                       label="&reloadCmd.label;" removable="true"
+                       command="Browser:ReloadOrDuplicate"
+                       onclick="checkForMiddleClick(this, event);"
+                       tooltiptext="&reloadButton.tooltip;"/>
+
+        <toolbarbutton id="stop-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+                       label="&stopCmd.label;" removable="true"
+                       command="Browser:Stop"
+                       tooltiptext="&stopButton.tooltip;"/>
+
+        <toolbarbutton id="webrtc-status-button"
+                       class="toolbarbutton-1 chromeclass-toolbar-additional"
+                       type="menu"
+                       hidden="true"
+                       orient="horizontal"
+                       label="&webrtcIndicatorButton.label;"
+                       tooltiptext="&webrtcIndicatorButton.tooltip;">
+          <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);"
+                     onpopuphiding="WebrtcIndicator.clearPopup(this);"
+                     oncommand="WebrtcIndicator.menuCommand(event.target);"/>
+        </toolbarbutton>
+      </hbox>
 
       <toolbaritem id="PanelUI-button"
                    class="chromeclass-toolbar-additional"
diff --git a/browser/components/customizableui/content/toolbar.xml b/browser/components/customizableui/content/toolbar.xml
index 39fef596b140..2dff3f69bf32 100644
--- a/browser/components/customizableui/content/toolbar.xml
+++ b/browser/components/customizableui/content/toolbar.xml
@@ -98,6 +98,17 @@
           return this._toolbox;
         ]]></getter>
       </property>
+
+      <property name="currentSet" readonly="true">
+        <getter><![CDATA[
+          if (!this._customizationTarget)
+            return "";
+
+          return [node.id for (node of this._customizationTarget.children)].join(',');
+        ]]></getter>
+      </property>
+
+
     </implementation>
   </binding>
 
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index da5ce0f734d6..3119ddd95287 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -224,11 +224,16 @@ let gFuturePlacements = new Map();
  */
 let gDefaultPlacements = new Map([
   ["nav-bar", [
+    "unified-back-forward-button",
+    "urlbar-container",
+    "reload-button",
+    "stop-button",
     "search-container",
+    "webrtc-status-button",
     "bookmarks-menu-button-container",
     "downloads-button",
+    "home-button",
     "social-toolbar-button",
-    "PanelUI-button",
     "share-page"
   ]],
   ["PanelUI-contents", [
@@ -371,6 +376,7 @@ let CustomizableUIInternal = {
 
     let placements = gPlacements.get(area);
     this.buildArea(area, placements, aToolbar);
+    aToolbar.setAttribute("currentset", placements.join(","));
 
     // We register this window to have its customization data cleaned up when
     // unloading.
diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index d1ee9ccd54aa..1578969949a9 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -375,19 +375,15 @@ CustomizeMode.prototype = {
   //           also want to (try) persisting with currentset as well to make it
   //           less painful to switch to older builds.
   persistCurrentSets: function()  {
-    //XXXjaws The toolbar bindings that are included in this changeset (/browser/base/content/toolbar.xml)
-    //        don't implement currentSet. They probably need to inherit the toolkit bindings.
-    return;
-
     let document = this.document;
-    let toolbar = document.getElementById("nav-bar");
+    let toolbars = document.querySelectorAll("toolbar");
 
-    // Calculate currentset and store it in the attribute.
-    let currentSet = toolbar.currentSet;
-    toolbar.setAttribute("currentset", currentSet);
-
-    // Persist the currentset attribute directly on hardcoded toolbars.
-    document.persist(toolbar.id, "currentset");
+    for (let toolbar of toolbars) {
+      // Calculate currentset and store it in the attribute.
+      toolbar.setAttribute("currentset", toolbar.currentSet);
+      // Persist the currentset attribute directly on hardcoded toolbars.
+      document.persist(toolbar.id, "currentset");
+    }
   },
 
   reset: function() {
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index d508482a0d87..98d4b5d8f5bd 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"],                #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 conditionalForwardWithUrlbar       window:not([chromehidden~=toolbar]) :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],                #nav-bar:not([currentset]))                 > #nav-bar-customizationtarget > #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]) > #nav-bar-customizationtarget > #unified-back-forward-button
 %define conditionalForwardWithUrlbarWidth 32
 %define conditionalForwardWithUrlbarWidth_small 24
 
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 99b2166758ae..62bfec6850fd 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] > :-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])) > #nav-bar-customizationtarget > #unified-back-forward-button
 %define conditionalForwardWithUrlbarWidth 27
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index bdc819d2e005..3dc64b52e589 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -15,7 +15,7 @@
 %define navbarTextboxCustomBorder border-color: rgba(0,0,0,.32);
 %define navbarLargeIcons #navigator-toolbox[iconsize=large] > #nav-bar
 %define forwardTransitionLength 150ms
-%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 conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #nav-bar-customizationtarget > #unified-back-forward-button
 %define conditionalForwardWithUrlbarWidth 27
 
 %ifdef MOZ_OFFICIAL_BRANDING

From 22ed4a69e4d8594d0f9863ebb0829e05fa6640c4 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Thu, 25 Apr 2013 17:57:26 -0400
Subject: [PATCH 062/230] Bug 865728 - Center the tab-label on OSX. r=dao.

---
 browser/themes/osx/browser.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 49eccc3b56dd..3b504a1ef976 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -2183,6 +2183,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 
 .tab-label {
   margin: 0;
+  text-align: center;
 }
 
 .tab-throbber:not([pinned]),

From 04d8ef46fd9e772fdee48980e8cdd619426ba077 Mon Sep 17 00:00:00 2001
From: Blair McBride <bmcbride@mozilla.com>
Date: Mon, 29 Apr 2013 20:54:00 +1200
Subject: [PATCH 063/230] Backed out changeset 4b42aaccf679 (bug 864355) for
 breaking everything.

---
 browser/base/content/browser.js               |   3 +-
 browser/base/content/browser.xul              | 272 +++++++++---------
 .../customizableui/content/toolbar.xml        |  11 -
 .../customizableui/src/CustomizableUI.jsm     |   8 +-
 .../customizableui/src/CustomizeMode.jsm      |  20 +-
 browser/themes/linux/browser.css              |   4 +-
 browser/themes/osx/browser.css                |   2 +-
 browser/themes/windows/browser.css            |   2 +-
 8 files changed, 155 insertions(+), 167 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index df1d34168bf5..ff18c60c6b20 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -4061,7 +4061,8 @@ var CombinedStopReload = {
     var stop = document.getElementById("stop-button");
 
     if (urlbar) {
-      if (!reload || urlbar.nextSibling != reload ||
+      if (urlbar.parentNode.getAttribute("mode") != "icons" ||
+          !reload || urlbar.nextSibling != reload ||
           !stop || reload.nextSibling != stop)
         urlbar.removeAttribute("combined");
       else {
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 01abe7ad6fc0..b7afb1199fde 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -532,145 +532,145 @@
              customizationtarget="nav-bar-customizationtarget"
              context="toolbar-context-menu">
 
-      <hbox id="nav-bar-customizationtarget" class="customization-target" flex="0">
-        <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
-                     context="backForwardMenu" removable="true"
-                     forwarddisabled="true"
-                     title="&backForwardItem.title;">
-          <toolbarbutton id="back-button" class="toolbarbutton-1"
-                         label="&backCmd.label;"
-                         command="Browser:BackOrBackDuplicate"
-                         onclick="checkForMiddleClick(this, event);"
-                         tooltip="back-button-tooltip"/>
-          <toolbarbutton id="forward-button" class="toolbarbutton-1"
-                         label="&forwardCmd.label;"
-                         command="Browser:ForwardOrForwardDuplicate"
-                         onclick="checkForMiddleClick(this, event);"
-                         tooltip="forward-button-tooltip"/>
-          <dummyobservertarget hidden="true"
-                               onbroadcast="if (this.getAttribute('disabled') == 'true')
-                                              this.parentNode.setAttribute('forwarddisabled', 'true');
-                                            else
-                                              this.parentNode.removeAttribute('forwarddisabled');">
-            <observes element="Browser:ForwardOrForwardDuplicate" attribute="disabled"/>
-          </dummyobservertarget>
-        </toolbaritem>
-
-        <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true"
-                     title="&locationItem.title;" class="chromeclass-location" removable="true">
-          <textbox id="urlbar" flex="1"
-                   placeholder="&urlbar.placeholder2;"
-                   type="autocomplete"
-                   autocompletesearch="urlinline history"
-                   autocompletesearchparam="enable-actions"
-                   autocompletepopup="PopupAutoCompleteRichResult"
-                   completeselectedindex="true"
-                   tabscrolling="true"
-                   showcommentcolumn="true"
-                   showimagecolumn="true"
-                   enablehistory="true"
-                   maxrows="6"
-                   newlines="stripsurroundingwhitespace"
-                   oninput="gBrowser.userTypedValue = this.value;"
-                   ontextentered="this.handleCommand(param);"
-                   ontextreverted="return this.handleRevert();"
-                   pageproxystate="invalid"
-                   onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
-                   onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
-            <box id="notification-popup-box" hidden="true" align="center">
-              <image id="default-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
-            </box>
-            <!-- Use onclick instead of normal popup= syntax since the popup
-                 code fires onmousedown, and hence eats our favicon drag events.
-                 We only add the identity-box button to the tab order when the location bar
-                 has focus, otherwise pressing F6 focuses it instead of the location bar -->
-            <box id="identity-box" role="button"
-                 align="center"
-                 onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
-                 onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
-                 ondragstart="gIdentityHandler.onDragStart(event);">
-              <image id="page-proxy-favicon"
-                     onclick="PageProxyClickHandler(event);"
-                     pageproxystate="invalid"/>
-              <hbox id="identity-icon-labels">
-                <label id="identity-icon-label" class="plain" flex="1"/>
-                <label id="identity-icon-country-label" class="plain"/>
-              </hbox>
-            </box>
-            <box id="urlbar-display-box" align="center">
-              <label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
-            </box>
-            <hbox id="urlbar-icons">
-              <image id="page-report-button"
-                     class="urlbar-icon"
-                     hidden="true"
-                     tooltiptext="&pageReportIcon.tooltip;"
-                     onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
-
-              <label id="share-button-status" collapsed="true" role="status"/>
-              <image id="share-button"
-                     class="urlbar-icon"
-                     hidden="true"
-                     onclick="SocialShareButton.onClick(event);"/>
-
-              <image id="go-button"
-                     class="urlbar-icon"
-                     tooltiptext="&goEndCap.tooltip;"
-                     onclick="gURLBar.handleCommand(event);"/>
-            </hbox>
-            <toolbarbutton id="urlbar-go-button"
-                           class="chromeclass-toolbar-additional"
-                           onclick="gURLBar.handleCommand(event);"
-                           tooltiptext="&goEndCap.tooltip;"/>
-            <toolbarbutton id="urlbar-reload-button"
-                           class="chromeclass-toolbar-additional"
-                           command="Browser:ReloadOrDuplicate"
-                           onclick="checkForMiddleClick(this, event);"
-                           tooltiptext="&reloadButton.tooltip;"/>
-            <toolbarbutton id="urlbar-stop-button"
-                           class="chromeclass-toolbar-additional"
-                           command="Browser:Stop"
-                           tooltiptext="&stopButton.tooltip;"/>
-          </textbox>
-        </toolbaritem>
-
-        <toolbarbutton id="reload-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-                       label="&reloadCmd.label;" removable="true"
-                       command="Browser:ReloadOrDuplicate"
+      <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
+                   context="backForwardMenu" removable="true"
+                   forwarddisabled="true"
+                   title="&backForwardItem.title;">
+        <toolbarbutton id="back-button" class="toolbarbutton-1"
+                       label="&backCmd.label;"
+                       command="Browser:BackOrBackDuplicate"
                        onclick="checkForMiddleClick(this, event);"
-                       tooltiptext="&reloadButton.tooltip;"/>
+                       tooltip="back-button-tooltip"/>
+        <toolbarbutton id="forward-button" class="toolbarbutton-1"
+                       label="&forwardCmd.label;"
+                       command="Browser:ForwardOrForwardDuplicate"
+                       onclick="checkForMiddleClick(this, event);"
+                       tooltip="forward-button-tooltip"/>
+        <dummyobservertarget hidden="true"
+                             onbroadcast="if (this.getAttribute('disabled') == 'true')
+                                            this.parentNode.setAttribute('forwarddisabled', 'true');
+                                          else
+                                            this.parentNode.removeAttribute('forwarddisabled');">
+          <observes element="Browser:ForwardOrForwardDuplicate" attribute="disabled"/>
+        </dummyobservertarget>
+      </toolbaritem>
 
-        <toolbarbutton id="stop-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-                       label="&stopCmd.label;" removable="true"
-                       command="Browser:Stop"
-                       tooltiptext="&stopButton.tooltip;"/>
+      <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true"
+                   title="&locationItem.title;" class="chromeclass-location" removable="true">
+        <textbox id="urlbar" flex="1"
+                 placeholder="&urlbar.placeholder2;"
+                 type="autocomplete"
+                 autocompletesearch="urlinline history"
+                 autocompletesearchparam="enable-actions"
+                 autocompletepopup="PopupAutoCompleteRichResult"
+                 completeselectedindex="true"
+                 tabscrolling="true"
+                 showcommentcolumn="true"
+                 showimagecolumn="true"
+                 enablehistory="true"
+                 maxrows="6"
+                 newlines="stripsurroundingwhitespace"
+                 oninput="gBrowser.userTypedValue = this.value;"
+                 ontextentered="this.handleCommand(param);"
+                 ontextreverted="return this.handleRevert();"
+                 pageproxystate="invalid"
+                 onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
+                 onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
+          <box id="notification-popup-box" hidden="true" align="center">
+            <image id="default-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
+          </box>
+          <!-- Use onclick instead of normal popup= syntax since the popup
+               code fires onmousedown, and hence eats our favicon drag events.
+               We only add the identity-box button to the tab order when the location bar
+               has focus, otherwise pressing F6 focuses it instead of the location bar -->
+          <box id="identity-box" role="button"
+               align="center"
+               onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
+               onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
+               ondragstart="gIdentityHandler.onDragStart(event);">
+            <image id="page-proxy-favicon"
+                   onclick="PageProxyClickHandler(event);"
+                   pageproxystate="invalid"/>
+            <hbox id="identity-icon-labels">
+              <label id="identity-icon-label" class="plain" flex="1"/>
+              <label id="identity-icon-country-label" class="plain"/>
+            </hbox>
+          </box>
+          <box id="urlbar-display-box" align="center">
+            <label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
+          </box>
+          <hbox id="urlbar-icons">
+            <image id="page-report-button"
+                   class="urlbar-icon"
+                   hidden="true"
+                   tooltiptext="&pageReportIcon.tooltip;"
+                   onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
 
-        <toolbarbutton id="webrtc-status-button"
-                       class="toolbarbutton-1 chromeclass-toolbar-additional"
-                       type="menu"
-                       hidden="true"
-                       orient="horizontal"
-                       label="&webrtcIndicatorButton.label;"
-                       tooltiptext="&webrtcIndicatorButton.tooltip;">
-          <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);"
-                     onpopuphiding="WebrtcIndicator.clearPopup(this);"
-                     oncommand="WebrtcIndicator.menuCommand(event.target);"/>
-        </toolbarbutton>
-      </hbox>
+            <label id="share-button-status" collapsed="true" role="status"/>
+            <image id="share-button"
+                   class="urlbar-icon"
+                   hidden="true"
+                   onclick="SocialShareButton.onClick(event);"/>
+
+            <image id="go-button"
+                   class="urlbar-icon"
+                   tooltiptext="&goEndCap.tooltip;"
+                   onclick="gURLBar.handleCommand(event);"/>
+          </hbox>
+          <toolbarbutton id="urlbar-go-button"
+                         class="chromeclass-toolbar-additional"
+                         onclick="gURLBar.handleCommand(event);"
+                         tooltiptext="&goEndCap.tooltip;"/>
+          <toolbarbutton id="urlbar-reload-button"
+                         class="chromeclass-toolbar-additional"
+                         command="Browser:ReloadOrDuplicate"
+                         onclick="checkForMiddleClick(this, event);"
+                         tooltiptext="&reloadButton.tooltip;"/>
+          <toolbarbutton id="urlbar-stop-button"
+                         class="chromeclass-toolbar-additional"
+                         command="Browser:Stop"
+                         tooltiptext="&stopButton.tooltip;"/>
+        </textbox>
+      </toolbaritem>
+
+      <toolbarbutton id="reload-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+                     label="&reloadCmd.label;" removable="true"
+                     command="Browser:ReloadOrDuplicate"
+                     onclick="checkForMiddleClick(this, event);"
+                     tooltiptext="&reloadButton.tooltip;"/>
+
+      <toolbarbutton id="stop-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+                     label="&stopCmd.label;" removable="true"
+                     command="Browser:Stop"
+                     tooltiptext="&stopButton.tooltip;"/>
+
+      <hbox id="nav-bar-customizationtarget" class="customization-target" flex="100"/>
+
+      <toolbarbutton id="webrtc-status-button"
+                     class="toolbarbutton-1 chromeclass-toolbar-additional"
+                     type="menu"
+                     hidden="true"
+                     orient="horizontal"
+                     label="&webrtcIndicatorButton.label;"
+                     tooltiptext="&webrtcIndicatorButton.tooltip;">
+        <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);"
+                   onpopuphiding="WebrtcIndicator.clearPopup(this);"
+                   oncommand="WebrtcIndicator.menuCommand(event.target);"/>
+      </toolbarbutton>
 
       <toolbaritem id="PanelUI-button"
                    class="chromeclass-toolbar-additional"
diff --git a/browser/components/customizableui/content/toolbar.xml b/browser/components/customizableui/content/toolbar.xml
index 2dff3f69bf32..39fef596b140 100644
--- a/browser/components/customizableui/content/toolbar.xml
+++ b/browser/components/customizableui/content/toolbar.xml
@@ -98,17 +98,6 @@
           return this._toolbox;
         ]]></getter>
       </property>
-
-      <property name="currentSet" readonly="true">
-        <getter><![CDATA[
-          if (!this._customizationTarget)
-            return "";
-
-          return [node.id for (node of this._customizationTarget.children)].join(',');
-        ]]></getter>
-      </property>
-
-
     </implementation>
   </binding>
 
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 3119ddd95287..da5ce0f734d6 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -224,16 +224,11 @@ let gFuturePlacements = new Map();
  */
 let gDefaultPlacements = new Map([
   ["nav-bar", [
-    "unified-back-forward-button",
-    "urlbar-container",
-    "reload-button",
-    "stop-button",
     "search-container",
-    "webrtc-status-button",
     "bookmarks-menu-button-container",
     "downloads-button",
-    "home-button",
     "social-toolbar-button",
+    "PanelUI-button",
     "share-page"
   ]],
   ["PanelUI-contents", [
@@ -376,7 +371,6 @@ let CustomizableUIInternal = {
 
     let placements = gPlacements.get(area);
     this.buildArea(area, placements, aToolbar);
-    aToolbar.setAttribute("currentset", placements.join(","));
 
     // We register this window to have its customization data cleaned up when
     // unloading.
diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index 1578969949a9..d1ee9ccd54aa 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -375,15 +375,19 @@ CustomizeMode.prototype = {
   //           also want to (try) persisting with currentset as well to make it
   //           less painful to switch to older builds.
   persistCurrentSets: function()  {
-    let document = this.document;
-    let toolbars = document.querySelectorAll("toolbar");
+    //XXXjaws The toolbar bindings that are included in this changeset (/browser/base/content/toolbar.xml)
+    //        don't implement currentSet. They probably need to inherit the toolkit bindings.
+    return;
 
-    for (let toolbar of toolbars) {
-      // Calculate currentset and store it in the attribute.
-      toolbar.setAttribute("currentset", toolbar.currentSet);
-      // Persist the currentset attribute directly on hardcoded toolbars.
-      document.persist(toolbar.id, "currentset");
-    }
+    let document = this.document;
+    let toolbar = document.getElementById("nav-bar");
+
+    // Calculate currentset and store it in the attribute.
+    let currentSet = toolbar.currentSet;
+    toolbar.setAttribute("currentset", currentSet);
+
+    // Persist the currentset attribute directly on hardcoded toolbars.
+    document.persist(toolbar.id, "currentset");
   },
 
   reset: function() {
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 98d4b5d8f5bd..d508482a0d87 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"],                #nav-bar:not([currentset]))                 > #nav-bar-customizationtarget > #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]) > #nav-bar-customizationtarget > #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
 
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 62bfec6850fd..99b2166758ae 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] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #nav-bar-customizationtarget > #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");
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 3dc64b52e589..bdc819d2e005 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -15,7 +15,7 @@
 %define navbarTextboxCustomBorder border-color: rgba(0,0,0,.32);
 %define navbarLargeIcons #navigator-toolbox[iconsize=large] > #nav-bar
 %define forwardTransitionLength 150ms
-%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])) > #nav-bar-customizationtarget > #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

From a16bdfde22893697218a64591b66bc64e6d44ebb Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Tue, 30 Apr 2013 16:25:08 +1200
Subject: [PATCH 064/230] Bug 864355 - Extend customization target across
 (almost) the entire nav-bar. r=Unfocused,jaws

---
 browser/base/content/browser.js               |   3 +-
 browser/base/content/browser.xul              | 272 +++++++++---------
 .../customizableui/content/toolbar.xml        |  11 +
 .../customizableui/src/CustomizableUI.jsm     |  26 +-
 .../customizableui/src/CustomizeMode.jsm      |  18 +-
 browser/themes/linux/browser.css              |   4 +-
 browser/themes/osx/browser.css                |   2 +-
 browser/themes/windows/browser.css            |   2 +-
 8 files changed, 177 insertions(+), 161 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index ff18c60c6b20..df1d34168bf5 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -4061,8 +4061,7 @@ var CombinedStopReload = {
     var stop = document.getElementById("stop-button");
 
     if (urlbar) {
-      if (urlbar.parentNode.getAttribute("mode") != "icons" ||
-          !reload || urlbar.nextSibling != reload ||
+      if (!reload || urlbar.nextSibling != reload ||
           !stop || reload.nextSibling != stop)
         urlbar.removeAttribute("combined");
       else {
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index b7afb1199fde..01abe7ad6fc0 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -532,145 +532,145 @@
              customizationtarget="nav-bar-customizationtarget"
              context="toolbar-context-menu">
 
-      <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
-                   context="backForwardMenu" removable="true"
-                   forwarddisabled="true"
-                   title="&backForwardItem.title;">
-        <toolbarbutton id="back-button" class="toolbarbutton-1"
-                       label="&backCmd.label;"
-                       command="Browser:BackOrBackDuplicate"
-                       onclick="checkForMiddleClick(this, event);"
-                       tooltip="back-button-tooltip"/>
-        <toolbarbutton id="forward-button" class="toolbarbutton-1"
-                       label="&forwardCmd.label;"
-                       command="Browser:ForwardOrForwardDuplicate"
-                       onclick="checkForMiddleClick(this, event);"
-                       tooltip="forward-button-tooltip"/>
-        <dummyobservertarget hidden="true"
-                             onbroadcast="if (this.getAttribute('disabled') == 'true')
-                                            this.parentNode.setAttribute('forwarddisabled', 'true');
-                                          else
-                                            this.parentNode.removeAttribute('forwarddisabled');">
-          <observes element="Browser:ForwardOrForwardDuplicate" attribute="disabled"/>
-        </dummyobservertarget>
-      </toolbaritem>
-
-      <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true"
-                   title="&locationItem.title;" class="chromeclass-location" removable="true">
-        <textbox id="urlbar" flex="1"
-                 placeholder="&urlbar.placeholder2;"
-                 type="autocomplete"
-                 autocompletesearch="urlinline history"
-                 autocompletesearchparam="enable-actions"
-                 autocompletepopup="PopupAutoCompleteRichResult"
-                 completeselectedindex="true"
-                 tabscrolling="true"
-                 showcommentcolumn="true"
-                 showimagecolumn="true"
-                 enablehistory="true"
-                 maxrows="6"
-                 newlines="stripsurroundingwhitespace"
-                 oninput="gBrowser.userTypedValue = this.value;"
-                 ontextentered="this.handleCommand(param);"
-                 ontextreverted="return this.handleRevert();"
-                 pageproxystate="invalid"
-                 onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
-                 onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
-          <box id="notification-popup-box" hidden="true" align="center">
-            <image id="default-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
-          </box>
-          <!-- Use onclick instead of normal popup= syntax since the popup
-               code fires onmousedown, and hence eats our favicon drag events.
-               We only add the identity-box button to the tab order when the location bar
-               has focus, otherwise pressing F6 focuses it instead of the location bar -->
-          <box id="identity-box" role="button"
-               align="center"
-               onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
-               onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
-               ondragstart="gIdentityHandler.onDragStart(event);">
-            <image id="page-proxy-favicon"
-                   onclick="PageProxyClickHandler(event);"
-                   pageproxystate="invalid"/>
-            <hbox id="identity-icon-labels">
-              <label id="identity-icon-label" class="plain" flex="1"/>
-              <label id="identity-icon-country-label" class="plain"/>
-            </hbox>
-          </box>
-          <box id="urlbar-display-box" align="center">
-            <label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
-          </box>
-          <hbox id="urlbar-icons">
-            <image id="page-report-button"
-                   class="urlbar-icon"
-                   hidden="true"
-                   tooltiptext="&pageReportIcon.tooltip;"
-                   onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
-
-            <label id="share-button-status" collapsed="true" role="status"/>
-            <image id="share-button"
-                   class="urlbar-icon"
-                   hidden="true"
-                   onclick="SocialShareButton.onClick(event);"/>
-
-            <image id="go-button"
-                   class="urlbar-icon"
-                   tooltiptext="&goEndCap.tooltip;"
-                   onclick="gURLBar.handleCommand(event);"/>
-          </hbox>
-          <toolbarbutton id="urlbar-go-button"
-                         class="chromeclass-toolbar-additional"
-                         onclick="gURLBar.handleCommand(event);"
-                         tooltiptext="&goEndCap.tooltip;"/>
-          <toolbarbutton id="urlbar-reload-button"
-                         class="chromeclass-toolbar-additional"
-                         command="Browser:ReloadOrDuplicate"
+      <hbox id="nav-bar-customizationtarget" class="customization-target" flex="0">
+        <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
+                     context="backForwardMenu" removable="true"
+                     forwarddisabled="true"
+                     title="&backForwardItem.title;">
+          <toolbarbutton id="back-button" class="toolbarbutton-1"
+                         label="&backCmd.label;"
+                         command="Browser:BackOrBackDuplicate"
                          onclick="checkForMiddleClick(this, event);"
-                         tooltiptext="&reloadButton.tooltip;"/>
-          <toolbarbutton id="urlbar-stop-button"
-                         class="chromeclass-toolbar-additional"
-                         command="Browser:Stop"
-                         tooltiptext="&stopButton.tooltip;"/>
-        </textbox>
-      </toolbaritem>
+                         tooltip="back-button-tooltip"/>
+          <toolbarbutton id="forward-button" class="toolbarbutton-1"
+                         label="&forwardCmd.label;"
+                         command="Browser:ForwardOrForwardDuplicate"
+                         onclick="checkForMiddleClick(this, event);"
+                         tooltip="forward-button-tooltip"/>
+          <dummyobservertarget hidden="true"
+                               onbroadcast="if (this.getAttribute('disabled') == 'true')
+                                              this.parentNode.setAttribute('forwarddisabled', 'true');
+                                            else
+                                              this.parentNode.removeAttribute('forwarddisabled');">
+            <observes element="Browser:ForwardOrForwardDuplicate" attribute="disabled"/>
+          </dummyobservertarget>
+        </toolbaritem>
 
-      <toolbarbutton id="reload-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-                     label="&reloadCmd.label;" removable="true"
-                     command="Browser:ReloadOrDuplicate"
-                     onclick="checkForMiddleClick(this, event);"
-                     tooltiptext="&reloadButton.tooltip;"/>
-
-      <toolbarbutton id="stop-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-                     label="&stopCmd.label;" removable="true"
-                     command="Browser:Stop"
-                     tooltiptext="&stopButton.tooltip;"/>
-
-      <hbox id="nav-bar-customizationtarget" class="customization-target" flex="100"/>
-
-      <toolbarbutton id="webrtc-status-button"
-                     class="toolbarbutton-1 chromeclass-toolbar-additional"
-                     type="menu"
+        <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true"
+                     title="&locationItem.title;" class="chromeclass-location" removable="true">
+          <textbox id="urlbar" flex="1"
+                   placeholder="&urlbar.placeholder2;"
+                   type="autocomplete"
+                   autocompletesearch="urlinline history"
+                   autocompletesearchparam="enable-actions"
+                   autocompletepopup="PopupAutoCompleteRichResult"
+                   completeselectedindex="true"
+                   tabscrolling="true"
+                   showcommentcolumn="true"
+                   showimagecolumn="true"
+                   enablehistory="true"
+                   maxrows="6"
+                   newlines="stripsurroundingwhitespace"
+                   oninput="gBrowser.userTypedValue = this.value;"
+                   ontextentered="this.handleCommand(param);"
+                   ontextreverted="return this.handleRevert();"
+                   pageproxystate="invalid"
+                   onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
+                   onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
+            <box id="notification-popup-box" hidden="true" align="center">
+              <image id="default-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
+            </box>
+            <!-- Use onclick instead of normal popup= syntax since the popup
+                 code fires onmousedown, and hence eats our favicon drag events.
+                 We only add the identity-box button to the tab order when the location bar
+                 has focus, otherwise pressing F6 focuses it instead of the location bar -->
+            <box id="identity-box" role="button"
+                 align="center"
+                 onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
+                 onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
+                 ondragstart="gIdentityHandler.onDragStart(event);">
+              <image id="page-proxy-favicon"
+                     onclick="PageProxyClickHandler(event);"
+                     pageproxystate="invalid"/>
+              <hbox id="identity-icon-labels">
+                <label id="identity-icon-label" class="plain" flex="1"/>
+                <label id="identity-icon-country-label" class="plain"/>
+              </hbox>
+            </box>
+            <box id="urlbar-display-box" align="center">
+              <label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
+            </box>
+            <hbox id="urlbar-icons">
+              <image id="page-report-button"
+                     class="urlbar-icon"
                      hidden="true"
-                     orient="horizontal"
-                     label="&webrtcIndicatorButton.label;"
-                     tooltiptext="&webrtcIndicatorButton.tooltip;">
-        <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);"
-                   onpopuphiding="WebrtcIndicator.clearPopup(this);"
-                   oncommand="WebrtcIndicator.menuCommand(event.target);"/>
-      </toolbarbutton>
+                     tooltiptext="&pageReportIcon.tooltip;"
+                     onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
+
+              <label id="share-button-status" collapsed="true" role="status"/>
+              <image id="share-button"
+                     class="urlbar-icon"
+                     hidden="true"
+                     onclick="SocialShareButton.onClick(event);"/>
+
+              <image id="go-button"
+                     class="urlbar-icon"
+                     tooltiptext="&goEndCap.tooltip;"
+                     onclick="gURLBar.handleCommand(event);"/>
+            </hbox>
+            <toolbarbutton id="urlbar-go-button"
+                           class="chromeclass-toolbar-additional"
+                           onclick="gURLBar.handleCommand(event);"
+                           tooltiptext="&goEndCap.tooltip;"/>
+            <toolbarbutton id="urlbar-reload-button"
+                           class="chromeclass-toolbar-additional"
+                           command="Browser:ReloadOrDuplicate"
+                           onclick="checkForMiddleClick(this, event);"
+                           tooltiptext="&reloadButton.tooltip;"/>
+            <toolbarbutton id="urlbar-stop-button"
+                           class="chromeclass-toolbar-additional"
+                           command="Browser:Stop"
+                           tooltiptext="&stopButton.tooltip;"/>
+          </textbox>
+        </toolbaritem>
+
+        <toolbarbutton id="reload-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+                       label="&reloadCmd.label;" removable="true"
+                       command="Browser:ReloadOrDuplicate"
+                       onclick="checkForMiddleClick(this, event);"
+                       tooltiptext="&reloadButton.tooltip;"/>
+
+        <toolbarbutton id="stop-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+                       label="&stopCmd.label;" removable="true"
+                       command="Browser:Stop"
+                       tooltiptext="&stopButton.tooltip;"/>
+
+        <toolbarbutton id="webrtc-status-button"
+                       class="toolbarbutton-1 chromeclass-toolbar-additional"
+                       type="menu"
+                       hidden="true"
+                       orient="horizontal"
+                       label="&webrtcIndicatorButton.label;"
+                       tooltiptext="&webrtcIndicatorButton.tooltip;">
+          <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);"
+                     onpopuphiding="WebrtcIndicator.clearPopup(this);"
+                     oncommand="WebrtcIndicator.menuCommand(event.target);"/>
+        </toolbarbutton>
+      </hbox>
 
       <toolbaritem id="PanelUI-button"
                    class="chromeclass-toolbar-additional"
diff --git a/browser/components/customizableui/content/toolbar.xml b/browser/components/customizableui/content/toolbar.xml
index 39fef596b140..2dff3f69bf32 100644
--- a/browser/components/customizableui/content/toolbar.xml
+++ b/browser/components/customizableui/content/toolbar.xml
@@ -98,6 +98,17 @@
           return this._toolbox;
         ]]></getter>
       </property>
+
+      <property name="currentSet" readonly="true">
+        <getter><![CDATA[
+          if (!this._customizationTarget)
+            return "";
+
+          return [node.id for (node of this._customizationTarget.children)].join(',');
+        ]]></getter>
+      </property>
+
+
     </implementation>
   </binding>
 
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index da5ce0f734d6..e078f08bd64e 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -224,11 +224,16 @@ let gFuturePlacements = new Map();
  */
 let gDefaultPlacements = new Map([
   ["nav-bar", [
+    "unified-back-forward-button",
+    "urlbar-container",
+    "reload-button",
+    "stop-button",
     "search-container",
+    "webrtc-status-button",
     "bookmarks-menu-button-container",
     "downloads-button",
+    "home-button",
     "social-toolbar-button",
-    "PanelUI-button",
     "share-page"
   ]],
   ["PanelUI-contents", [
@@ -371,6 +376,7 @@ let CustomizableUIInternal = {
 
     let placements = gPlacements.get(area);
     this.buildArea(area, placements, aToolbar);
+    aToolbar.setAttribute("currentset", placements.join(","));
 
     // We register this window to have its customization data cleaned up when
     // unloading.
@@ -413,14 +419,18 @@ let CustomizableUIInternal = {
       let limit = currentNode.previousSibling;
       let node = container.lastChild;
       while (node != limit) {
-        // XXXunf Deprecating the old "removable" attribute, is this right?
-        // XXXmconley I think we need to hear from UX about this.
-        if (palette) {
-          palette.appendChild(node);
-        } else {
-          container.removeChild(node);
+        // Nodes opt-in to removability. If they're removable, and we haven't
+        // seen them in the placements array, then we toss them into the palette
+        // if one exists. If no palette exists, we just remove the node. If the
+        // node is not removable, we leave it where it is.
+        if (node.getAttribute("removable") == "true") {
+          if (palette) {
+            palette.appendChild(node);
+          } else {
+            container.removeChild(node);
+          }
         }
-        node = container.lastChild;
+        node = node.previousSibling;
       }
     }
   },
diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index d1ee9ccd54aa..1578969949a9 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -375,19 +375,15 @@ CustomizeMode.prototype = {
   //           also want to (try) persisting with currentset as well to make it
   //           less painful to switch to older builds.
   persistCurrentSets: function()  {
-    //XXXjaws The toolbar bindings that are included in this changeset (/browser/base/content/toolbar.xml)
-    //        don't implement currentSet. They probably need to inherit the toolkit bindings.
-    return;
-
     let document = this.document;
-    let toolbar = document.getElementById("nav-bar");
+    let toolbars = document.querySelectorAll("toolbar");
 
-    // Calculate currentset and store it in the attribute.
-    let currentSet = toolbar.currentSet;
-    toolbar.setAttribute("currentset", currentSet);
-
-    // Persist the currentset attribute directly on hardcoded toolbars.
-    document.persist(toolbar.id, "currentset");
+    for (let toolbar of toolbars) {
+      // Calculate currentset and store it in the attribute.
+      toolbar.setAttribute("currentset", toolbar.currentSet);
+      // Persist the currentset attribute directly on hardcoded toolbars.
+      document.persist(toolbar.id, "currentset");
+    }
   },
 
   reset: function() {
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index d508482a0d87..98d4b5d8f5bd 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"],                #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 conditionalForwardWithUrlbar       window:not([chromehidden~=toolbar]) :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],                #nav-bar:not([currentset]))                 > #nav-bar-customizationtarget > #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]) > #nav-bar-customizationtarget > #unified-back-forward-button
 %define conditionalForwardWithUrlbarWidth 32
 %define conditionalForwardWithUrlbarWidth_small 24
 
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 99b2166758ae..62bfec6850fd 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] > :-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])) > #nav-bar-customizationtarget > #unified-back-forward-button
 %define conditionalForwardWithUrlbarWidth 27
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index bdc819d2e005..3dc64b52e589 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -15,7 +15,7 @@
 %define navbarTextboxCustomBorder border-color: rgba(0,0,0,.32);
 %define navbarLargeIcons #navigator-toolbox[iconsize=large] > #nav-bar
 %define forwardTransitionLength 150ms
-%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 conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #nav-bar-customizationtarget > #unified-back-forward-button
 %define conditionalForwardWithUrlbarWidth 27
 
 %ifdef MOZ_OFFICIAL_BRANDING

From 514ae51d6cfd8a7453fd6201e75abad584b282db Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Tue, 30 Apr 2013 11:00:41 -0400
Subject: [PATCH 065/230] Bug 864425 - Make toolbar-menubar, TabsToolbar and
 PersonalToolbar customization targets. r=Unfocused.

---
 browser/base/content/browser.css              |   6 +-
 browser/base/content/browser.xul              |   1 -
 .../components/customizableui/content/jar.mn  |   1 -
 .../customizableui/content/toolbar.xml        | 120 +++++++++++++++++-
 .../customizableui/src/CustomizableUI.jsm     |  38 ++++--
 .../customizableui/src/CustomizeMode.jsm      |  48 +++++--
 browser/themes/windows/browser-aero.css       |   2 +-
 7 files changed, 185 insertions(+), 31 deletions(-)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 2a04a2ac0c5d..8a9bd968d64d 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -9,10 +9,14 @@ searchbar {
   -moz-binding: url("chrome://browser/content/search/search.xml#searchbar");
 }
 
-#nav-bar {
+toolbar[customizable="true"] {
   -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar");
 }
 
+#toolbar-menubar[autohide="true"] {
+  -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-menubar-autohide");
+}
+
 tabbrowser {
   -moz-binding: url("chrome://browser/content/tabbrowser.xml#tabbrowser");
 }
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 01abe7ad6fc0..a47dff557ac7 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1186,7 +1186,6 @@
              mode="icons" iconsize="small" defaulticonsize="small"
              lockiconsize="true"
              defaultset="addonbar-closebutton,spring,status-bar"
-             customizable="true"
              key="key_toggleAddonBar">
       <toolbarbutton id="addonbar-closebutton"
                      tooltiptext="&addonBarCloseButton.tooltip;"
diff --git a/browser/components/customizableui/content/jar.mn b/browser/components/customizableui/content/jar.mn
index e2b78b4b66be..73664afe9e8f 100644
--- a/browser/components/customizableui/content/jar.mn
+++ b/browser/components/customizableui/content/jar.mn
@@ -10,7 +10,6 @@ browser.jar:
   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
diff --git a/browser/components/customizableui/content/toolbar.xml b/browser/components/customizableui/content/toolbar.xml
index 2dff3f69bf32..67f1997dc91d 100644
--- a/browser/components/customizableui/content/toolbar.xml
+++ b/browser/components/customizableui/content/toolbar.xml
@@ -66,7 +66,7 @@
           let id = this.getAttribute("customizationtarget");
           if (id)
             this._customizationTarget = document.getElementById(id);
-          
+
           if (!this._customizationTarget)
             this._customizationTarget = this;
 
@@ -112,4 +112,122 @@
     </implementation>
   </binding>
 
+  <!-- The toolbar-menubar-autohide and toolbar-drag bindings are almost
+       verbatim copies of their toolkit counterparts - they just inherit from
+       the customizableui's toolbar binding instead of toolkit's. We're currently
+       OK with the maintainance burden of having two copies of a binding, since
+       the long term goal is to move the customization framework into toolkit. -->
+
+  <binding id="toolbar-menubar-autohide"
+           extends="chrome://browser/content/customizableui/toolbar.xml#toolbar">
+    <implementation>
+      <constructor>
+        this._setInactive();
+      </constructor>
+
+      <field name="_inactiveTimeout">null</field>
+
+      <field name="_contextMenuListener"><![CDATA[({
+        toolbar: this,
+        contextMenu: null,
+
+        get active () !!this.contextMenu,
+
+        init: function (event) {
+          let node = event.target;
+          while (node != this.toolbar) {
+            if (node.localName == "menupopup")
+              return;
+            node = node.parentNode;
+          }
+
+          let contextMenuId = this.toolbar.getAttribute("context");
+          if (!contextMenuId)
+            return;
+
+          this.contextMenu = document.getElementById(contextMenuId);
+          if (!this.contextMenu)
+            return;
+
+          this.contextMenu.addEventListener("popupshown", this, false);
+          this.contextMenu.addEventListener("popuphiding", this, false);
+          this.toolbar.addEventListener("mousemove", this, false);
+        },
+        handleEvent: function (event) {
+          switch (event.type) {
+            case "popupshown":
+              this.toolbar.removeEventListener("mousemove", this, false);
+              break;
+            case "popuphiding":
+            case "mousemove":
+              this.toolbar._setInactiveAsync();
+              this.toolbar.removeEventListener("mousemove", this, false);
+              this.contextMenu.removeEventListener("popuphiding", this, false);
+              this.contextMenu.removeEventListener("popupshown", this, false);
+              this.contextMenu = null;
+              break;
+          }
+        }
+      })]]></field>
+
+      <method name="_setInactive">
+        <body><![CDATA[
+          this.setAttribute("inactive", "true");
+        ]]></body>
+      </method>
+
+      <method name="_setInactiveAsync">
+        <body><![CDATA[
+          this._inactiveTimeout = setTimeout(function (self) {
+            if (self.getAttribute("autohide") == "true") {
+              self._inactiveTimeout = null;
+              self._setInactive();
+            }
+          }, 0, this);
+        ]]></body>
+      </method>
+
+      <method name="_setActive">
+        <body><![CDATA[
+          if (this._inactiveTimeout) {
+            clearTimeout(this._inactiveTimeout);
+            this._inactiveTimeout = null;
+          }
+          this.removeAttribute("inactive");
+        ]]></body>
+      </method>
+    </implementation>
+
+    <handlers>
+      <handler event="DOMMenuBarActive"     action="this._setActive();"/>
+      <handler event="popupshowing"         action="this._setActive();"/>
+      <handler event="mousedown" button="2" action="this._contextMenuListener.init(event);"/>
+      <handler event="DOMMenuBarInactive"><![CDATA[
+        if (!this._contextMenuListener.active)
+          this._setInactiveAsync();
+      ]]></handler>
+    </handlers>
+  </binding>
+
+  <binding id="toolbar-drag"
+           extends="chrome://browser/content/customizableui/toolbar.xml#toolbar">
+    <implementation>
+      <field name="_dragBindingAlive">true</field>
+      <constructor><![CDATA[
+        if (!this._draggableStarted) {
+          this._draggableStarted = true;
+          try {
+            let tmp = {};
+            Components.utils.import("resource://gre/modules/WindowDraggingUtils.jsm", tmp);
+            let draggableThis = new tmp.WindowDraggingElement(this);
+            draggableThis.mouseDownCheck = function(e) {
+              // Don't move while customizing.
+              return this._dragBindingAlive &&
+                     this.getAttribute("customizing") != "true";
+            };
+          } catch (e) {}
+        }
+      ]]></constructor>
+    </implementation>
+  </binding>
 </bindings>
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index e078f08bd64e..de9902497b42 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -223,6 +223,15 @@ let gFuturePlacements = new Map();
  * placements to use.
  */
 let gDefaultPlacements = new Map([
+  ["toolbar-menubar", [
+    "menubar-items",
+  ]],
+  ["TabsToolbar", [
+    "tabbrowser-tabs",
+    "new-tab-button",
+    "alltabs-button",
+    "tabs-closebutton"
+  ]],
   ["nav-bar", [
     "unified-back-forward-button",
     "urlbar-container",
@@ -236,6 +245,9 @@ let gDefaultPlacements = new Map([
     "social-toolbar-button",
     "share-page"
   ]],
+  ["PersonalToolbar", [
+    "personal-bookmarks",
+  ]],
   ["PanelUI-contents", [
     "new-window-button",
     "print-button",
@@ -294,6 +306,9 @@ let CustomizableUIInternal = {
 
     this.registerArea(CustomizableUI.AREA_PANEL);
     this.registerArea(CustomizableUI.AREA_NAVBAR, ["legacy"]);
+    this.registerArea(CustomizableUI.AREA_MENUBAR, ["legacy"]);
+    this.registerArea(CustomizableUI.AREA_TABSTRIP, ["legacy"]);
+    this.registerArea(CustomizableUI.AREA_BOOKMARKS, ["legacy"]);
   },
 
   _defineBuiltInWidgets: function() {
@@ -347,7 +362,7 @@ let CustomizableUIInternal = {
     let area = aToolbar.id;
 
     if (!gAreas.has(area)) {
-      throw new Error("Unknown customization area");
+      throw new Error("Unknown customization area: " + area);
     }
 
     if (this.isBuildAreaRegistered(area, aToolbar)) {
@@ -361,12 +376,6 @@ let CustomizableUIInternal = {
       if (legacyState) {
         legacyState = legacyState.split(",");
       }
-      //XXXunf should the legacy attribute be purged?
-      //       kinda messes up switching to older builds
-      //XXXmconley No, I don't think so - I think we want to make it easy to
-      //           switch back and forth between builds until this thing hits
-      //           release.
-      //aToolbar.removeAttribute("currentset");
 
       // Manually restore the state here, so the legacy state can be converted. 
       this.restoreStateForArea(area, legacyState);
@@ -378,8 +387,8 @@ let CustomizableUIInternal = {
     this.buildArea(area, placements, aToolbar);
     aToolbar.setAttribute("currentset", placements.join(","));
 
-    // We register this window to have its customization data cleaned up when
-    // unloading.
+    // We ensure that the window is registered to have its customization data
+    // cleaned up when unloading.
     this.registerBuildWindow(document.defaultView);
   },
 
@@ -395,6 +404,7 @@ let CustomizableUIInternal = {
     let currentNode = container.firstChild;
     for (let id of aPlacements) {
       if (currentNode && currentNode.id == id) {
+        this._addParentFlex(currentNode);
         currentNode = currentNode.nextSibling;
         continue;
       }
@@ -483,6 +493,7 @@ let CustomizableUIInternal = {
                this.buildWidget(aDocument, null, widget) ];
     }
 
+    LOG("Searching for " + aWidgetId + " in toolbox.");
     let node = this.findWidgetInToolbox(aWidgetId, aToolbox, aDocument);
     if (node) {
       return [ CustomizableUI.PROVIDER_XUL, node ];
@@ -815,7 +826,7 @@ let CustomizableUIInternal = {
     LOG("Iterating the actual nodes of the window palette");
     for (let node of aWindowPalette.children) {
       LOG("In palette children: " + node.id);
-      if (!this.getPlacementOfWidget(node.id)) {
+      if (node.id && !this.getPlacementOfWidget(node.id)) {
         widgets.add(node.id);
       }
     }
@@ -838,7 +849,7 @@ let CustomizableUIInternal = {
 
   addWidgetToArea: function(aWidgetId, aArea, aPosition) {
     if (!gAreas.has(aArea)) {
-      throw new Error("Unknown customization area");
+      throw new Error("Unknown customization area: " + aArea);
     }
 
     // If this is a lazy area that hasn't been restored yet, we can't yet modify
@@ -1465,6 +1476,9 @@ Object.freeze(CustomizableUIInternal);
 this.CustomizableUI = {
   get AREA_PANEL() "PanelUI-contents",
   get AREA_NAVBAR() "nav-bar",
+  get AREA_MENUBAR() "toolbar-menubar",
+  get AREA_TABSTRIP() "TabsToolbar",
+  get AREA_BOOKMARKS() "PersonalToolbar",
 
   get PROVIDER_XUL() "xul",
   get PROVIDER_API() "api",
@@ -1525,7 +1539,7 @@ this.CustomizableUI = {
   },
   getWidgetsInArea: function(aArea) {
     if (!gAreas.has(aArea)) {
-      throw new Error("Unknown customization area");
+      throw new Error("Unknown customization area: " + aArea);
     }
     if (!gPlacements.has(aArea)) {
       throw new Error("Area not yet restored");
diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index 1578969949a9..32981b1c755e 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -12,6 +12,9 @@ const kPrefCustomizationDebug = "browser.uiCustomization.debug";
 const kPaletteId = "customization-palette";
 const kAboutURI = "about:customizing";
 
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource:///modules/CustomizableUI.jsm");
+
 let gDebug = false;
 try {
   gDebug = Services.prefs.getBoolPref(kPrefCustomizationDebug);
@@ -19,15 +22,12 @@ try {
 
 function LOG(str) {
   if (gDebug) {
-    Services.console.logStringMessage(str);
+    Services.console.logStringMessage("[CustomizeMode] " + str);
   }
 }
 
 function ERROR(aMsg) Cu.reportError("[CustomizeMode] " + aMsg);
 
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource:///modules/CustomizableUI.jsm");
-
 function CustomizeMode(aWindow) {
   this.window = aWindow;
   this.document = aWindow.document;
@@ -68,6 +68,10 @@ CustomizeMode.prototype = {
   },
 
   enter: function() {
+    if (this._customizing) {
+      return;
+    }
+
     let window = this.window;
     let document = this.document;
 
@@ -124,7 +128,9 @@ CustomizeMode.prototype = {
         target.addEventListener("dragexit", self);
         target.addEventListener("drop", self);
         for (let child of target.children) {
-          self.wrapToolbarItem(child, getPlaceForItem(child));
+          if (self.isCustomizableItem(child)) {
+            self.wrapToolbarItem(child, getPlaceForItem(child));
+          }
         }
         self.areas.push(target);
       }
@@ -142,6 +148,10 @@ CustomizeMode.prototype = {
   },
 
   exit: function() {
+    if (!this._customizing) {
+      return;
+    }
+
     CustomizableUI.removeListener(this);
 
     let deck = this.document.getElementById("tab-view-deck");
@@ -172,7 +182,9 @@ CustomizeMode.prototype = {
 
     for (let target of this.areas) {
       for (let toolbarItem of target.children) {
-        this.unwrapToolbarItem(toolbarItem);
+        if (this.isWrappedToolbarItem(toolbarItem)) {
+          this.unwrapToolbarItem(toolbarItem);
+        }
       }
       target.removeEventListener("dragstart", this);
       target.removeEventListener("dragover", this);
@@ -280,6 +292,18 @@ CustomizeMode.prototype = {
     this.window.gNavToolbox.palette = this._stowedPalette;
   },
 
+  isCustomizableItem: function(aNode) {
+    return aNode.localName == "toolbarbutton" ||
+           aNode.localName == "toolbaritem" ||
+           aNode.localName == "toolbarseparator" ||
+           aNode.localName == "toolbarspring" ||
+           aNode.localName == "toolbarspacer";
+  },
+
+  isWrappedToolbarItem: function(aNode) {
+    return aNode.localName == "toolbarpaletteitem";
+  },
+
   wrapToolbarItem: function(aNode, aPlace) {
     let wrapper = this.createWrapper(aNode, aPlace);
     // It's possible that this toolbar node is "mid-flight" and doesn't have
@@ -370,17 +394,13 @@ CustomizeMode.prototype = {
     return toolbarItem;
   },
 
-  //XXXjaws This doesn't handle custom toolbars.
-  //XXXmconley While CustomizableUI.jsm uses prefs to preserve state, we might
-  //           also want to (try) persisting with currentset as well to make it
-  //           less painful to switch to older builds.
   persistCurrentSets: function()  {
     let document = this.document;
-    let toolbars = document.querySelectorAll("toolbar");
-
+    let toolbars = document.querySelectorAll("toolbar[customizable='true']");
     for (let toolbar of toolbars) {
-      // Calculate currentset and store it in the attribute.
-      toolbar.setAttribute("currentset", toolbar.currentSet);
+      let set = toolbar.currentSet;
+      toolbar.setAttribute("currentset", set);
+      LOG("Setting currentset of " + toolbar.id + " as " + set);
       // Persist the currentset attribute directly on hardcoded toolbars.
       document.persist(toolbar.id, "currentset");
     }
diff --git a/browser/themes/windows/browser-aero.css b/browser/themes/windows/browser-aero.css
index defe92dc86cb..8c1b490fce10 100644
--- a/browser/themes/windows/browser-aero.css
+++ b/browser/themes/windows/browser-aero.css
@@ -257,7 +257,7 @@
   #nav-bar[tabsontop=false],
   #nav-bar + #customToolbars + #PersonalToolbar[collapsed="true"] + #TabsToolbar[tabsontop="false"]:last-child,
   #navigator-toolbox > toolbar:not(#toolbar-menubar):-moz-lwtheme {
-    -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-drag");
+    -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-drag");
   }
 
   #appcontent:not(:-moz-lwtheme) {

From 067e00e4ab282c6c155e5ab4298476111bf4c94c Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Tue, 30 Apr 2013 17:20:00 -0400
Subject: [PATCH 066/230] Bug 861088 - Show the History subview as an arrow
 panel when the History widget is in the toolbar. r=mconley

---
 .../customizableui/content/panelUI.js         | 91 ++++++++++++-------
 .../customizableui/src/CustomizableUI.jsm     |  5 +-
 .../customizableui/panelUIOverlay.inc.css     | 16 +++-
 3 files changed, 74 insertions(+), 38 deletions(-)

diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
index 7558637459f1..a04bc6fcc83f 100644
--- a/browser/components/customizableui/content/panelUI.js
+++ b/browser/components/customizableui/content/panelUI.js
@@ -176,8 +176,10 @@ const PanelUI = {
    * Shows a subview in the panel with a given ID.
    *
    * @param aViewId the ID of the subview to show.
+   * @param aAnchor the element that spawned the subview.
+   * @param aPlacementArea the CustomizableUI area that aAnchor is in.
    */
-  showSubView: function(aViewId, aAnchor) {
+  showSubView: function(aViewId, aAnchor, aPlacementArea) {
     let viewNode = document.getElementById(aViewId);
     if (!viewNode) {
       Cu.reportError("Could not show panel subview with id: " + aViewId);
@@ -189,39 +191,66 @@ const PanelUI = {
       return;
     }
 
-    let oldHeight = this.mainView.clientHeight;
-    viewNode.setAttribute("current", true);
-    this._currentSubView = viewNode;
+    if (aPlacementArea == CustomizableUI.AREA_PANEL) {
+      // The subview can get moved if the widget is not in the
+      // panel. For robustness, check that the subview is in the
+      // right place and move it if necessary.
+      if (viewNode.parentElement != this.subViews) {
+        this.subViews.appendChild(viewNode);
+      }
 
-    // Emit the ViewShowing event so that the widget definition has a chance
-    // to lazily populate the subview with things.
-    let evt = document.createEvent("CustomEvent");
-    evt.initCustomEvent("ViewShowing", true, true, viewNode);
-    viewNode.dispatchEvent(evt);
+      let oldHeight = this.mainView.clientHeight;
+      viewNode.setAttribute("current", true);
+      this._currentSubView = viewNode;
 
-    this.viewStack.setAttribute("view", "subview");
-    this.mainViewSpring.style.height = this.subViews.scrollHeight - oldHeight + "px";
-    this.container.style.height = this.subViews.scrollHeight + "px";
+      // Emit the ViewShowing event so that the widget definition has a chance
+      // to lazily populate the subview with things.
+      let evt = document.createEvent("CustomEvent");
+      evt.initCustomEvent("ViewShowing", true, true, viewNode);
+      viewNode.dispatchEvent(evt);
 
-    // Now we have to transition to transition the panel. There are a few parts
-    // to this:
-    //
-    // 1) The main view content gets shifted so that the center of the anchor
-    //    node is at the left-most edge of the panel.
-    // 2) The subview deck slides in so that it takes up almost all of the
-    //    panel.
-    // 3) If the subview is taller then the main panel contents, then the panel
-    //    must grow to meet that new height. Otherwise, it must shrink.
-    //
-    // All three of these actions make use of CSS transformations, so they
-    // should all occur simultaneously.
-    this._shiftMainView(aAnchor);
-    this._subViewObserver.observe(viewNode, {
-      attributes: true,
-      characterData: true,
-      childList: true,
-      subtree: true
-    });
+      this.viewStack.setAttribute("view", "subview");
+      this.mainViewSpring.style.height = this.subViews.scrollHeight - oldHeight + "px";
+      this.container.style.height = this.subViews.scrollHeight + "px";
+
+      // Now we have to transition to transition the panel. There are a few parts
+      // to this:
+      //
+      // 1) The main view content gets shifted so that the center of the anchor
+      //    node is at the left-most edge of the panel.
+      // 2) The subview deck slides in so that it takes up almost all of the
+      //    panel.
+      // 3) If the subview is taller then the main panel contents, then the panel
+      //    must grow to meet that new height. Otherwise, it must shrink.
+      //
+      // All three of these actions make use of CSS transformations, so they
+      // should all occur simultaneously.
+      this._shiftMainView(aAnchor);
+      this._subViewObserver.observe(viewNode, {
+        attributes: true,
+        characterData: true,
+        childList: true,
+        subtree: true
+      });
+    } else {
+      // Emit the ViewShowing event so that the widget definition has a chance
+      // to lazily populate the subview with things.
+      let evt = document.createEvent("CustomEvent");
+      evt.initCustomEvent("ViewShowing", true, true, viewNode);
+      viewNode.dispatchEvent(evt);
+
+      let panel = document.createElement("panel");
+      panel.appendChild(viewNode);
+      panel.setAttribute("type", "arrow");
+      panel.setAttribute("id", "customizationui-widget-panel");
+      document.getElementById(CustomizableUI.AREA_NAVBAR).appendChild(panel);
+      panel.addEventListener("popuphidden", function() {
+        this.subViews.appendChild(viewNode);
+        panel.parentElement.removeChild(panel);
+      });
+
+      panel.openPopup(aAnchor, "bottomcenter topright");
+    }
   },
 
   /**
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index de9902497b42..8be5692158e5 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -115,7 +115,7 @@ XPCOMUtils.defineLazyGetter(this, "gBuiltInWidgets", function() {
     name: "History...",
     description: "History repeats itself!",
     defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL],
+    allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
     icons: {
       "16": "chrome://branding/content/icon16.png",
       "32": "chrome://branding/content/icon48.png",
@@ -788,7 +788,8 @@ let CustomizableUIInternal = {
       }
     } else if (aWidget.type == "view") {
       let ownerWindow = aNode.ownerDocument.defaultView;
-      ownerWindow.PanelUI.showSubView(aWidget.viewId, aNode);
+      ownerWindow.PanelUI.showSubView(aWidget.viewId, aNode,
+                                      this.getPlacementOfWidget(aNode.id).area);
     }
   },
 
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index ebe3e95ceed9..d6c6c18a09a7 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -41,7 +41,8 @@
   font-size: 10px;
 }
 
-#PanelUI-contents {
+#PanelUI-contents,
+#customizationui-widget-panel {
   max-width: @menuPanelWidth@;
   padding: 0 1em;
 }
@@ -99,11 +100,13 @@
   -moz-box-orient: horizontal;
 }
 
-#PanelUI-contents[type="list"] toolbarbutton .toolbarbutton-text,
-#PanelUI-subViews toolbarbutton .toolbarbutton-text {
+#PanelUI-contents[type="list"] toolbarbutton > .toolbarbutton-text,
+#PanelUI-subViews toolbarbutton > .toolbarbutton-text,
+#customizationui-widget-panel toolbarbutton > .toolbarbutton-text {
   text-align: start;
   -moz-padding-start: 8px;
   font-size: 12px;
+  display: -moz-box;
 }
 
 #PanelUI-contents[type="list"] toolbarbutton .toolbarbutton-acceltext {
@@ -186,7 +189,8 @@
 }
 
 #PanelUI-subViews toolbarbutton,
-#PanelUI-mainView toolbarbutton {
+#PanelUI-mainView toolbarbutton,
+#customizationui-widget-panel toolbarbutton {
   -moz-appearance: none;
   padding: 2px 6px;
   background: hsla(210,32%,93%,0) padding-box;
@@ -202,6 +206,7 @@
 
 #PanelUI-subViews toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #PanelUI-mainView toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
+#customizationui-widget-panel toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #PanelUI-mainView .PanelUI-pageControls toolbarbutton,
 #PanelUI-mainView #PanelUI-customize-btn {
   background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
@@ -212,7 +217,8 @@
 }
 
 #PanelUI-subViews toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
-#PanelUI-mainView toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active) {
+#PanelUI-mainView toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
+#customizationui-widget-panel toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active) {
   background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
   background-color: hsla(210,54%,20%,.15);
   border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);

From 1d36b302549d37eec82fd55ea9ed267cf6f00daa Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Tue, 30 Apr 2013 18:41:32 -0400
Subject: [PATCH 067/230] Bug 864811 - Remove use of :-moz-any as the
 right-most selector in the new PanelUI css. r=fryn

---
 .../shared/customizableui/panelUIOverlay.inc.css  | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index d6c6c18a09a7..85efd6bfed84 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -188,9 +188,7 @@
   display: none;
 }
 
-#PanelUI-subViews toolbarbutton,
-#PanelUI-mainView toolbarbutton,
-#customizationui-widget-panel toolbarbutton {
+:-moz-any(#PanelUI-mainView, #PanelUI-subViews, #customizationui-widget-panel) toolbarbutton {
   -moz-appearance: none;
   padding: 2px 6px;
   background: hsla(210,32%,93%,0) padding-box;
@@ -204,9 +202,7 @@
   transition-duration: 150ms;
 }
 
-#PanelUI-subViews toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
-#PanelUI-mainView toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
-#customizationui-widget-panel toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
+:-moz-any(#PanelUI-mainView, #PanelUI-subViews, #customizationui-widget-panel) toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #PanelUI-mainView .PanelUI-pageControls toolbarbutton,
 #PanelUI-mainView #PanelUI-customize-btn {
   background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
@@ -216,9 +212,8 @@
               0 0 2px hsla(210,54%,20%,.1);
 }
 
-#PanelUI-subViews toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
-#PanelUI-mainView toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
-#customizationui-widget-panel toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active) {
+:-moz-any(#PanelUI-mainView, #PanelUI-subViews, #customizationui-widget-panel) toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
+  #PanelUI-mainView .PanelUI-pageControls toolbarbutton:hover:active {
   background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
   background-color: hsla(210,54%,20%,.15);
   border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);
@@ -234,7 +229,7 @@
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
-#PanelUI-contents > toolbarbutton.panelui-mainview-anchor {
+#PanelUI-contents > .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;

From 9f1695ee6255649e1a89c70e5719c79c1611fbb2 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Thu, 2 May 2013 12:05:50 -0400
Subject: [PATCH 068/230] Bug 826689 - Implement Australis tab dimensions.
 r=dao, ui-r=shorlander

---
 browser/base/content/browser.css   |  8 ++---
 browser/themes/linux/browser.css   | 25 ++-----------
 browser/themes/osx/browser.css     | 22 +++---------
 browser/themes/shared/tabs.inc.css | 57 ++++++++++++++++++++++--------
 browser/themes/windows/browser.css | 15 --------
 5 files changed, 52 insertions(+), 75 deletions(-)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 3a9b92da04e8..03304cb95ecf 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -39,11 +39,11 @@ tabbrowser {
 
 .tabbrowser-tab:not([pinned]) {
   -moz-box-flex: 100;
-  max-width: 250px;
+  max-width: 180px;
   min-width: 100px;
   width: 0;
   transition: min-width 200ms ease-out,
-              max-width 250ms ease-out,
+              max-width 230ms ease-out,
               opacity 50ms ease-out 20ms /* hide the tab for the first 20ms of the max-width transition */;
 }
 
@@ -52,8 +52,8 @@ tabbrowser {
   min-width: 0.1px;
   opacity: 0 !important;
   transition: min-width 200ms ease-out,
-              max-width 250ms ease-out,
-              opacity 50ms ease-out 180ms /* hide the tab for the last 20ms of the max-width transition */;
+              max-width 230ms ease-out,
+              opacity 50ms ease-out 160ms /* hide the tab for the last 20ms of the max-width transition */;
 }
 
 .tab-throbber:not([fadein]):not([pinned]),
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index d310da3f78be..11a90fd7feeb 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -1610,26 +1610,6 @@ toolbar[iconsize="small"] #bookmarks-menu-button[starred],
   outline: 1px dotted;
 }
 
-.tab-throbber,
-.tab-icon-image {
-  -moz-margin-end: 3px;
-}
-
-.tab-throbber {
-  list-style-image: url("chrome://browser/skin/tabbrowser/connecting.png");
-}
-
-.tab-throbber[progress] {
-  list-style-image: url("chrome://browser/skin/tabbrowser/loading.png");
-}
-
-.tab-throbber[pinned],
-.tab-icon-image[pinned],
-.tabs-newtab-button > .toolbarbutton-icon {
-  -moz-margin-start: 2px;
-  -moz-margin-end: 2px;
-}
-
 #context_reloadTab {
   list-style-image: url("moz-icon://stock/gtk-refresh?size=menu");
 }
@@ -1664,11 +1644,10 @@ toolbar[iconsize="small"] #bookmarks-menu-button[starred],
 }
 
 .tab-close-button {
-  padding: 0;
   list-style-image: url("moz-icon://stock/gtk-close?size=menu");
-  margin-top: -1px;
+  margin-top: 0;
   margin-bottom: -1px;
-  -moz-margin-end: -1px;
+  -moz-margin-end: -4px;
 }
 
 /* Tabstrip new tab button */
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 3b504a1ef976..4aaffe819d6f 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -2182,23 +2182,11 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 %include ../shared/tabs.inc.css
 
 .tab-label {
-  margin: 0;
+  margin-top: 3px;
+  margin-bottom: 0;
   text-align: center;
 }
 
-.tab-throbber:not([pinned]),
-.tab-icon-image:not([pinned]) {
-  -moz-margin-end: 6px;
-}
-
-.tab-throbber {
-  list-style-image: url("chrome://browser/skin/tabbrowser/connecting.png");
-}
-
-.tab-throbber[progress] {
-  list-style-image: url("chrome://browser/skin/tabbrowser/loading.png");
-}
-
 @media (min-resolution: 2dppx) {
   .tab-icon-image {
     list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
@@ -2224,8 +2212,8 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 
 .tabbrowser-tab:not([pinned]):not([fadein]) {
   transition: min-width 200ms ease-out /* copied from browser/base/content/browser.css */,
-              max-width 250ms ease-out /* copied from browser/base/content/browser.css */,
-              opacity 50ms ease-out 100ms /* hide the tab for the last 100ms of the max-width transition */;
+              max-width 230ms ease-out /* copied from browser/base/content/browser.css */,
+              opacity 50ms ease-out 80ms /* hide the tab for the last 100ms of the max-width transition */;
 }
 
 .tabbrowser-tab,
@@ -2357,8 +2345,6 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   list-style-image: url("chrome://global/skin/icons/close.png");
   -moz-appearance: none;
   border: none !important;
-  padding: 0;
-  margin: 0;
   background: none;
   cursor: default;
   -moz-image-region: rect(0, 16px, 16px, 0);
diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
index 878b8a2924f0..a0bcc6da4495 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -47,8 +47,48 @@
 }
 
 .tab-content {
-  -moz-padding-end: 10px;
-  -moz-padding-start: 10px;
+  -moz-padding-end: 9px;
+  -moz-padding-start: 9px;
+}
+
+.tab-throbber,
+.tab-icon-image,
+.tab-close-button {
+  margin-top: 1px;
+}
+
+.tab-throbber,
+.tab-icon-image {
+  height: 16px;
+  width: 16px;
+}
+
+.tab-icon-image {
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+}
+
+.tab-throbber {
+  list-style-image: url("chrome://browser/skin/tabbrowser/connecting.png");
+}
+
+.tab-throbber[progress] {
+  list-style-image: url("chrome://browser/skin/tabbrowser/loading.png");
+}
+
+.tab-throbber:not([pinned]),
+.tab-icon-image:not([pinned]) {
+  -moz-margin-end: 6px;
+}
+
+.tab-label {
+  -moz-margin-end: 0;
+  -moz-margin-start: 0;
+}
+
+.tab-close-button {
+  -moz-margin-start: 4px;
+  -moz-margin-end: -2px;
+  padding: 0;
 }
 
 .tab-background,
@@ -204,16 +244,3 @@
   clip-path: url(chrome://browser/content/browser.xul#tab-clip-path-outer);
   width: 66px;
 }
-
-
-/* Tab icons */
-
-.tab-throbber,
-.tab-icon-image {
-  width: 16px;
-  height: 16px;
-}
-
-.tab-icon-image {
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-}
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index b3d7b9edc6da..46b90395fb55 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1987,19 +1987,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   text-shadow: 0 -0.5px 1.5px white;
 }
 
-.tab-throbber {
-  list-style-image: url("chrome://browser/skin/tabbrowser/connecting.png");
-}
-
-.tab-throbber[progress] {
-  list-style-image: url("chrome://browser/skin/tabbrowser/loading.png");
-}
-
-.tab-throbber:not([pinned]),
-.tab-icon-image:not([pinned]) {
-  -moz-margin-end: 6px;
-}
-
 /* tabbrowser-tab focus ring */
 .tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-label {
   outline: 1px dotted;
@@ -2015,9 +2002,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 .tab-close-button {
   -moz-appearance: none;
   -moz-image-region: rect(0, 16px, 16px, 0);
-  -moz-margin-start: 6px;
   border: none;
-  padding: 0px;
   list-style-image: url("chrome://global/skin/icons/close.png");
 }
 

From 094a6c7847f96e61d0846c63f159c89e11588038 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Thu, 2 May 2013 12:42:17 -0400
Subject: [PATCH 069/230] Bug 834284 - Lightweight theme support for Australis
 tabs on GTK Linux theme. r=MattN.

---
 .../themes/linux/browser-lightweightTheme.css | 29 +++++++++++++++++++
 browser/themes/linux/browser.css              | 17 +++++++++--
 browser/themes/linux/jar.mn                   |  1 +
 browser/themes/linux/linuxShared.inc          |  9 ++++++
 4 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 browser/themes/linux/browser-lightweightTheme.css
 create mode 100644 browser/themes/linux/linuxShared.inc

diff --git a/browser/themes/linux/browser-lightweightTheme.css b/browser/themes/linux/browser-lightweightTheme.css
new file mode 100644
index 000000000000..201e1a4486b0
--- /dev/null
+++ b/browser/themes/linux/browser-lightweightTheme.css
@@ -0,0 +1,29 @@
+/* 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/. */
+
+%include linuxShared.inc
+%filter substitution
+
+/*
+ * LightweightThemeListener will append the current lightweight theme's header
+ * image to the background-image for each of the following rulesets.
+ */
+
+/* Lightweight theme on tabs */
+#tabbrowser-tabs:not([movingtab]) > .tabbrowser-tab > .tab-stack > .tab-background > .tab-background-start[selected=true]:-moz-lwtheme::before,
+#tabbrowser-tabs:not([movingtab]) > .tabbrowser-tab > .tab-stack > .tab-background > .tab-background-end[selected=true]:-moz-lwtheme::before {
+  background-attachment: scroll, fixed;
+  background-color: transparent;
+  background-image: @fgTabTexture@;/*, lwtHeader;*/
+  background-position: 0 0, right top;
+}
+
+#tabbrowser-tabs:not([movingtab]) > .tabbrowser-tab > .tab-stack > .tab-background > .tab-background-middle[selected=true]:-moz-lwtheme {
+  background-attachment: scroll, scroll, fixed;
+  background-color: transparent;
+  background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png),
+                    @fgTabTexture@;/*,
+                    lwtHeader;*/
+  background-position: 0 0, 0 0, right top;
+}
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 3c8abc6ad283..1cd73b09da86 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -10,10 +10,9 @@
 @namespace html url("http://www.w3.org/1999/xhtml");
 
 %include ../shared/browser.inc
+%include linuxShared.inc
 %filter substitution
-%define toolbarHighlight rgba(255,255,255,.3)
-%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
@@ -1592,6 +1591,9 @@ toolbar[iconsize="small"] #bookmarks-menu-button[starred],
 #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme) {
   -moz-appearance: menubar;
   color: -moz-menubartext;
+}
+
+#TabsToolbar[tabsontop=true] {
   box-shadow: 0 -1px 0 rgba(0,0,0,.1) inset;
 }
 
@@ -1607,6 +1609,15 @@ toolbar[iconsize="small"] #bookmarks-menu-button[starred],
   background-image: linear-gradient(to top, rgba(0,0,0,.3) 1px, rgba(0,0,0,.05) 1px, transparent 50%);
 }
 
+.tab-background-middle[selected=true]:-moz-lwtheme {
+  background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png),
+                    @fgTabTexture@;
+}
+
+.tabbrowser-tab {
+  color: inherit;
+}
+
 .tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-label {
   outline: 1px dotted;
 }
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index 2e2ad9ae4773..05e33f7837d2 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -20,6 +20,7 @@ browser.jar:
   skin/classic/browser/actionicon-tab.png
   skin/classic/browser/appmenu.png
 * skin/classic/browser/browser.css
+* skin/classic/browser/browser-lightweightTheme.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/engineManager.css
diff --git a/browser/themes/linux/linuxShared.inc b/browser/themes/linux/linuxShared.inc
new file mode 100644
index 000000000000..97d8e2d8f249
--- /dev/null
+++ b/browser/themes/linux/linuxShared.inc
@@ -0,0 +1,9 @@
+/* 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/. */
+
+%filter substitution
+
+%define toolbarHighlight rgba(255,255,255,.3)
+%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)

From 40ddc57727dc11f983c7862c00a2aac8e22bc240 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Thu, 2 May 2013 14:15:29 -0400
Subject: [PATCH 070/230] Bug 865374 - Position tabs in the OSX titlebar. Cocoa
 Widget work by Steven Michaud. r=dao,bgirard.

---
 browser/app/profile/firefox.js     |   6 +-
 browser/base/content/browser.css   |  17 ++++
 browser/base/content/browser.js    |   5 +-
 browser/base/content/browser.xul   |  38 +++++++-
 browser/themes/osx/browser.css     |   4 +-
 browser/themes/windows/browser.css |   5 -
 gfx/src/nsThemeConstants.h         |   3 +-
 layout/style/nsCSSKeywordList.h    |   1 +
 layout/style/nsCSSProps.cpp        |   1 +
 widget/cocoa/nsCocoaWindow.h       |  19 ++++
 widget/cocoa/nsCocoaWindow.mm      | 148 +++++++++++++++++++++++++++++
 widget/cocoa/nsNativeThemeCocoa.mm |  46 ++++++++-
 12 files changed, 277 insertions(+), 16 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 70c24c108226..7537edab022e 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -412,10 +412,10 @@ pref("browser.tabs.loadBookmarksInBackground", false);
 pref("browser.tabs.tabClipWidth", 140);
 pref("browser.tabs.animate", true);
 pref("browser.tabs.onTop", true);
-#ifdef XP_WIN
-pref("browser.tabs.drawInTitlebar", true);
-#else
+#ifdef UNIX_BUT_NOT_MAC
 pref("browser.tabs.drawInTitlebar", false);
+#else
+pref("browser.tabs.drawInTitlebar", true);
 #endif
 
 // Where to show tab close buttons:
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 2c87d30340a0..a95ab6b97aa7 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -125,6 +125,23 @@ toolbar[printpreview="true"] {
 #main-window[tabsintitlebar] #titlebar-buttonbox {
   position: relative;
 }
+
+#titlebar-buttonbox {
+  -moz-appearance: -moz-window-button-box;
+}
+
+%ifdef XP_MACOSX
+#titlebar-fullscreen-button {
+  -moz-appearance: -moz-mac-fullscreen-button;
+}
+%endif
+
+%ifdef XP_WIN
+#main-window[sizemode="maximized"] #titlebar-buttonbox {
+  -moz-appearance: -moz-window-button-box-maximized;
+}
+%endif
+
 %endif
 
 .bookmarks-toolbar-customize,
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index dabffff63c79..d99429e24a4f 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -4598,7 +4598,10 @@ var TabsInTitlebar = {
 #endif
       let captionButtonsBox = $("titlebar-buttonbox");
       this._sizePlaceholder("caption-buttons", rect(captionButtonsBox).width);
-
+#ifdef XP_MACOSX
+      let fullscreenButton  = $("titlebar-fullscreen-button");
+      this._sizePlaceholder("fullscreen-button", rect(fullscreenButton).width);
+#endif
       let titlebarContentHeight = rect(titlebarContent).height;
       let menuHeight = this._outerHeight(menubar);
 
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 743a8ab5e615..229336c8d33a 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -485,13 +485,20 @@
     </hbox>
 #endif
     <spacer id="titlebar-spacer" flex="1"/>
-    <hbox id="titlebar-buttonbox-container" align="start">
+    <hbox id="titlebar-buttonbox-container" align="start"
+#ifdef XP_MACOSX
+          ordinal="0"
+#endif
+    >
       <hbox id="titlebar-buttonbox">
         <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/>
         <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/>
         <toolbarbutton class="titlebar-button" id="titlebar-close" command="cmd_closeWindow"/>
       </hbox>
     </hbox>
+#ifdef XP_MACOSX
+    <hbox id="titlebar-fullscreen-button" ordinal="1000"/>
+#endif
   </hbox>
 </vbox>
 #endif
@@ -519,8 +526,21 @@
       </toolbaritem>
 
 #ifdef CAN_DRAW_IN_TITLEBAR
+#ifdef MENUBAR_CAN_AUTOHIDE
       <hbox class="titlebar-placeholder" type="appmenu-button" ordinal="0"/>
-      <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"/>
+#endif
+
+      <hbox class="titlebar-placeholder" type="caption-buttons"
+#ifdef XP_MACOSX
+            ordinal="0"
+#else
+            ordinal="1000"
+#endif
+      />
+
+#ifdef XP_MACOSX
+      <hbox class="titlebar-placeholder" type="fullscreen-button" ordinal="1000"/>
+#endif
 #endif
     </toolbar>
 
@@ -827,8 +847,20 @@
                      tooltiptext="&closeTab.label;"/>
 
 #ifdef CAN_DRAW_IN_TITLEBAR
+#ifdef MENUBAR_CAN_AUTOHIDE
       <hbox class="titlebar-placeholder" type="appmenu-button" ordinal="0"/>
-      <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"/>
+#endif
+      <hbox class="titlebar-placeholder" type="caption-buttons"
+#ifdef XP_MACOSX
+            ordinal="0"
+#else
+            ordinal="1000"
+#endif
+      />
+
+#ifdef XP_MACOSX
+      <hbox class="titlebar-placeholder" type="fullscreen-button"
+            ordinal="1000"/>
 #endif
     </toolbar>
 
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index c1d19c5ab7ab..edcc6c5fd2d3 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -40,12 +40,12 @@
   background-color: #eeeeee;
 }
 
-#titlebar-buttonbox-container {
+#titlebar-buttonbox > .titlebar-button {
   display: none;
 }
 
 #titlebar {
-  height: 22px;
+  padding-top: 9px;
 }
 
 #main-window:not(:-moz-lwtheme):not([privatebrowsingmode=temporary]) > #titlebar {
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index bc06725c4349..167105c5c283 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -588,14 +588,9 @@
  * themes with Aero Glass.
  */
 #titlebar-buttonbox {
-  -moz-appearance: -moz-window-button-box;
   z-index: 1;
 }
 
-#main-window[sizemode="maximized"] #titlebar-buttonbox {
-  -moz-appearance: -moz-window-button-box-maximized;
-}
-
 .titlebar-placeholder[type="appmenu-button"] {
   margin-left: 4px;
 }
diff --git a/gfx/src/nsThemeConstants.h b/gfx/src/nsThemeConstants.h
index 0f6fdc9311dc..fd478f1b1483 100644
--- a/gfx/src/nsThemeConstants.h
+++ b/gfx/src/nsThemeConstants.h
@@ -246,8 +246,9 @@
 #define NS_THEME_WIN_MEDIA_TOOLBOX                         222
 #define NS_THEME_WIN_BROWSER_TAB_BAR_TOOLBOX               223
 
-// Unified toolbar on the Mac
+// Unified toolbar and titlebar elements on the Mac
 #define NS_THEME_MOZ_MAC_UNIFIED_TOOLBAR                   224
+#define NS_THEME_MOZ_MAC_FULLSCREEN_BUTTON                 226
 
 // Vista glass
 #define NS_THEME_WIN_BORDERLESS_GLASS                      229
diff --git a/layout/style/nsCSSKeywordList.h b/layout/style/nsCSSKeywordList.h
index e146d3437400..ee6782235d91 100644
--- a/layout/style/nsCSSKeywordList.h
+++ b/layout/style/nsCSSKeywordList.h
@@ -107,6 +107,7 @@ CSS_KEY(-moz-mac-alternateprimaryhighlight, _moz_mac_alternateprimaryhighlight)
 CSS_KEY(-moz-mac-chrome-active, _moz_mac_chrome_active)
 CSS_KEY(-moz-mac-chrome-inactive, _moz_mac_chrome_inactive)
 CSS_KEY(-moz-mac-focusring, _moz_mac_focusring)
+CSS_KEY(-moz-mac-fullscreen-button, _moz_mac_fullscreen_button)
 CSS_KEY(-moz-mac-menuselect, _moz_mac_menuselect)
 CSS_KEY(-moz-mac-menushadow, _moz_mac_menushadow)
 CSS_KEY(-moz-mac-menutextdisable, _moz_mac_menutextdisable)
diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp
index dfba342d2be0..0f521adcf6e6 100644
--- a/layout/style/nsCSSProps.cpp
+++ b/layout/style/nsCSSProps.cpp
@@ -596,6 +596,7 @@ const int32_t nsCSSProps::kAppearanceKTable[] = {
   eCSSKeyword__moz_win_glass,         NS_THEME_WIN_GLASS,
   eCSSKeyword__moz_win_borderless_glass,      NS_THEME_WIN_BORDERLESS_GLASS,
   eCSSKeyword__moz_mac_unified_toolbar,       NS_THEME_MOZ_MAC_UNIFIED_TOOLBAR,
+  eCSSKeyword__moz_mac_fullscreen_button,     NS_THEME_MOZ_MAC_FULLSCREEN_BUTTON,
   eCSSKeyword__moz_window_titlebar,           NS_THEME_WINDOW_TITLEBAR,
   eCSSKeyword__moz_window_titlebar_maximized, NS_THEME_WINDOW_TITLEBAR_MAXIMIZED,
   eCSSKeyword__moz_window_frame_left,         NS_THEME_WINDOW_FRAME_LEFT,
diff --git a/widget/cocoa/nsCocoaWindow.h b/widget/cocoa/nsCocoaWindow.h
index 4aafa767f2fa..669b1a5b7084 100644
--- a/widget/cocoa/nsCocoaWindow.h
+++ b/widget/cocoa/nsCocoaWindow.h
@@ -115,6 +115,25 @@ typedef struct _nsCocoaWindowList {
 - (void)setBottomCornerRounded:(BOOL)rounded;
 - (BOOL)bottomCornerRounded;
 
+// Present since at least OS X 10.5.  The OS calls this method on NSWindow
+// (and its subclasses) to find out which NSFrameView subclass to instantiate
+// to create its "frame view".
++ (Class)frameViewClassForStyleMask:(NSUInteger)styleMask;
+
+@end
+
+// Present since at least OS X 10.5 in NSFrameView or one of its subclasses.
+@interface NSObject (NSFrameViewMethods)
+- (NSButton*)closeButton;
+- (NSButton*)zoomButton;
+- (NSButton*)minimizeButton;
+- (NSButton*)fullScreenButton;
+- (void)initTitleCell:(id)cell;
+@end
+
+@interface NSView (MozFrameViewMethods)
+- (int32_t)buttonBoxDisplayPixelsWidth;
+- (int32_t)fullScreenButtonDisplayPixelsWidth;
 @end
 
 @interface PopupWindow : BaseWindow
diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm
index 53a244e74a19..0deb17a7b3da 100644
--- a/widget/cocoa/nsCocoaWindow.mm
+++ b/widget/cocoa/nsCocoaWindow.mm
@@ -2475,6 +2475,110 @@ GetDPI(NSWindow* aWindow)
   return dpi * backingScale;
 }
 
+// Methods of our MozTitleCell and MozFrameView classes, created below as
+// subclasses of the appropriate undocumented superclasses.  Since we don't
+// know beforehand exactly what the superclasses will be, each of these
+// classes is created dynamically, using low-level Objective-C runtime
+// methods.  So their methods' declarations can't use Objective-C syntax.
+
+static Class gMozTitleCellClass = nil;
+
+typedef void (*NSCell_drawWithFrame)(struct objc_super *, SEL, NSRect, NSView *);
+
+static void MozTitleCell_drawWithFrame(id self, SEL sel, NSRect cellFrame,
+                                       NSView *controlView)
+{
+  BaseWindow *window = nil;
+  // The documentation for -[NSCell drawWithFrame:(NSRect)cellFrame
+  // inView:(NSView*)controlView] says "this method draws the cell in the
+  // currently focused view", which is what's returned by [NSView focusView].
+  // So in the very unlikely event that 'controlView' is nil, we fall back
+  // to using [NSView focusView].
+  if (controlView) {
+    window = (BaseWindow *) [controlView window];
+  } else {
+    window = (BaseWindow *) [[NSView focusView] window];
+  }
+  if ([window isKindOfClass:[BaseWindow class]]) {
+    if ([window drawsContentsIntoWindowFrame]) {
+      return;
+    }
+  }
+  struct objc_super target;
+  target.receiver = self;
+  target.super_class = [self superclass];
+  NSCell_drawWithFrame super = (NSCell_drawWithFrame) objc_msgSendSuper;
+  super(&target, sel, cellFrame, controlView);
+}
+
+static NSMutableDictionary *gFrameViewClassesByStyleMask = nil;
+
+typedef void (*NSFrameView_initTitleCell)(struct objc_super *, SEL, id);
+
+static void MozFrameView_initTitleCell(id self, SEL sel, id cell)
+{
+  struct objc_super target;
+  target.receiver = self;
+  target.super_class = [self superclass];
+  NSFrameView_initTitleCell super = (NSFrameView_initTitleCell) objc_msgSendSuper;
+  super(&target, sel, cell);
+  Class oldCellClass = [cell class];
+  if (cell) {
+    if (!gMozTitleCellClass) {
+      Class superclass = [cell class];
+      Class newClass = objc_allocateClassPair(superclass,
+                                              "MozTitleCell", 0);
+      if (newClass) {
+        if ([superclass instancesRespondToSelector:@selector(drawWithFrame:inView:)]) {
+          class_addMethod(newClass, @selector(drawWithFrame:inView:),
+                          (IMP)MozTitleCell_drawWithFrame,
+                          "v@:{_NSRect={_NSPoint=ff}{_NSSize=ff}}@");
+        }
+        objc_registerClassPair(newClass);
+        gMozTitleCellClass = newClass;
+      }
+    }
+    if (gMozTitleCellClass) {
+      object_setClass(cell, gMozTitleCellClass);
+    }
+  }
+}
+
+static int32_t MozFrameView_buttonBoxDisplayPixelsWidth(id self, SEL sel)
+{
+  NSRect buttonBox = NSZeroRect;
+  NSButton *closeButton = [self closeButton];
+  if (closeButton) {
+    NSRect closeButtonBox = [self convertRect:[closeButton bounds]
+                                     fromView:closeButton];
+    buttonBox = NSUnionRect(buttonBox, closeButtonBox);
+  }
+  NSButton *minimizeButton = [self minimizeButton];
+  if (minimizeButton) {
+    NSRect minimizeButtonBox = [self convertRect:[minimizeButton bounds]
+                                        fromView:minimizeButton];
+    buttonBox = NSUnionRect(buttonBox, minimizeButtonBox);
+  }
+  NSButton *zoomButton = [self zoomButton];
+  if (zoomButton) {
+    NSRect zoomButtonBox = [self convertRect:[zoomButton bounds]
+                                    fromView:zoomButton];
+    buttonBox = NSUnionRect(buttonBox, zoomButtonBox);
+  }
+  return rint(buttonBox.size.width);
+}
+
+static int32_t MozFrameView_fullScreenButtonDisplayPixelsWidth(id self, SEL sel)
+{
+  CGFloat floatWidth = 0;
+  NSButton *fullScreenButton = [self fullScreenButton];
+  if (fullScreenButton) {
+    floatWidth += [self convertSize:[fullScreenButton bounds].size
+                           fromView:fullScreenButton].width;
+  }
+  return rint(floatWidth);
+}
+
 @interface BaseWindow(Private)
 - (void)removeTrackingArea;
 - (void)cursorUpdated:(NSEvent*)aEvent;
@@ -2482,6 +2586,50 @@ GetDPI(NSWindow* aWindow)
 
 @implementation BaseWindow
 
++ (Class)frameViewClassForStyleMask:(NSUInteger)styleMask
+{
+  Class retval = [super frameViewClassForStyleMask:styleMask];
+
+  if (!gFrameViewClassesByStyleMask) {
+    gFrameViewClassesByStyleMask =
+      [[NSMutableDictionary dictionaryWithCapacity:3] retain];
+  }
+  if (!gFrameViewClassesByStyleMask) {
+    return retval;
+  }
+
+  NSString *styleMaskString =
+    [NSString stringWithFormat:@"%p", (void *) styleMask];
+  Class existingClass = (Class)
+    [gFrameViewClassesByStyleMask valueForKey:styleMaskString];
+  if (existingClass) {
+    retval = existingClass;
+  } else if (retval) {
+    char newClassName[32];
+    snprintf(newClassName, sizeof(newClassName) - 1, "MozFrameView%s",
+             [styleMaskString UTF8String]);
+    Class newClass = objc_allocateClassPair(retval, newClassName, 0);
+    if (newClass) {
+      if ([retval instancesRespondToSelector:@selector(initTitleCell:)]) {
+        class_addMethod(newClass, @selector(initTitleCell:),
+                        (IMP)MozFrameView_initTitleCell,
+                        "v@:@");
+      }
+      class_addMethod(newClass, @selector(buttonBoxDisplayPixelsWidth),
+                      (IMP)MozFrameView_buttonBoxDisplayPixelsWidth,
+                      "l@:");
+      class_addMethod(newClass, @selector(fullScreenButtonDisplayPixelsWidth),
+                      (IMP)MozFrameView_fullScreenButtonDisplayPixelsWidth,
+                      "l@:");
+      objc_registerClassPair(newClass);
+      [gFrameViewClassesByStyleMask setValue:newClass forKey:styleMaskString];
+      retval = newClass;
+    }
+  }
+
+  return retval;
+}
+
 - (id)initWithContentRect:(NSRect)aContentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)aBufferingType defer:(BOOL)aFlag
 {
   [super initWithContentRect:aContentRect styleMask:aStyle backing:aBufferingType defer:aFlag];
diff --git a/widget/cocoa/nsNativeThemeCocoa.mm b/widget/cocoa/nsNativeThemeCocoa.mm
index b1de27df3cfd..6a8553742838 100644
--- a/widget/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/cocoa/nsNativeThemeCocoa.mm
@@ -357,6 +357,38 @@ static NSWindow* NativeWindowForFrame(nsIFrame* aFrame,
   return (NSWindow*)topLevelWidget->GetNativeData(NS_NATIVE_WINDOW);
 }
 
+static NSView* FrameViewForFrame(nsIFrame* aFrame)
+{
+  NSWindow* window = NativeWindowForFrame(aFrame);
+  return [[window contentView] superview];
+}
+
+static int32_t ButtonBoxDisplayPixelsWidth(nsIFrame* aFrame)
+{
+  int32_t retval = 60;  // Default value;
+  NSView *frameView = FrameViewForFrame(aFrame);
+  if ([frameView respondsToSelector:@selector(buttonBoxDisplayPixelsWidth)]) {
+    int32_t measuredWidth = [frameView buttonBoxDisplayPixelsWidth];
+    if (measuredWidth) {
+      retval = measuredWidth;
+    }
+  }
+  return retval;
+}
+
+static int32_t FullScreenButtonDisplayPixelsWidth(nsIFrame* aFrame)
+{
+  int32_t retval = 20;  // Default value;
+  NSView *frameView = FrameViewForFrame(aFrame);
+  if ([frameView respondsToSelector:@selector(fullScreenButtonDisplayPixelsWidth)]) {
+    int32_t measuredWidth = [frameView fullScreenButtonDisplayPixelsWidth];
+    if (measuredWidth) {
+      retval = measuredWidth;
+    }
+  }
+  return retval;
+}
+
 static BOOL FrameIsInActiveWindow(nsIFrame* aFrame)
 {
   nsIWidget* topLevelWidget = NULL;
@@ -2685,7 +2717,17 @@ nsNativeThemeCocoa::GetMinimumWidgetSize(nsRenderingContext* aContext,
       aResult->SizeTo(0, (2 + 2) /* top */ + 9 + (1 + 1) /* bottom */);
       break;
     }
-      
+
+    case NS_THEME_WINDOW_BUTTON_BOX: {
+      aResult->SizeTo(ButtonBoxDisplayPixelsWidth(aFrame), 0);
+      break;
+    }
+
+    case NS_THEME_MOZ_MAC_FULLSCREEN_BUTTON: {
+      aResult->SizeTo(FullScreenButtonDisplayPixelsWidth(aFrame), 0);
+      break;
+    }
+
     case NS_THEME_PROGRESSBAR:
     {
       SInt32 barHeight = 0;
@@ -2947,10 +2989,12 @@ nsNativeThemeCocoa::ThemeSupportsWidget(nsPresContext* aPresContext, nsIFrame* a
 
     case NS_THEME_DIALOG:
     case NS_THEME_WINDOW:
+    case NS_THEME_WINDOW_BUTTON_BOX:
     case NS_THEME_WINDOW_TITLEBAR:
     case NS_THEME_MENUPOPUP:
     case NS_THEME_MENUITEM:
     case NS_THEME_MENUSEPARATOR:
+    case NS_THEME_MOZ_MAC_FULLSCREEN_BUTTON:
     case NS_THEME_TOOLTIP:
     
     case NS_THEME_CHECKBOX:

From 4c191f666dc9ec98c875341cb3c3a923ddcb756a Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Wed, 1 May 2013 13:28:43 +0200
Subject: [PATCH 071/230] Bug 850918 - Allow tab clip-path and
 tab-active-middle.png to scale. r=MattN

---
 browser/base/content/browser.xul   | 8 ++++----
 browser/themes/shared/tabs.inc.css | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 229336c8d33a..86d3028823f2 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1228,11 +1228,11 @@
   </vbox>
 
   <svg:svg height="0">
-    <svg:clipPath id="tab-curve-clip-path-start" clipPathUnits="userSpaceOnUse">
-      <svg:path d="M 30,2 C 17.049,2.104,15.508,11.669,14.511,17 c -1.565,8.376,-4.276,13,-13,13 L 0,31 H 31 V 2 z"/>
+    <svg:clipPath id="tab-curve-clip-path-start" clipPathUnits="objectBoundingBox">
+      <svg:path d="M 1,0.0645 C 0.5683,0.0679,0.51693,0.3764,0.4837,0.5484 c -0.0522,0.2702,-0.1425,0.4194,0.4333,0.4194 L 0,1 H 1.0333 V 0.0645 z"/>
     </svg:clipPath>
-    <svg:clipPath id="tab-curve-clip-path-end" clipPathUnits="userSpaceOnUse">
-      <svg:path d="M -1,2 C 12.951,2.104,14.492,11.669,15.489,17 c +1.565,8.376,+4.276,13,+13,13 L 30,31 H -1 V 2 z"/>
+    <svg:clipPath id="tab-curve-clip-path-end" clipPathUnits="objectBoundingBox">
+      <svg:path d="M -0.0333,0.0645 C 0.4317,0.0679,0.4831,0.3764,0.5163,0.5484 c 0.0522,0.2702,+0.1425,0.4194,0.4333,0.4194 L 1,1 H -0.033 V 0.0645 z"/>
     </svg:clipPath>
     <svg:clipPath id="tab-clip-path-outer" clipPathUnits="userSpaceOnUse">
       <svg:path d="M 30,0 C 24,0 17.78,2.58 15.10,8.09 12.05,13.46 13.14,20.37 9.18,25.3 7.1,27.7 3.8,28 0.8,28 c -0.4,0.6 -2.09,1.11 -1.46,1.80 l 2.45,2.72 61.60,0 2.59,-3.06 C 65.15,28.96 64.57,27.80 63.5,28 60.13,28.13 56.33,27.03 54.74,23.78 51.85,18.44 52.65,11.81 49.09,6.73 45.88,1.65 39.54,-0.26 33.8,0 32.5,0 31.7,0 30,0 z"/>
diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
index a0bcc6da4495..ed1dbfbd0957 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -170,6 +170,7 @@
   background-color: transparent;
   background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png),
                     @fgTabBackgroundMiddle@;
+  background-size: 100% 100%;
   background-repeat: repeat-x;
 }
 

From b6638040d3c37b88b33239dc76ded4151101e5b2 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Wed, 1 May 2013 17:29:33 -0400
Subject: [PATCH 072/230] Bug 867682 - Fix the alignment in the menu panel.
 r=mconley

---
 .../customizableui/panelUIOverlay.inc.css     | 58 ++++++++++---------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index 85efd6bfed84..23488da2d8ea 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -41,10 +41,18 @@
   font-size: 10px;
 }
 
+.PanelUI-pageControls {
+  padding: 1em 0 0;
+}
+
+.PanelUI-footer,
+.PanelUI-editControls,
+.PanelUI-zoomControls,
 #PanelUI-contents,
+.PanelUI-footer,
 #customizationui-widget-panel {
   max-width: @menuPanelWidth@;
-  padding: 0 1em;
+  padding: .5em 1em;
 }
 
 #PanelUI-container {
@@ -105,51 +113,50 @@
 #customizationui-widget-panel toolbarbutton > .toolbarbutton-text {
   text-align: start;
   -moz-padding-start: 8px;
-  font-size: 12px;
   display: -moz-box;
 }
 
 #PanelUI-contents[type="list"] toolbarbutton .toolbarbutton-acceltext {
-  font-size: 10px;
+  font-size: calc(5em / 6);
   color: GrayText;
   margin-left: 0;
   margin-right: 0;
 }
 
 #PanelUI-contents[type="list"] toolbarbutton .toolbarbutton-icon {
-  min-width: 24px;
-  max-width: 24px;
-  min-height: 24px;
-  max-height: 24px;
+  min-width: 2em;
+  max-width: 2em;
+  min-height: 2em;
+  max-height: 2em;
 }
 
 #PanelUI-contents[type="grid"] {
   display: block;
 }
 
+.PanelUI-pageControls toolbarbutton {
+  min-width: 7em;
+  max-width: 7em;
+}
+
+.PanelUI-pageControls toolbarbutton > .toolbarbutton-icon {
+  -moz-margin-end: 0;
+}
+
 #PanelUI-contents[type="grid"] toolbarbutton {
   -moz-box-orient: vertical;
-  min-width: 72px;
-  max-width: 72px;
-  min-height: 72px;
-  max-height: 72px;
+  min-width: 7em;
+  max-width: 7em;
+  min-height: 6em;
+  max-height: 6em;
 }
 
 #PanelUI-contents[type="grid"] toolbarbutton .toolbarbutton-icon {
-  min-width: 32px;
-  max-width: 32px;
-  min-height: 32px;
-  max-height: 32px;
-  margin: 5px;
-}
-
-.PanelUI-pageControls {
-  padding: 12px 20px;
-}
-
-.PanelUI-editControls,
-.PanelUI-zoomControls {
-  padding: 6px 0;
+  min-width: calc(8em / 3);
+  max-width: calc(8em / 3);
+  min-height: calc(8em / 3);
+  max-height: calc(8em / 3);
+  margin: calc(5em / 12);
 }
 
 .PanelUI-editControls #PanelUI-copy-btn,
@@ -166,7 +173,6 @@
 }
 
 .PanelUI-footer {
-  padding: 9px 12px;
   background-color: rgba(0, 0, 0, 0.05);
   border-top: 1px solid rgba(0,0,0,.1);
 }

From 63dd82c3a9d1d2dd8981e60378fa1765a543f615 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Fri, 3 May 2013 00:47:48 +0200
Subject: [PATCH 073/230] Bug 850918 - fix sign oversight in my comment, rs=me

---
 browser/base/content/browser.xul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 4ffc4b08eab8..5c2c73a3e901 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1228,7 +1228,7 @@
 
   <svg:svg height="0">
     <svg:clipPath id="tab-curve-clip-path-start" clipPathUnits="objectBoundingBox">
-      <svg:path d="M 1,0.0645 C 0.5683,0.0679,0.51693,0.3764,0.4837,0.5484 c -0.0522,0.2702,-0.1425,0.4194,0.4333,0.4194 L 0,1 H 1.0333 V 0.0645 z"/>
+      <svg:path d="M 1,0.0645 C 0.5683,0.0679,0.51693,0.3764,0.4837,0.5484 c -0.0522,0.2702,-0.1425,0.4194,-0.4333,0.4194 L 0,1 H 1.0333 V 0.0645 z"/>
     </svg:clipPath>
     <svg:clipPath id="tab-curve-clip-path-end" clipPathUnits="objectBoundingBox">
       <svg:path d="M -0.0333,0.0645 C 0.4317,0.0679,0.4831,0.3764,0.5163,0.5484 c 0.0522,0.2702,+0.1425,0.4194,0.4333,0.4194 L 1,1 H -0.033 V 0.0645 z"/>

From 530f5d945357ce1b1e9b5577446ed357a18ef399 Mon Sep 17 00:00:00 2001
From: Steven Michaud <smichaud@pobox.com>
Date: Thu, 2 May 2013 19:31:49 -0400
Subject: [PATCH 074/230] Bustage fix for Bug 865374 - fixes problems for OSX
 versions without the fullscreen button. r=bgirard

---
 widget/cocoa/nsCocoaWindow.mm | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm
index 0deb17a7b3da..603ac9897935 100644
--- a/widget/cocoa/nsCocoaWindow.mm
+++ b/widget/cocoa/nsCocoaWindow.mm
@@ -2522,14 +2522,13 @@ static void MozFrameView_initTitleCell(id self, SEL sel, id cell)
   target.super_class = [self superclass];
   NSFrameView_initTitleCell super = (NSFrameView_initTitleCell) objc_msgSendSuper;
   super(&target, sel, cell);
-  Class oldCellClass = [cell class];
   if (cell) {
+    Class cellClass = [cell class];
     if (!gMozTitleCellClass) {
-      Class superclass = [cell class];
-      Class newClass = objc_allocateClassPair(superclass,
+      Class newClass = objc_allocateClassPair(cellClass,
                                               "MozTitleCell", 0);
       if (newClass) {
-        if ([superclass instancesRespondToSelector:@selector(drawWithFrame:inView:)]) {
+        if ([cellClass instancesRespondToSelector:@selector(drawWithFrame:inView:)]) {
           class_addMethod(newClass, @selector(drawWithFrame:inView:),
                           (IMP)MozTitleCell_drawWithFrame,
                           "v@:{_NSRect={_NSPoint=ff}{_NSSize=ff}}@");
@@ -2538,7 +2537,8 @@ static void MozFrameView_initTitleCell(id self, SEL sel, id cell)
         gMozTitleCellClass = newClass;
       }
     }
-    if (gMozTitleCellClass) {
+    if (gMozTitleCellClass &&
+        cellClass == class_getSuperclass(gMozTitleCellClass)) {
       object_setClass(cell, gMozTitleCellClass);
     }
   }
@@ -2547,19 +2547,28 @@ static void MozFrameView_initTitleCell(id self, SEL sel, id cell)
 static int32_t MozFrameView_buttonBoxDisplayPixelsWidth(id self, SEL sel)
 {
   NSRect buttonBox = NSZeroRect;
-  NSButton *closeButton = [self closeButton];
+  NSButton *closeButton = nil;
+  if ([self respondsToSelector:@selector(closeButton)]) {
+    closeButton = [self closeButton];
+  }
   if (closeButton) {
     NSRect closeButtonBox = [self convertRect:[closeButton bounds]
                                      fromView:closeButton];
     buttonBox = NSUnionRect(buttonBox, closeButtonBox);
   }
-  NSButton *minimizeButton = [self minimizeButton];
+  NSButton *minimizeButton = nil;
+  if ([self respondsToSelector:@selector(minimizeButton)]) {
+    minimizeButton = [self minimizeButton];
+  }
   if (minimizeButton) {
     NSRect minimizeButtonBox = [self convertRect:[minimizeButton bounds]
                                         fromView:minimizeButton];
     buttonBox = NSUnionRect(buttonBox, minimizeButtonBox);
   }
-  NSButton *zoomButton = [self zoomButton];
+  NSButton *zoomButton = nil;
+  if ([self respondsToSelector:@selector(zoomButton)]) {
+    zoomButton = [self zoomButton];
+  }
   if (zoomButton) {
     NSRect zoomButtonBox = [self convertRect:[zoomButton bounds]
                                     fromView:zoomButton];
@@ -2571,7 +2580,10 @@ static int32_t MozFrameView_buttonBoxDisplayPixelsWidth(id self, SEL sel)
 static int32_t MozFrameView_fullScreenButtonDisplayPixelsWidth(id self, SEL sel)
 {
   CGFloat floatWidth = 0;
-  NSButton *fullScreenButton = [self fullScreenButton];
+  NSButton *fullScreenButton = nil;
+  if ([self respondsToSelector:@selector(fullScreenButton)]) {
+    fullScreenButton = [self fullScreenButton];
+  }
   if (fullScreenButton) {
     floatWidth += [self convertSize:[fullScreenButton bounds].size
                            fromView:fullScreenButton].width;

From 86b1f619ffe143d9cad1b9fb8d84fb6c34dcac7c Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Fri, 3 May 2013 08:20:42 -0400
Subject: [PATCH 075/230] Backed out changeset 71d47560397f (bug 864811) r=gijs

---
 .../shared/customizableui/panelUIOverlay.inc.css  | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index 23488da2d8ea..7dc5db9d83cd 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -194,7 +194,9 @@
   display: none;
 }
 
-:-moz-any(#PanelUI-mainView, #PanelUI-subViews, #customizationui-widget-panel) toolbarbutton {
+#PanelUI-subViews toolbarbutton,
+#PanelUI-mainView toolbarbutton,
+#customizationui-widget-panel toolbarbutton {
   -moz-appearance: none;
   padding: 2px 6px;
   background: hsla(210,32%,93%,0) padding-box;
@@ -208,7 +210,9 @@
   transition-duration: 150ms;
 }
 
-:-moz-any(#PanelUI-mainView, #PanelUI-subViews, #customizationui-widget-panel) toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
+#PanelUI-subViews toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
+#PanelUI-mainView toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
+#customizationui-widget-panel toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #PanelUI-mainView .PanelUI-pageControls toolbarbutton,
 #PanelUI-mainView #PanelUI-customize-btn {
   background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
@@ -218,8 +222,9 @@
               0 0 2px hsla(210,54%,20%,.1);
 }
 
-:-moz-any(#PanelUI-mainView, #PanelUI-subViews, #customizationui-widget-panel) toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
-  #PanelUI-mainView .PanelUI-pageControls toolbarbutton:hover:active {
+#PanelUI-subViews toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
+#PanelUI-mainView toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
+#customizationui-widget-panel toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active) {
   background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
   background-color: hsla(210,54%,20%,.15);
   border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);
@@ -235,7 +240,7 @@
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
-#PanelUI-contents > .panelui-mainview-anchor {
+#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;

From 07f9252ffd5d7a5d8332806ae16788fca1963d22 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 3 May 2013 13:00:03 -0400
Subject: [PATCH 076/230] Bug 868410 - Fix jumbled up and uncustomizable
 nav-bar on OSX. r=jaws.

---
 browser/base/content/browser.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index d7dddfca6ae8..4400e7e350a6 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -17,6 +17,12 @@ toolbar[customizable="true"] {
   -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar");
 }
 
+%ifdef XP_MACOSX
+toolbar[customizable="true"]:not([nowindowdrag="true"]) {
+  -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-drag");
+}
+%endif
+
 #toolbar-menubar[autohide="true"] {
   -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-menubar-autohide");
 }

From 3bbae4a42e36ed2c3f3be827d412ba258fa938eb Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Fri, 3 May 2013 19:31:01 +0200
Subject: [PATCH 077/230] Bug 868211 - Simplify Mac implementation of
 -moz-window-button-box. r=smichaud

---
 widget/cocoa/nsCocoaWindow.h       |  14 ---
 widget/cocoa/nsCocoaWindow.mm      | 191 ++++++-----------------------
 widget/cocoa/nsNativeThemeCocoa.mm |  47 +++----
 3 files changed, 59 insertions(+), 193 deletions(-)

diff --git a/widget/cocoa/nsCocoaWindow.h b/widget/cocoa/nsCocoaWindow.h
index 669b1a5b7084..c4c381c3d09f 100644
--- a/widget/cocoa/nsCocoaWindow.h
+++ b/widget/cocoa/nsCocoaWindow.h
@@ -122,20 +122,6 @@ typedef struct _nsCocoaWindowList {
 
 @end
 
-// Present since at least OS X 10.5 in NSFrameView or one of its subclasses.
-@interface NSObject (NSFrameViewMethods)
-- (NSButton*)closeButton;
-- (NSButton*)zoomButton;
-- (NSButton*)minimizeButton;
-- (NSButton*)fullScreenButton;
-- (void)initTitleCell:(id)cell;
-@end
-
-@interface NSView (MozFrameViewMethods)
-- (int32_t)buttonBoxDisplayPixelsWidth;
-- (int32_t)fullScreenButtonDisplayPixelsWidth;
-@end
-
 @interface PopupWindow : BaseWindow
 {
 @private
diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm
index 603ac9897935..04c53b7dabf9 100644
--- a/widget/cocoa/nsCocoaWindow.mm
+++ b/widget/cocoa/nsCocoaWindow.mm
@@ -2475,171 +2475,58 @@ GetDPI(NSWindow* aWindow)
   return dpi * backingScale;
 }
 
-// Methods of our MozTitleCell and MozFrameView classes, created below as
-// subclasses of the appropriate undocumented superclasses.  Since we don't
-// know beforehand exactly what the superclasses will be, each of these
-// classes is created dynamically, using low-level Objective-C runtime
-// methods.  So their methods' declarations can't use Objective-C syntax.
-
-static Class gMozTitleCellClass = nil;
-
-typedef void (*NSCell_drawWithFrame)(struct objc_super *, SEL, NSRect, NSView *);
-
-static void MozTitleCell_drawWithFrame(id self, SEL sel, NSRect cellFrame,
-                                       NSView *controlView)
-{
-  BaseWindow *window = nil;
-  // The documentation for -[NSCell drawWithFrame:(NSRect)cellFrame
-  // inView:(NSView*)controlView] says "this method draws the cell in the
-  // currently focused view", which is what's returned by [NSView focusView].
-  // So in the very unlikely event that 'controlView' is nil, we fall back
-  // to using [NSView focusView].
-  if (controlView) {
-    window = (BaseWindow *) [controlView window];
-  } else {
-    window = (BaseWindow *) [[NSView focusView] window];
-  }
-  if ([window isKindOfClass:[BaseWindow class]]) {
-    if ([window drawsContentsIntoWindowFrame]) {
-      return;
-    }
-  }
-  struct objc_super target;
-  target.receiver = self;
-  target.super_class = [self superclass];
-  NSCell_drawWithFrame super = (NSCell_drawWithFrame) objc_msgSendSuper;
-  super(&target, sel, cellFrame, controlView);
-}
-
-static NSMutableDictionary *gFrameViewClassesByStyleMask = nil;
-
-typedef void (*NSFrameView_initTitleCell)(struct objc_super *, SEL, id);
-
-static void MozFrameView_initTitleCell(id self, SEL sel, id cell)
-{
-  struct objc_super target;
-  target.receiver = self;
-  target.super_class = [self superclass];
-  NSFrameView_initTitleCell super = (NSFrameView_initTitleCell) objc_msgSendSuper;
-  super(&target, sel, cell);
-  if (cell) {
-    Class cellClass = [cell class];
-    if (!gMozTitleCellClass) {
-      Class newClass = objc_allocateClassPair(cellClass,
-                                              "MozTitleCell", 0);
-      if (newClass) {
-        if ([cellClass instancesRespondToSelector:@selector(drawWithFrame:inView:)]) {
-          class_addMethod(newClass, @selector(drawWithFrame:inView:),
-                          (IMP)MozTitleCell_drawWithFrame,
-                          "v@:{_NSRect={_NSPoint=ff}{_NSSize=ff}}@");
-        }
-        objc_registerClassPair(newClass);
-        gMozTitleCellClass = newClass;
-      }
-    }
-    if (gMozTitleCellClass &&
-        cellClass == class_getSuperclass(gMozTitleCellClass)) {
-      object_setClass(cell, gMozTitleCellClass);
-    }
-  }
-}
-
-static int32_t MozFrameView_buttonBoxDisplayPixelsWidth(id self, SEL sel)
-{
-  NSRect buttonBox = NSZeroRect;
-  NSButton *closeButton = nil;
-  if ([self respondsToSelector:@selector(closeButton)]) {
-    closeButton = [self closeButton];
-  }
-  if (closeButton) {
-    NSRect closeButtonBox = [self convertRect:[closeButton bounds]
-                                     fromView:closeButton];
-    buttonBox = NSUnionRect(buttonBox, closeButtonBox);
-  }
-  NSButton *minimizeButton = nil;
-  if ([self respondsToSelector:@selector(minimizeButton)]) {
-    minimizeButton = [self minimizeButton];
-  }
-  if (minimizeButton) {
-    NSRect minimizeButtonBox = [self convertRect:[minimizeButton bounds]
-                                        fromView:minimizeButton];
-    buttonBox = NSUnionRect(buttonBox, minimizeButtonBox);
-  }
-  NSButton *zoomButton = nil;
-  if ([self respondsToSelector:@selector(zoomButton)]) {
-    zoomButton = [self zoomButton];
-  }
-  if (zoomButton) {
-    NSRect zoomButtonBox = [self convertRect:[zoomButton bounds]
-                                    fromView:zoomButton];
-    buttonBox = NSUnionRect(buttonBox, zoomButtonBox);
-  }
-  return rint(buttonBox.size.width);
-}
-
-static int32_t MozFrameView_fullScreenButtonDisplayPixelsWidth(id self, SEL sel)
-{
-  CGFloat floatWidth = 0;
-  NSButton *fullScreenButton = nil;
-  if ([self respondsToSelector:@selector(fullScreenButton)]) {
-    fullScreenButton = [self fullScreenButton];
-  }
-  if (fullScreenButton) {
-    floatWidth += [self convertSize:[fullScreenButton bounds].size
-                           fromView:fullScreenButton].width;
-  }
-  return rint(floatWidth);
-}
-
 @interface BaseWindow(Private)
 - (void)removeTrackingArea;
 - (void)cursorUpdated:(NSEvent*)aEvent;
 @end
 
+@interface NSView(FrameViewMethodSwizzling)
+- (void)FrameViewClass__drawTitleBar:(NSRect)aRect;
+@end
+
+@implementation NSView(FrameViewMethodSwizzling)
+
+- (void)FrameViewClass__drawTitleBar:(NSRect)aRect
+{
+  NSWindow* window = [self window];
+  if ([window isKindOfClass:[BaseWindow class]] &&
+      [(BaseWindow*)window drawsContentsIntoWindowFrame]) {
+    // Do not draw the title.
+    return;
+  }
+  [self FrameViewClass__drawTitleBar:aRect];
+}
+
+@end
+
+static NSMutableSet *gSwizzledFrameViewClasses = nil;
+
 @implementation BaseWindow
 
+// The frame of a window is implemented using undocumented NSView subclasses.
+// We disable window title drawing by overriding the _drawTitleBar: method on
+// these frame view classes. The class which is used for a window is
+// determined in the window's frameViewClassForStyleMask: method, so this is
+// where we make sure that we have swizzled the method on all encountered
+// classes.
 + (Class)frameViewClassForStyleMask:(NSUInteger)styleMask
 {
-  Class retval = [super frameViewClassForStyleMask:styleMask];
+  Class frameViewClass = [super frameViewClassForStyleMask:styleMask];
 
-  if (!gFrameViewClassesByStyleMask) {
-    gFrameViewClassesByStyleMask =
-      [[NSMutableDictionary dictionaryWithCapacity:3] retain];
-  }
-  if (!gFrameViewClassesByStyleMask) {
-    return retval;
-  }
-
-  NSString *styleMaskString =
-    [NSString stringWithFormat:@"%p", (void *) styleMask];
-  Class existingClass = (Class)
-    [gFrameViewClassesByStyleMask valueForKey:styleMaskString];
-  if (existingClass) {
-    retval = existingClass;
-  } else if (retval) {
-    char newClassName[32];
-    snprintf(newClassName, sizeof(newClassName) - 1, "MozFrameView%s",
-             [styleMaskString UTF8String]);
-    Class newClass = objc_allocateClassPair(retval, newClassName, 0);
-    if (newClass) {
-      if ([retval instancesRespondToSelector:@selector(initTitleCell:)]) {
-        class_addMethod(newClass, @selector(initTitleCell:),
-                        (IMP)MozFrameView_initTitleCell,
-                        "v@:@");
-      }
-      class_addMethod(newClass, @selector(buttonBoxDisplayPixelsWidth),
-                      (IMP)MozFrameView_buttonBoxDisplayPixelsWidth,
-                      "l@:");
-      class_addMethod(newClass, @selector(fullScreenButtonDisplayPixelsWidth),
-                      (IMP)MozFrameView_fullScreenButtonDisplayPixelsWidth,
-                      "l@:");
-      objc_registerClassPair(newClass);
-      [gFrameViewClassesByStyleMask setValue:newClass forKey:styleMaskString];
-      retval = newClass;
+  if (!gSwizzledFrameViewClasses) {
+    gSwizzledFrameViewClasses = [[NSMutableSet setWithCapacity:3] retain];
+    if (!gSwizzledFrameViewClasses) {
+      return frameViewClass;
     }
   }
 
-  return retval;
+  if (![gSwizzledFrameViewClasses containsObject:frameViewClass]) {
+    nsToolkit::SwizzleMethods(frameViewClass, @selector(_drawTitleBar:),
+                              @selector(FrameViewClass__drawTitleBar:));
+    [gSwizzledFrameViewClasses addObject:frameViewClass];
+  }
+
+  return frameViewClass;
 }
 
 - (id)initWithContentRect:(NSRect)aContentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)aBufferingType defer:(BOOL)aFlag
diff --git a/widget/cocoa/nsNativeThemeCocoa.mm b/widget/cocoa/nsNativeThemeCocoa.mm
index 80546334e225..f308fa644f01 100644
--- a/widget/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/cocoa/nsNativeThemeCocoa.mm
@@ -358,36 +358,27 @@ static NSWindow* NativeWindowForFrame(nsIFrame* aFrame,
   return (NSWindow*)topLevelWidget->GetNativeData(NS_NATIVE_WINDOW);
 }
 
-static NSView* FrameViewForFrame(nsIFrame* aFrame)
+static int32_t WindowButtonsReservedWidth(nsIFrame* aFrame)
 {
   NSWindow* window = NativeWindowForFrame(aFrame);
-  return [[window contentView] superview];
-}
-
-static int32_t ButtonBoxDisplayPixelsWidth(nsIFrame* aFrame)
-{
-  int32_t retval = 60;  // Default value;
-  NSView *frameView = FrameViewForFrame(aFrame);
-  if ([frameView respondsToSelector:@selector(buttonBoxDisplayPixelsWidth)]) {
-    int32_t measuredWidth = [frameView buttonBoxDisplayPixelsWidth];
-    if (measuredWidth) {
-      retval = measuredWidth;
-    }
+  if (!window) {
+    return 61; // fallback value
   }
-  return retval;
-}
 
-static int32_t FullScreenButtonDisplayPixelsWidth(nsIFrame* aFrame)
-{
-  int32_t retval = 20;  // Default value;
-  NSView *frameView = FrameViewForFrame(aFrame);
-  if ([frameView respondsToSelector:@selector(fullScreenButtonDisplayPixelsWidth)]) {
-    int32_t measuredWidth = [frameView fullScreenButtonDisplayPixelsWidth];
-    if (measuredWidth) {
-      retval = measuredWidth;
-    }
+  NSRect buttonBox = NSZeroRect;
+  NSButton* closeButton = [window standardWindowButton:NSWindowCloseButton];
+  if (closeButton) {
+    buttonBox = NSUnionRect(buttonBox, [closeButton frame]);
   }
-  return retval;
+  NSButton* minimizeButton = [window standardWindowButton:NSWindowMiniaturizeButton];
+  if (minimizeButton) {
+    buttonBox = NSUnionRect(buttonBox, [minimizeButton frame]);
+  }
+  NSButton* zoomButton = [window standardWindowButton:NSWindowZoomButton];
+  if (zoomButton) {
+    buttonBox = NSUnionRect(buttonBox, [zoomButton frame]);
+  }
+  return int32_t(NSMaxX(buttonBox));
 }
 
 static BOOL FrameIsInActiveWindow(nsIFrame* aFrame)
@@ -2768,12 +2759,14 @@ nsNativeThemeCocoa::GetMinimumWidgetSize(nsRenderingContext* aContext,
     }
 
     case NS_THEME_WINDOW_BUTTON_BOX: {
-      aResult->SizeTo(ButtonBoxDisplayPixelsWidth(aFrame), 0);
+      aResult->SizeTo(WindowButtonsReservedWidth(aFrame), 0);
       break;
     }
 
     case NS_THEME_MOZ_MAC_FULLSCREEN_BUTTON: {
-      aResult->SizeTo(FullScreenButtonDisplayPixelsWidth(aFrame), 0);
+      // This value is hardcoded because it's needed before we can measure the
+      // position and size of the fullscreen button.
+      aResult->SizeTo(20, 0);
       break;
     }
 

From 7820f12e76c030d8804a3eca2a4b0d46aa0ea974 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 3 May 2013 20:46:21 -0400
Subject: [PATCH 078/230] Bug 868589 - Fix broken back button and other menu
 items after rough SocialMarks merge from m-c. r=MattN.

---
 browser/base/content/browser-customization.js |   2 +-
 browser/base/content/browser.xul              | 102 +++++++++---------
 2 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/browser/base/content/browser-customization.js b/browser/base/content/browser-customization.js
index e93602ba201a..ac8f3ca3db22 100644
--- a/browser/base/content/browser-customization.js
+++ b/browser/base/content/browser-customization.js
@@ -80,7 +80,7 @@ let CustomizationHandler = {
       URLBarSetURI();
       XULBrowserWindow.asyncUpdateUI();
       BookmarksMenuButton.updateStarState();
-      SocialShareButton.updateShareState();
+      SocialMark.updateMarkState();
     }
 
     TabsInTitlebar.allowedBy("customizing-toolbars", true);
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index f0e8c89afa46..818441a48d1b 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -637,6 +637,57 @@
                      onpopuphiding="WebrtcIndicator.clearPopup(this);"
                      oncommand="WebrtcIndicator.menuCommand(event.target);"/>
         </toolbarbutton>
+
+        <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">
+            <menupopup id="social-statusarea-popup">
+              <menuitem class="social-statusarea-user menuitem-iconic" pack="start" align="center"
+                        observes="socialBroadcaster_userDetails"
+                        oncommand="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();">
+                <image class="social-statusarea-user-portrait"
+                       observes="socialBroadcaster_userDetails"/>
+                <vbox>
+                  <label class="social-statusarea-loggedInStatus"
+                         observes="socialBroadcaster_userDetails"/>
+                </vbox>
+              </menuitem>
+  #ifndef XP_WIN
+              <menuseparator class="social-statusarea-separator"/>
+  #endif
+              <menuitem class="social-toggle-sidebar-menuitem"
+                        type="checkbox"
+                        autocheck="false"
+                        command="Social:ToggleSidebar"
+                        label="&social.toggleSidebar.label;"
+                        accesskey="&social.toggleSidebar.accesskey;"/>
+              <menuitem class="social-toggle-notifications-menuitem"
+                        type="checkbox"
+                        autocheck="false"
+                        command="Social:ToggleNotifications"
+                        label="&social.toggleNotifications.label;"
+                        accesskey="&social.toggleNotifications.accesskey;"/>
+              <menuitem class="social-toggle-menuitem" command="Social:Toggle"/>
+              <menuseparator class="social-statusarea-separator"/>
+              <menuseparator class="social-provider-menu" hidden="true"/>
+              <menuitem class="social-addons-menuitem" command="Social:Addons"
+                        label="&social.addons.label;"/>
+              <menuitem label="&social.learnMore.label;"
+                        accesskey="&social.learnMore.accesskey;"
+                        oncommand="SocialUI.showLearnMore();"/>
+            </menupopup>
+          </toolbarbutton>
+          <toolbarbutton id="social-mark-button"
+                         class="toolbarbutton-1"
+                         command="Social:TogglePageMark"/>
+        </toolbaritem>
       </hbox>
 
       <toolbaritem id="PanelUI-button"
@@ -908,57 +959,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">
-          <menupopup id="social-statusarea-popup">
-            <menuitem class="social-statusarea-user menuitem-iconic" pack="start" align="center"
-                      observes="socialBroadcaster_userDetails"
-                      oncommand="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();">
-              <image class="social-statusarea-user-portrait"
-                     observes="socialBroadcaster_userDetails"/>
-              <vbox>
-                <label class="social-statusarea-loggedInStatus"
-                       observes="socialBroadcaster_userDetails"/>
-              </vbox>
-            </menuitem>
-#ifndef XP_WIN
-            <menuseparator class="social-statusarea-separator"/>
-#endif
-            <menuitem class="social-toggle-sidebar-menuitem"
-                      type="checkbox"
-                      autocheck="false"
-                      command="Social:ToggleSidebar"
-                      label="&social.toggleSidebar.label;"
-                      accesskey="&social.toggleSidebar.accesskey;"/>
-            <menuitem class="social-toggle-notifications-menuitem"
-                      type="checkbox"
-                      autocheck="false"
-                      command="Social:ToggleNotifications"
-                      label="&social.toggleNotifications.label;"
-                      accesskey="&social.toggleNotifications.accesskey;"/>
-            <menuitem class="social-toggle-menuitem" command="Social:Toggle"/>
-            <menuseparator class="social-statusarea-separator"/>
-            <menuseparator class="social-provider-menu" hidden="true"/>
-            <menuitem class="social-addons-menuitem" command="Social:Addons"
-                      label="&social.addons.label;"/>
-            <menuitem label="&social.learnMore.label;"
-                      accesskey="&social.learnMore.accesskey;"
-                      oncommand="SocialUI.showLearnMore();"/>
-          </menupopup>
-        </toolbarbutton>
-        <toolbarbutton id="social-mark-button"
-                       class="toolbarbutton-1"
-                       command="Social:TogglePageMark"/>
-      </toolbaritem>
-
       <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                      label="&printButton.label;" command="cmd_print"
                      tooltiptext="&printButton.tooltip;"/>

From 72eb2c541fa15839f6a21da0238f17ae69ea3a67 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 3 May 2013 23:12:40 -0400
Subject: [PATCH 079/230] Bug 868699 - XML Parsing Error on UX branch start on
 Linux. r=bustage-fix.

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

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 818441a48d1b..80b745ab3f32 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -859,6 +859,7 @@
 #ifdef XP_MACOSX
       <hbox class="titlebar-placeholder" type="fullscreen-button"
             ordinal="1000"/>
+#endif
 #endif
     </toolbar>
 

From 49469ddd3c0c73d1124ffb9a87e75364d17f509d Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Wed, 1 May 2013 15:26:36 +0200
Subject: [PATCH 080/230] Bug 866836 - Create 'Private Browsing' widget,
 r=mconley

---
 .../customizableui/src/CustomizableUI.jsm     | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 8be5692158e5..f24f37ce7f3e 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -179,6 +179,25 @@ XPCOMUtils.defineLazyGetter(this, "gBuiltInWidgets", function() {
     onViewHiding: function(aEvent) {
       LOG("History view is being hidden!");
     }
+  }, {
+    id: "privatebrowsing-button",
+    name: "Private Browsing\u2026",
+    description: "Open a new Private Browsing window",
+    defaultArea: CustomizableUI.AREA_PANEL,
+    allowedAreas: [CustomizableUI.AREA_PANEL],
+    icons: {
+      "16": "chrome://branding/content/icon16.png",
+      "32": "chrome://branding/content/icon48.png",
+      "48": "chrome://branding/content/icon48.png"
+    },
+    onCommand: function(e) {
+      if (e.target && e.target.ownerDocument && e.target.ownerDocument.defaultView) {
+        let win = e.target.ownerDocument.defaultView;
+        if (typeof win.OpenBrowserWindow == "function") {
+          win.OpenBrowserWindow({private: true});
+        }
+      }
+    }
   }];
 });
 
@@ -250,6 +269,7 @@ let gDefaultPlacements = new Map([
   ]],
   ["PanelUI-contents", [
     "new-window-button",
+    "privatebrowsing-button",
     "print-button",
     "history-button",
     "fullscreen-button",

From edff66e707d103557c5f6fd87b4e8b25c15dd2e2 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Mon, 6 May 2013 14:33:15 -0400
Subject: [PATCH 081/230] Bug 869084 - Unreadable text color in selected tab
 when using default theme on Linux GTK. r=MattN.

---
 browser/themes/linux/browser.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 31ef352f70fa..ede338f6fea6 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -1553,7 +1553,7 @@ toolbar[iconsize="small"] #bookmarks-menu-button[starred],
                     @fgTabTexture@;
 }
 
-.tabbrowser-tab {
+.tabbrowser-tab:-moz-lwtheme {
   color: inherit;
 }
 

From 15fa958912fc86a209539f68d930fc741e9a0c9b Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Wed, 1 May 2013 17:10:56 +0200
Subject: [PATCH 082/230] Bug 853083 - tabs have too much left margin,
 r=mconley

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

diff --git a/browser/themes/windows/browser-aero.css b/browser/themes/windows/browser-aero.css
index 70585a0281aa..ffced48e015d 100644
--- a/browser/themes/windows/browser-aero.css
+++ b/browser/themes/windows/browser-aero.css
@@ -204,8 +204,8 @@
   }
 
   #main-window[sizemode=normal] #TabsToolbar[tabsontop=true] {
-    padding-left: 4px;
-    padding-right: 4px;
+    padding-left: 1px;
+    padding-right: 1px;
   }
 
   #main-window[sizemode=normal] #TabsToolbar[tabsontop=false] {

From cd38ac606e5277418a1e8c0faaf80112b8eb47a4 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Mon, 6 May 2013 11:33:55 -0400
Subject: [PATCH 083/230] Bug 868993 - Fix unresponsive Script warning at
 CustomizableUI.jsm:436 on start-up. r=jaws.

---
 browser/components/customizableui/src/CustomizableUI.jsm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index f24f37ce7f3e..0beafe0445ad 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -448,7 +448,8 @@ let CustomizableUIInternal = {
       let palette = aAreaNode.toolbox ? aAreaNode.toolbox.palette : null;
       let limit = currentNode.previousSibling;
       let node = container.lastChild;
-      while (node != limit) {
+      while (node && node != limit) {
+        let previousSibling = node.previousSibling;
         // Nodes opt-in to removability. If they're removable, and we haven't
         // seen them in the placements array, then we toss them into the palette
         // if one exists. If no palette exists, we just remove the node. If the
@@ -460,7 +461,7 @@ let CustomizableUIInternal = {
             container.removeChild(node);
           }
         }
-        node = node.previousSibling;
+        node = previousSibling;
       }
     }
   },

From 5ba00ea76d615ad6f5f8494eb91707ba135f5508 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Mon, 6 May 2013 11:36:17 -0400
Subject: [PATCH 084/230] Bug 863753 - Retire the Firefox appmenu button.
 r=MattN.

---
 browser/base/content/browser-appmenu.inc      | 400 ----------------
 browser/base/content/browser-fullScreen.js    |   2 +-
 browser/base/content/browser.css              |  34 --
 browser/base/content/browser.js               |  79 +--
 browser/base/content/browser.xul              |  38 --
 browser/base/content/test/Makefile.in         |   1 -
 .../base/content/test/browser_addon_bar.js    |  10 +-
 .../base/content/test/browser_bug616836.js    |   4 -
 browser/base/content/urlbarBindings.xml       | 114 -----
 .../locales/en-US/chrome/browser/browser.dtd  |  12 -
 browser/themes/linux/browser.css              |  62 ---
 browser/themes/windows/appmenu-dropmarker.png | Bin 262 -> 0 bytes
 browser/themes/windows/appmenu-icons.png      | Bin 2115 -> 0 bytes
 browser/themes/windows/browser-aero.css       |  99 ----
 browser/themes/windows/browser.css            | 453 ------------------
 browser/themes/windows/jar.mn                 |   4 -
 16 files changed, 12 insertions(+), 1300 deletions(-)
 delete mode 100644 browser/base/content/browser-appmenu.inc
 delete mode 100644 browser/base/content/test/browser_bug616836.js
 delete mode 100644 browser/themes/windows/appmenu-dropmarker.png
 delete mode 100644 browser/themes/windows/appmenu-icons.png

diff --git a/browser/base/content/browser-appmenu.inc b/browser/base/content/browser-appmenu.inc
deleted file mode 100644
index f6cd13d40eb9..000000000000
--- a/browser/base/content/browser-appmenu.inc
+++ /dev/null
@@ -1,400 +0,0 @@
-# -*- Mode: HTML -*-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-<menupopup id="appmenu-popup"
-           onpopupshowing="if (event.target == this) {
-                             updateEditUIVisibility();
-#ifdef MOZ_SERVICES_SYNC
-                             gSyncUI.updateUI();
-#endif
-                             return;
-                           }
-                           updateCharacterEncodingMenuState();
-                           if (event.target.parentNode.parentNode.parentNode.parentNode == this)
-                             this._currentPopup = event.target;">
-  <hbox>
-    <vbox id="appmenuPrimaryPane">
-      <splitmenu id="appmenu_newTab"
-                 label="&tabCmd.label;"
-                 command="cmd_newNavigatorTab">
-          <menupopup>
-            <menuitem id="appmenu_newTab_popup"
-                      label="&tabCmd.label;"
-                      command="cmd_newNavigatorTab"
-                      key="key_newNavigatorTab"/>
-            <menuitem id="appmenu_newNavigator"
-                      label="&newNavigatorCmd.label;"
-                      command="cmd_newNavigator"
-                      key="key_newNavigator"/>
-            <menuseparator/>
-            <menuitem id="appmenu_openFile"
-                      label="&openFileCmd.label;"
-                      command="Browser:OpenFile"
-                      key="openFileKb"/>
-          </menupopup>
-      </splitmenu>
-      <menuitem id="appmenu_newPrivateWindow"
-                class="menuitem-iconic menuitem-iconic-tooltip"
-                label="&newPrivateWindow.label;"
-                command="Tools:PrivateBrowsing"
-                key="key_privatebrowsing"/>
-      <menuitem label="&goOfflineCmd.label;"
-                id="appmenu_offlineModeRecovery"
-                type="checkbox"
-                observes="workOfflineMenuitemState"
-                oncommand="BrowserOffline.toggleOfflineStatus();"/>
-      <menuseparator class="appmenu-menuseparator"/>
-      <hbox>
-        <menuitem id="appmenu-edit-label"
-                  label="&appMenuEdit.label;"
-                  disabled="true"/>
-        <toolbarbutton id="appmenu-cut"
-                       class="appmenu-edit-button"
-                       command="cmd_cut"
-                       onclick="if (!this.disabled) hidePopup();"
-                       tooltiptext="&cutButton.tooltip;"/>
-        <toolbarbutton id="appmenu-copy"
-                       class="appmenu-edit-button"
-                       command="cmd_copy"
-                       onclick="if (!this.disabled) hidePopup();"
-                       tooltiptext="&copyButton.tooltip;"/>
-        <toolbarbutton id="appmenu-paste"
-                       class="appmenu-edit-button"
-                       command="cmd_paste"
-                       onclick="if (!this.disabled) hidePopup();"
-                       tooltiptext="&pasteButton.tooltip;"/>
-        <spacer flex="1"/>
-        <menu id="appmenu-editmenu">
-          <menupopup id="appmenu-editmenu-menupopup">
-            <menuitem id="appmenu-editmenu-cut"
-                      class="menuitem-iconic"
-                      label="&cutCmd.label;"
-                      key="key_cut"
-                      command="cmd_cut"/>
-            <menuitem id="appmenu-editmenu-copy"
-                      class="menuitem-iconic"
-                      label="&copyCmd.label;"
-                      key="key_copy"
-                      command="cmd_copy"/>
-            <menuitem id="appmenu-editmenu-paste"
-                      class="menuitem-iconic"
-                      label="&pasteCmd.label;"
-                      key="key_paste"
-                      command="cmd_paste"/>
-            <menuseparator/>
-            <menuitem id="appmenu-editmenu-undo"
-                      label="&undoCmd.label;"
-                      key="key_undo"
-                      command="cmd_undo"/>
-            <menuitem id="appmenu-editmenu-redo"
-                      label="&redoCmd.label;"
-                      key="key_redo"
-                      command="cmd_redo"/>
-            <menuseparator/>
-            <menuitem id="appmenu-editmenu-selectAll"
-                      label="&selectAllCmd.label;"
-                      key="key_selectAll"
-                      command="cmd_selectAll"/>
-            <menuseparator/>
-            <menuitem id="appmenu-editmenu-delete"
-                      label="&deleteCmd.label;"
-                      key="key_delete"
-                      command="cmd_delete"/>
-          </menupopup>
-        </menu>
-      </hbox>
-      <menuitem id="appmenu_find"
-                class="menuitem-tooltip"
-                label="&appMenuFind.label;"
-                command="cmd_find"
-                key="key_find"/>
-      <menuseparator class="appmenu-menuseparator"/>
-      <menuitem id="appmenu_savePage"
-                class="menuitem-tooltip"
-                label="&savePageCmd.label;"
-                command="Browser:SavePage"
-                key="key_savePage"/>
-      <menuitem id="appmenu_sendLink"
-                label="&emailPageCmd.label;"
-                command="Browser:SendLink"/>
-      <splitmenu id="appmenu_print"
-                 iconic="true"
-                 label="&printCmd.label;"
-                 command="cmd_print">
-          <menupopup>
-            <menuitem id="appmenu_print_popup"
-                      class="menuitem-iconic"
-                      label="&printCmd.label;"
-                      command="cmd_print"
-                      key="printKb"/>
-            <menuitem id="appmenu_printPreview"
-                      label="&printPreviewCmd.label;"
-                      command="cmd_printPreview"/>
-            <menuitem id="appmenu_printSetup"
-                      label="&printSetupCmd.label;"
-                      command="cmd_pageSetup"/>
-          </menupopup>
-      </splitmenu>
-      <menuseparator class="appmenu-menuseparator"/>
-      <splitmenu id="appmenu_webDeveloper"
-                 command="Tools:DevToolbox"
-                 label="&appMenuWebDeveloper.label;">
-        <menupopup id="appmenu_webDeveloper_popup">
-          <menuitem id="appmenu_devToolbox"
-                    observes="devtoolsMenuBroadcaster_DevToolbox"/>
-          <menuseparator id="appmenu_devtools_separator"/>
-          <menuitem id="appmenu_devToolbar"
-                    observes="devtoolsMenuBroadcaster_DevToolbar"/>
-          <menuitem id="appmenu_chromeDebugger"
-                    observes="devtoolsMenuBroadcaster_ChromeDebugger"/>
-          <menuitem id="appmenu_browserConsole"
-                    observes="devtoolsMenuBroadcaster_BrowserConsole"/>
-          <menuitem id="appmenu_responsiveUI"
-                    observes="devtoolsMenuBroadcaster_ResponsiveUI"/>
-          <menuitem id="appmenu_scratchpad"
-                    observes="devtoolsMenuBroadcaster_Scratchpad"/>
-          <menuitem id="appmenu_pageSource"
-                    observes="devtoolsMenuBroadcaster_PageSource"/>
-          <menuitem id="appmenu_errorConsole"
-                    observes="devtoolsMenuBroadcaster_ErrorConsole"/>
-          <menuitem id="appmenu_devtools_connect"
-                    observes="devtoolsMenuBroadcaster_connect"/>
-          <menuseparator id="appmenu_devToolsEndSeparator"/>
-          <menuitem id="appmenu_getMoreDevtools"
-                    observes="devtoolsMenuBroadcaster_GetMoreTools"/>
-          <menuseparator/>
-#define ID_PREFIX appmenu_developer_
-#define OMIT_ACCESSKEYS
-#include browser-charsetmenu.inc
-#undef ID_PREFIX
-#undef OMIT_ACCESSKEYS
-          <menuitem label="&goOfflineCmd.label;"
-                    type="checkbox"
-                    observes="workOfflineMenuitemState"
-                    oncommand="BrowserOffline.toggleOfflineStatus();"/>
-        </menupopup>
-      </splitmenu>
-      <menuseparator class="appmenu-menuseparator"/>
-#define ID_PREFIX appmenu_
-#define OMIT_ACCESSKEYS
-#include browser-charsetmenu.inc
-#undef ID_PREFIX
-#undef OMIT_ACCESSKEYS
-      <menuitem id="appmenu_fullScreen"
-                class="menuitem-tooltip"
-                label="&fullScreenCmd.label;"
-                type="checkbox"
-                observes="View:FullScreen"
-                key="key_fullScreen"/>
-#ifdef MOZ_SERVICES_SYNC
-      <!-- only one of sync-setup or sync-syncnow will be showing at once -->
-      <menuitem id="sync-setup-appmenu"
-                label="&syncSetup.label;"
-                observes="sync-setup-state"
-                oncommand="gSyncUI.openSetup()"/>
-      <menuitem id="sync-syncnowitem-appmenu"
-                label="&syncSyncNowItem.label;"
-                observes="sync-syncnow-state"
-                oncommand="gSyncUI.doSync(event);"/>
-#endif
-      <menuitem id="appmenu-quit"
-                class="menuitem-iconic"
-#ifdef XP_WIN
-                label="&quitApplicationCmdWin.label;"
-#else
-                label="&quitApplicationCmd.label;"
-#endif
-                command="cmd_quitApplication"/>
-    </vbox>
-    <vbox id="appmenuSecondaryPane">
-      <splitmenu id="appmenu_bookmarks"
-                 iconic="true"
-                 label="&bookmarksMenu.label;"
-                 command="Browser:ShowAllBookmarks">
-          <menupopup id="appmenu_bookmarksPopup"
-                     placespopup="true"
-                     context="placesContext"
-                     openInTabs="children"
-                     oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);"
-                     onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);"
-                     onpopupshowing="BookmarksMenuButton.onPopupShowing(event);
-                                     if (!this.parentNode._placesView)
-                                       new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');"
-                     tooltip="bhTooltip"
-                     popupsinherittooltip="true">
-            <menuitem id="appmenu_showAllBookmarks"
-                      label="&showAllBookmarks2.label;"
-                      command="Browser:ShowAllBookmarks"
-                      context=""
-                      key="manBookmarkKb"/>
-            <menuseparator/>
-            <menuitem id="appmenu_bookmarkThisPage"
-                      class="menuitem-iconic"
-                      label="&bookmarkThisPageCmd.label;"
-                      command="Browser:AddBookmarkAs"
-                      key="addBookmarkAsKb"/>
-            <menuitem id="appmenu_subscribeToPage"
-                      class="menuitem-iconic"
-                      label="&subscribeToPageMenuitem.label;"
-                      oncommand="return FeedHandler.subscribeToFeed(null, event);"
-                      onclick="checkForMiddleClick(this, event);"
-                      observes="singleFeedMenuitemState"/>
-            <menu id="appmenu_subscribeToPageMenu"
-                  class="menu-iconic"
-                  label="&subscribeToPageMenupopup.label;"
-                  observes="multipleFeedsMenuState">
-              <menupopup id="appmenu_subscribeToPageMenupopup"
-                         onpopupshowing="return FeedHandler.buildFeedList(event.target);"
-                         oncommand="return FeedHandler.subscribeToFeed(null, event);"
-                         onclick="checkForMiddleClick(this, event);"/>
-            </menu>
-            <menuseparator/>
-            <menu id="appmenu_bookmarksToolbar"
-                  placesanonid="toolbar-autohide"
-                  class="menu-iconic bookmark-item"
-                  label="&personalbarCmd.label;"
-                  container="true">
-              <menupopup id="appmenu_bookmarksToolbarPopup"
-                         placespopup="true"
-                         context="placesContext"
-                         onpopupshowing="if (!this.parentNode._placesView)
-                                           new PlacesMenu(event, 'place:folder=TOOLBAR');"/>
-            </menu>
-            <menuseparator/>
-            <!-- Bookmarks menu items -->
-            <menuseparator builder="end"
-                           class="hide-if-empty-places-result"/>
-            <menuitem id="appmenu_unsortedBookmarks"
-                      label="&appMenuUnsorted.label;"
-                      oncommand="PlacesCommandHook.showPlacesOrganizer('UnfiledBookmarks');"
-                      class="menuitem-iconic"/>
-          </menupopup>
-      </splitmenu>
-      <splitmenu id="appmenu_history"
-                 iconic="true"
-                 label="&historyMenu.label;"
-                 command="Browser:ShowAllHistory">
-          <menupopup id="appmenu_historyMenupopup"
-                     placespopup="true"
-                     oncommand="this.parentNode._placesView._onCommand(event);"
-                     onclick="checkForMiddleClick(this, event);"
-                     onpopupshowing="if (!this.parentNode._placesView)
-                                       new HistoryMenu(event);"
-                     tooltip="bhTooltip"
-                     popupsinherittooltip="true">
-            <menuitem id="appmenu_showAllHistory"
-                      label="&showAllHistoryCmd2.label;"
-                      command="Browser:ShowAllHistory"
-                      key="showAllHistoryKb"/>
-            <menuseparator/>
-            <menuitem id="appmenu_sanitizeHistory"
-                      label="&clearRecentHistory.label;"
-                      key="key_sanitize"
-                      command="Tools:Sanitize"/>
-            <menuseparator class="hide-if-empty-places-result"/>
-#ifdef MOZ_SERVICES_SYNC
-            <menuitem id="appmenu_sync-tabs"
-                      class="syncTabsMenuItem"
-                      label="&syncTabsMenu2.label;"
-                      oncommand="BrowserOpenSyncTabs();"
-                      disabled="true"/>
-#endif
-            <menuitem id="appmenu_restoreLastSession"
-                      label="&historyRestoreLastSession.label;"
-                      command="Browser:RestoreLastSession"/>
-            <menu id="appmenu_recentlyClosedTabsMenu"
-                  class="recentlyClosedTabsMenu"
-                  label="&historyUndoMenu.label;"
-                  disabled="true">
-              <menupopup id="appmenu_recentlyClosedTabsMenupopup"
-                         onpopupshowing="document.getElementById('appmenu_history')._placesView.populateUndoSubmenu();"/>
-            </menu>
-            <menu id="appmenu_recentlyClosedWindowsMenu"
-                  class="recentlyClosedWindowsMenu"
-                  label="&historyUndoWindowMenu.label;"
-                  disabled="true">
-              <menupopup id="appmenu_recentlyClosedWindowsMenupopup"
-                         onpopupshowing="document.getElementById('appmenu_history')._placesView.populateUndoWindowSubmenu();"/>
-            </menu>
-            <menuseparator/>
-          </menupopup>
-      </splitmenu>
-      <menuitem id="appmenu_downloads"
-                class="menuitem-tooltip"
-                label="&downloads.label;"
-                command="Tools:Downloads"
-                key="key_openDownloads"/>
-      <spacer id="appmenuSecondaryPane-spacer"/>
-      <menuitem id="appmenu_addons"
-                class="menuitem-iconic menuitem-iconic-tooltip"
-                label="&addons.label;"
-                command="Tools:Addons"
-                key="key_openAddons"/>
-      <splitmenu id="appmenu_customize"
-#ifdef XP_UNIX
-                 label="&preferencesCmdUnix.label;"
-#else
-                 label="&preferencesCmd2.label;"
-#endif
-                 oncommand="openPreferences();">
-          <menupopup id="appmenu_customizeMenu"
-                     onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('appmenu_toggleToolbarsSeparator'));">
-            <menuitem id="appmenu_preferences"
-#ifdef XP_UNIX
-                      label="&preferencesCmdUnix.label;"
-#else
-                      label="&preferencesCmd2.label;"
-#endif
-                      oncommand="openPreferences();"/>
-            <menuseparator/>
-            <menuseparator id="appmenu_toggleToolbarsSeparator"/>
-            <menuitem id="appmenu_toggleTabsOnTop"
-                      label="&viewTabsOnTop.label;"
-                      type="checkbox"
-                      command="cmd_ToggleTabsOnTop"/>
-            <menuitem id="appmenu_toolbarLayout"
-                      label="&appMenuToolbarLayout.label;"
-                      command="cmd_CustomizeToolbars"/>
-          </menupopup>
-      </splitmenu>
-      <splitmenu id="appmenu_help"
-                 label="&helpMenu.label;"
-                 oncommand="openHelpLink('firefox-help')">
-          <menupopup id="appmenu_helpMenupopup">
-            <menuitem id="appmenu_openHelp"
-                      label="&helpMenu.label;"
-                      oncommand="openHelpLink('firefox-help')"
-                      onclick="checkForMiddleClick(this, event);"/>
-            <menuitem id="appmenu_gettingStarted"
-                      label="&appMenuGettingStarted.label;"
-                      oncommand="gBrowser.loadOneTab('http://www.mozilla.com/firefox/central/', {inBackground: false});"
-                      onclick="checkForMiddleClick(this, event);"/>
-#ifdef MOZ_SERVICES_HEALTHREPORT
-            <menuitem id="appmenu_healthReport"
-                      label="&healthReport.label;"
-                      oncommand="openHealthReport()"
-                      onclick="checkForMiddleClick(this, event);"/>
-#endif
-            <menuitem id="appmenu_troubleshootingInfo"
-                      label="&helpTroubleshootingInfo.label;"
-                      oncommand="openTroubleshootingPage()"
-                      onclick="checkForMiddleClick(this,event);"/>
-            <menuitem id="appmenu_feedbackPage"
-                      label="&helpFeedbackPage.label;"
-                      oncommand="openFeedbackPage()"
-                      onclick="checkForMiddleClick(this, event);"/>
-            <menuseparator/>
-            <menuitem id="appmenu_safeMode"
-                      label="&appMenuSafeMode.label;"
-                      oncommand="safeModeRestart();"/>
-            <menuseparator/>
-            <menuitem id="appmenu_about"
-                      label="&aboutProduct.label;"
-                      oncommand="openAboutDialog();"/>
-          </menupopup>
-      </splitmenu>
-    </vbox>
-  </hbox>
-</menupopup>
diff --git a/browser/base/content/browser-fullScreen.js b/browser/base/content/browser-fullScreen.js
index 0fa92a55f9fe..f2ff7274b294 100644
--- a/browser/base/content/browser-fullScreen.js
+++ b/browser/base/content/browser-fullScreen.js
@@ -17,7 +17,7 @@ var FullScreen = {
       enterFS = !enterFS;
 
     // Toggle the View:FullScreen command, which controls elements like the
-    // fullscreen menuitem, menubars, and the appmenu.
+    // fullscreen menuitem, and menubars.
     document.getElementById("View:FullScreen").setAttribute("checked", enterFS);
 
 #ifdef XP_MACOSX
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 4400e7e350a6..c01af1690a44 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -131,7 +131,6 @@ toolbar[printpreview="true"] {
   pointer-events: none;
 }
 
-#main-window[tabsintitlebar] #appmenu-button-container,
 #main-window[tabsintitlebar] #titlebar-buttonbox {
   position: relative;
 }
@@ -202,27 +201,6 @@ toolbar[printpreview="true"] {
   background-position: bottom left;
 }
 
-splitmenu {
-  -moz-binding: url("chrome://browser/content/urlbarBindings.xml#splitmenu");
-}
-
-.splitmenu-menuitem {
-  -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem");
-  list-style-image: inherit;
-  -moz-image-region: inherit;
-}
-
-.splitmenu-menuitem[iconic="true"] {
-  -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic");
-}
-
-.splitmenu-menu > .menu-text,
-:-moz-any(.splitmenu-menu, .splitmenu-menuitem) > .menu-accel-container,
-#appmenu-editmenu > .menu-text,
-#appmenu-editmenu > .menu-accel-container {
-  display: none;
-}
-
 .menuitem-tooltip {
   -moz-binding: url("chrome://browser/content/urlbarBindings.xml#menuitem-tooltip");
 }
@@ -233,18 +211,6 @@ splitmenu {
   -moz-binding: url("chrome://browser/content/urlbarBindings.xml#menuitem-iconic-tooltip");
 }
 
-%ifdef MENUBAR_CAN_AUTOHIDE
-%ifndef CAN_DRAW_IN_TITLEBAR
-#appmenu-toolbar-button > .toolbarbutton-text {
-  display: -moz-box;
-}
-%endif
-
-#appmenu_offlineModeRecovery:not([checked=true]) {
-  display: none;
-}
-%endif
-
 /* Hide menu elements intended for keyboard access support */
 #main-menubar[openedwithkey=false] .show-only-for-keyboard {
   display: none;
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index e1dab6c8a656..1a8f9a61e18a 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -943,8 +943,8 @@ var gBrowserInit = {
       goSetCommandEnabled("cmd_newNavigatorTab", false);
     }
 
-#ifdef MENUBAR_CAN_AUTOHIDE
-    updateAppButtonDisplay();
+#ifdef CAN_DRAW_IN_TITLEBAR
+    updateTitlebarDisplay();
 #endif
 
     // Misc. inits.
@@ -1235,15 +1235,6 @@ var gBrowserInit = {
       cmd.removeAttribute("hidden");
     }
 
-#ifdef MENUBAR_CAN_AUTOHIDE
-    // If the user (or the locale) hasn't enabled the top-level "Character
-    // Encoding" menu via the "browser.menu.showCharacterEncoding" preference,
-    // hide it.
-    if ("true" != gPrefService.getComplexValue("browser.menu.showCharacterEncoding",
-                                               Ci.nsIPrefLocalizedString).data)
-      document.getElementById("appmenu_charsetMenu").hidden = true;
-#endif
-
     // Enable Responsive UI?
     let responsiveUIEnabled = gPrefService.getBoolPref("devtools.responsiveUI.enabled");
     if (responsiveUIEnabled) {
@@ -1255,23 +1246,6 @@ var gBrowserInit = {
     // Add Devtools menuitems and listeners
     gDevToolsBrowser.registerBrowserWindow(window);
 
-    let appMenuButton = document.getElementById("appmenu-button");
-    let appMenuPopup = document.getElementById("appmenu-popup");
-    if (appMenuButton && appMenuPopup) {
-      let appMenuOpening = null;
-      appMenuButton.addEventListener("mousedown", function(event) {
-        if (event.button == 0)
-          appMenuOpening = new Date();
-      }, false);
-      appMenuPopup.addEventListener("popupshown", function(event) {
-        if (event.target != appMenuPopup || !appMenuOpening)
-          return;
-        let duration = new Date() - appMenuOpening;
-        appMenuOpening = null;
-        Services.telemetry.getHistogramById("FX_APP_MENU_OPEN_MS").add(duration);
-      }, false);
-    }
-
     window.addEventListener("mousemove", MousePosTracker, false);
     window.addEventListener("dragover", MousePosTracker, false);
 
@@ -2661,8 +2635,8 @@ var PrintPreviewListener = {
     if (this._chromeState.sidebarOpen)
       toggleSidebar(this._sidebarCommand);
 
-#ifdef MENUBAR_CAN_AUTOHIDE
-    updateAppButtonDisplay();
+#ifdef CAN_DRAW_IN_TITLEBAR
+    updateTitlebarDisplay();
 #endif
   },
   _hideChrome: function () {
@@ -3397,9 +3371,6 @@ function updateEditUIVisibility()
   let editMenuPopupState = document.getElementById("menu_EditPopup").state;
   let contextMenuPopupState = document.getElementById("contentAreaContextMenu").state;
   let placesContextMenuPopupState = document.getElementById("placesContext").state;
-#ifdef MENUBAR_CAN_AUTOHIDE
-  let appMenuPopupState = document.getElementById("appmenu-popup").state;
-#endif
 
   // The UI is visible if the Edit menu is opening or open, if the context menu
   // is open, or if the toolbar has been customized to include the Cut, Copy,
@@ -3410,10 +3381,6 @@ function updateEditUIVisibility()
                    contextMenuPopupState == "open" ||
                    placesContextMenuPopupState == "showing" ||
                    placesContextMenuPopupState == "open" ||
-#ifdef MENUBAR_CAN_AUTOHIDE
-                   appMenuPopupState == "showing" ||
-                   appMenuPopupState == "open" ||
-#endif
                    document.getElementById("cut-button") ||
                    document.getElementById("copy-button") ||
                    document.getElementById("paste-button") ? true : false;
@@ -3446,9 +3413,6 @@ function updateEditUIVisibility()
 function updateCharacterEncodingMenuState()
 {
   let charsetMenu = document.getElementById("charsetMenu");
-  let appCharsetMenu = document.getElementById("appmenu_charsetMenu");
-  let appDevCharsetMenu =
-    document.getElementById("appmenu_developer_charsetMenu");
   // gBrowser is null on Mac when the menubar shows in the context of
   // non-browser windows. The above elements may be null depending on
   // what parts of the menubar are present. E.g. no app menu on Mac.
@@ -3458,22 +3422,10 @@ function updateCharacterEncodingMenuState()
     if (charsetMenu) {
       charsetMenu.removeAttribute("disabled");
     }
-    if (appCharsetMenu) {
-      appCharsetMenu.removeAttribute("disabled");
-    }
-    if (appDevCharsetMenu) {
-      appDevCharsetMenu.removeAttribute("disabled");
-    }
   } else {
     if (charsetMenu) {
       charsetMenu.setAttribute("disabled", "true");
     }
-    if (appCharsetMenu) {
-      appCharsetMenu.setAttribute("disabled", "true");
-    }
-    if (appDevCharsetMenu) {
-      appDevCharsetMenu.setAttribute("disabled", "true");
-    }
   }
 }
 
@@ -4383,8 +4335,6 @@ function onViewToolbarsPopupShowing(aEvent, aInsertPoint) {
       menuItem.setAttribute("type", "checkbox");
       menuItem.setAttribute("label", toolbarName);
       menuItem.setAttribute("checked", toolbar.getAttribute(hidingAttribute) != "true");
-      if (popup.id != "appmenu_customizeMenu")
-        menuItem.setAttribute("accesskey", toolbar.getAttribute("accesskey"));
       if (popup.id != "toolbar-context-menu")
         menuItem.setAttribute("key", toolbar.getAttribute("key"));
 
@@ -4413,8 +4363,8 @@ function setToolbarVisibility(toolbar, isVisible) {
   BookmarksMenuButton.onToolbarVisibilityChange();
   gBrowser.updateWindowResizers();
 
-#ifdef MENUBAR_CAN_AUTOHIDE
-  updateAppButtonDisplay();
+#ifdef CAN_DRAW_IN_TITLEBAR
+  updateTitlebarDisplay();
 #endif
 }
 
@@ -4592,10 +4542,6 @@ var TabsInTitlebar = {
 
       function rect(ele)   ele.getBoundingClientRect();
 
-#ifdef MENUBAR_CAN_AUTOHIDE
-      let appmenuButtonBox  = $("appmenu-button-container");
-      this._sizePlaceholder("appmenu-button", rect(appmenuButtonBox).width);
-#endif
       let captionButtonsBox = $("titlebar-buttonbox");
       this._sizePlaceholder("caption-buttons", rect(captionButtonsBox).width);
 #ifdef XP_MACOSX
@@ -4689,14 +4635,8 @@ var TabsInTitlebar = {
   }
 };
 
-#ifdef MENUBAR_CAN_AUTOHIDE
-function updateAppButtonDisplay() {
-  var displayAppButton =
-    !gInPrintPreviewMode &&
-    window.menubar.visible &&
-    document.getElementById("toolbar-menubar").getAttribute("autohide") == "true";
-
 #ifdef CAN_DRAW_IN_TITLEBAR
+function updateTitlebarDisplay() {
   document.getElementById("titlebar").hidden = gInPrintPreviewMode;
 
   if (!gInPrintPreviewMode)
@@ -4705,10 +4645,6 @@ function updateAppButtonDisplay() {
     document.documentElement.removeAttribute("chromemargin");
 
   TabsInTitlebar.allowedBy("drawing-in-titlebar", !gInPrintPreviewMode);
-#else
-  document.getElementById("appmenu-toolbar-button").hidden =
-    !displayAppButton;
-#endif
 }
 #endif
 
@@ -6761,7 +6697,6 @@ let gPrivateBrowsingUI = {
         // Adjust the New Window menu entries
         [
           { normal: "menu_newNavigator", private: "menu_newPrivateWindow" },
-          { normal: "appmenu_newNavigator", private: "appmenu_newPrivateWindow" },
         ].forEach(function(menu) {
           let newWindow = document.getElementById(menu.normal);
           let newPrivateWindow = document.getElementById(menu.private);
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 80b745ab3f32..3eff1faae5f7 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -428,16 +428,6 @@
 #ifdef CAN_DRAW_IN_TITLEBAR
 <vbox id="titlebar">
   <hbox id="titlebar-content">
-#ifdef MENUBAR_CAN_AUTOHIDE
-    <hbox id="appmenu-button-container">
-      <button id="appmenu-button"
-              type="menu"
-              label="&brandShortName;"
-              style="-moz-user-focus: ignore;">
-#include browser-appmenu.inc
-      </button>
-    </hbox>
-#endif
     <spacer id="titlebar-spacer" flex="1"/>
     <hbox id="titlebar-buttonbox-container" align="start"
 #ifdef XP_MACOSX
@@ -480,10 +470,6 @@
       </toolbaritem>
 
 #ifdef CAN_DRAW_IN_TITLEBAR
-#ifdef MENUBAR_CAN_AUTOHIDE
-      <hbox class="titlebar-placeholder" type="appmenu-button" ordinal="0"/>
-#endif
-
       <hbox class="titlebar-placeholder" type="caption-buttons"
 #ifdef XP_MACOSX
             ordinal="0"
@@ -766,13 +752,6 @@
       </toolbaritem>
     </toolbar>
 
-#ifdef MENUBAR_CAN_AUTOHIDE
-#ifndef CAN_DRAW_IN_TITLEBAR
-#define APPMENU_ON_TABBAR
-#endif
-#endif
-
-
     <toolbar id="TabsToolbar"
              class="toolbar-primary"
              fullscreentoolbar="true"
@@ -781,23 +760,9 @@
              iconsize="small" defaulticonsize="small" lockiconsize="true"
              aria-label="&tabsToolbar.label;"
              context="toolbar-context-menu"
-#ifdef APPMENU_ON_TABBAR
-             defaultset="appmenu-toolbar-button,tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton"
-#else
              defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton"
-#endif
              collapsed="true">
 
-#ifdef APPMENU_ON_TABBAR
-      <toolbarbutton id="appmenu-toolbar-button"
-                     class="chromeclass-toolbar-additional"
-                     type="menu"
-                     label="&brandShortName;"
-                     tooltiptext="&appMenuButton.tooltip;">
-#include browser-appmenu.inc
-      </toolbarbutton>
-#endif
-
       <tabs id="tabbrowser-tabs"
             class="tabbrowser-tabs"
             tabbrowser="content"
@@ -845,9 +810,6 @@
                      tooltiptext="&closeTab.label;"/>
 
 #ifdef CAN_DRAW_IN_TITLEBAR
-#ifdef MENUBAR_CAN_AUTOHIDE
-      <hbox class="titlebar-placeholder" type="appmenu-button" ordinal="0"/>
-#endif
       <hbox class="titlebar-placeholder" type="caption-buttons"
 #ifdef XP_MACOSX
             ordinal="0"
diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index 86ef1b89a00c..8c010af5cbb3 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -137,7 +137,6 @@ _BROWSER_FILES = \
                  browser_bug598923.js \
                  browser_bug599325.js \
                  browser_bug609700.js \
-                 browser_bug616836.js \
                  browser_bug623155.js \
                  browser_bug623893.js \
                  browser_bug624734.js \
diff --git a/browser/base/content/test/browser_addon_bar.js b/browser/base/content/test/browser_addon_bar.js
index 3607eb1220cb..c91cd27997ba 100644
--- a/browser/base/content/test/browser_addon_bar.js
+++ b/browser/base/content/test/browser_addon_bar.js
@@ -13,9 +13,8 @@ function test() {
   function onTopMenuShown(event) {
     ok(1, "top menu popupshown listener called");
     event.currentTarget.removeEventListener("popupshown", arguments.callee, false);
-    // open the customize or toolbars menu
-    toolbarMenu = document.getElementById("appmenu_customizeMenu") ||
-                      document.getElementById("viewToolbarsMenu").firstElementChild;
+    // open the toolbars menu
+    toolbarMenu = document.getElementById("viewToolbarsMenu").firstElementChild;
     toolbarMenu.addEventListener("popupshown", onToolbarMenuShown, false);
     toolbarMenu.addEventListener("popuphidden", onToolbarMenuHidden, false);
     toolbarMenu.openPopup();
@@ -54,9 +53,8 @@ function test() {
     topMenu.hidePopup();
   }
 
-  // open the appmenu or view menu
-  topMenu = document.getElementById("appmenu-popup") ||
-            document.getElementById("menu_viewPopup");
+  // open the view menu
+  topMenu = document.getElementById("menu_viewPopup");
   topMenu.addEventListener("popupshown", onTopMenuShown, false);
   topMenu.addEventListener("popuphidden", onTopMenuHidden, false);
   topMenu.openPopup();
diff --git a/browser/base/content/test/browser_bug616836.js b/browser/base/content/test/browser_bug616836.js
deleted file mode 100644
index efaaa837ab0f..000000000000
--- a/browser/base/content/test/browser_bug616836.js
+++ /dev/null
@@ -1,4 +0,0 @@
-function test() {
-  is(document.querySelectorAll("#appmenu-popup [accesskey]").length, 0,
-     "there should be no items with access keys in the app menu popup");
-}
diff --git a/browser/base/content/urlbarBindings.xml b/browser/base/content/urlbarBindings.xml
index 76a902feaf89..6f81fcc392b5 100644
--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -1494,120 +1494,6 @@
     </implementation>
   </binding>
 
-  <binding id="splitmenu">
-    <content>
-      <xul:hbox anonid="menuitem" flex="1"
-                class="splitmenu-menuitem"
-                xbl:inherits="iconic,label,disabled,onclick=oncommand,_moz-menuactive=active"/>
-      <xul:menu anonid="menu" class="splitmenu-menu"
-                xbl:inherits="disabled,_moz-menuactive=active"
-                oncommand="event.stopPropagation();">
-        <children includes="menupopup"/>
-      </xul:menu>
-    </content>
-
-    <implementation implements="nsIDOMEventListener">
-      <constructor><![CDATA[
-        this._parentMenupopup.addEventListener("DOMMenuItemActive", this, false);
-        this._parentMenupopup.addEventListener("popuphidden", this, false);
-      ]]></constructor>
-
-      <destructor><![CDATA[
-        this._parentMenupopup.removeEventListener("DOMMenuItemActive", this, false);
-        this._parentMenupopup.removeEventListener("popuphidden", this, false);
-      ]]></destructor>
-
-      <field name="menuitem" readonly="true">
-        document.getAnonymousElementByAttribute(this, "anonid", "menuitem");
-      </field>
-      <field name="menu" readonly="true">
-        document.getAnonymousElementByAttribute(this, "anonid", "menu");
-      </field>
-
-      <field name="_menuDelay">600</field>
-
-      <field name="_parentMenupopup"><![CDATA[
-        this._getParentMenupopup(this);
-      ]]></field>
-
-      <method name="_getParentMenupopup">
-        <parameter name="aNode"/>
-        <body><![CDATA[
-          let node = aNode.parentNode;
-          while (node) {
-            if (node.localName == "menupopup")
-              break;
-            node = node.parentNode;
-          }
-          return node;
-        ]]></body>
-      </method>
-
-      <method name="handleEvent">
-        <parameter name="event"/>
-        <body><![CDATA[
-          switch (event.type) {
-            case "DOMMenuItemActive":
-              if (this.getAttribute("active") == "true" &&
-                  event.target != this &&
-                  this._getParentMenupopup(event.target) == this._parentMenupopup)
-                this.removeAttribute("active");
-              break;
-            case "popuphidden":
-              if (event.target == this._parentMenupopup)
-                this.removeAttribute("active");
-              break;
-          }
-        ]]></body>
-      </method>
-    </implementation>
-
-    <handlers>
-      <handler event="mouseover"><![CDATA[
-        if (this.getAttribute("active") != "true") {
-          this.setAttribute("active", "true");
-
-          let event = document.createEvent("Events");
-          event.initEvent("DOMMenuItemActive", true, false);
-          this.dispatchEvent(event);
-
-          if (this.getAttribute("disabled") != "true") {
-            let self = this;
-            setTimeout(function () {
-              if (self.getAttribute("active") == "true")
-                self.menu.open = true;
-            }, this._menuDelay);
-          }
-        }
-      ]]></handler>
-
-      <handler event="popupshowing"><![CDATA[
-        if (event.target == this.firstChild &&
-            this._parentMenupopup._currentPopup)
-          this._parentMenupopup._currentPopup.hidePopup();
-      ]]></handler>
-
-      <handler event="click" phase="capturing"><![CDATA[
-        if (this.getAttribute("disabled") == "true") {
-          // Prevent the command from being carried out
-          event.stopPropagation();
-          return;
-        }
-
-        let node = event.originalTarget;
-        while (true) {
-          if (node == this.menuitem)
-            break;
-          if (node == this)
-            return;
-          node = node.parentNode;
-        }
-
-        this._parentMenupopup.hidePopup();
-      ]]></handler>
-    </handlers>
-  </binding>
-
   <binding id="menuitem-tooltip" extends="chrome://global/content/bindings/menu.xml#menuitem">
     <implementation>
       <constructor><![CDATA[
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index a74c3cbd335b..1d3d8ffa6ea5 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -151,8 +151,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY bookmarksItem.title          "Bookmarks">
 
 <!-- Toolbar items --> 
-<!ENTITY appMenuButton.label          "Menu">
-<!ENTITY appMenuButton.tooltip        "Open &brandShortName; menu">
 <!ENTITY homeButton.label             "Home">
 
 <!ENTITY tabGroupsButton.label        "Tab Groups">
@@ -311,17 +309,7 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY showAllHistoryCmd2.label "Show All History">
 <!ENTITY showAllHistoryCmd.commandkey "H">
 
-<!ENTITY appMenuEdit.label "Edit">
 <!ENTITY appMenuCustomize.label "Customize">
-<!ENTITY appMenuToolbarLayout.label "Toolbar Layout…">
-<!ENTITY appMenuSidebars.label "Sidebars">
-<!ENTITY appMenuFind.label "Find…">
-<!ENTITY appMenuUnsorted.label "Unsorted Bookmarks">
-<!ENTITY appMenuWebDeveloper.label "Web Developer">
-<!ENTITY appMenuGettingStarted.label "Getting Started">
-<!ENTITY appMenuSafeMode.label "Restart with Add-ons Disabled…">
-<!ENTITY appMenuSafeMode.accesskey "R">
-<!ENTITY appMenuBack.label "Back">
 <!ENTITY appMenuBookmarks.label "Bookmarks">
 <!ENTITY appMenuHistory.label "History">
 <!ENTITY appMenuHistoryMore.label "More…">
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 435ed4928560..9da8f814af24 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -213,7 +213,6 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic");
 }
 
-#appmenu_newNavigator,
 #placesContext_open\:newwindow,
 #menu_newNavigator,
 #context-openlink,
@@ -222,8 +221,6 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   -moz-image-region: rect(0px 80px 16px 64px);
 }
 
-#appmenu_newTab,
-#appmenu_newTab_popup,
 #placesContext_open\:newtab,
 #placesContext_openContainer\:tabs,
 #menu_newNavigatorTab,
@@ -233,7 +230,6 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   -moz-image-region: rect(0px 64px 16px 48px);
 }
 
-#appmenu_openFile,
 #menu_openFile {
   list-style-image: url("moz-icon://stock/gtk-open?size=menu");
 }
@@ -250,7 +246,6 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   list-style-image: url("moz-icon://stock/gtk-media-pause?size=menu");
 }
 
-#appmenu_savePage,
 #menu_savePage,
 #context-savelink,
 #context-saveimage,
@@ -261,19 +256,15 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   list-style-image: url("moz-icon://stock/gtk-save-as?size=menu");
 }
 
-#appmenu_printPreview,
 #menu_printPreview {
   list-style-image: url("moz-icon://stock/gtk-print-preview?size=menu");
 }
 
-#appmenu_print,
-#appmenu_print_popup,
 #menu_print,
 #context-printframe {
   list-style-image: url("moz-icon://stock/gtk-print?size=menu");
 }
 
-#appmenu-quit,
 #menu_FileQuitItem {
   list-style-image: url("moz-icon://stock/gtk-quit?size=menu");
 }
@@ -356,7 +347,6 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   list-style-image: url("moz-icon://stock/gtk-select-all?size=menu");
 }
 
-#appmenu_find,
 #menu_find {
   list-style-image: url("moz-icon://stock/gtk-find?size=menu");
 }
@@ -365,8 +355,6 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   list-style-image: url("moz-icon://stock/gtk-find?size=menu&state=disabled");
 }
 
-#appmenu_customize,
-#appmenu_preferences,
 #menu_preferences {
   list-style-image: url("moz-icon://stock/gtk-preferences?size=menu");
 }
@@ -449,15 +437,11 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   list-style-image: url("moz-icon://stock/gtk-home?size=menu");
 }
 
-#appmenu_history,
-#appmenu_showAllHistory,
 #menu_showAllHistory {
   list-style-image: url("chrome://browser/skin/Toolbar-small.png");
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
-#appmenu_bookmarks,
-#appmenu_showAllBookmarks,
 #bookmarksShowAll {
   list-style-image: url("chrome://browser/skin/Toolbar-small.png");
   -moz-image-region: rect(0px 48px 16px 32px);
@@ -479,13 +463,11 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png");
 }
 
-#appmenu_downloads,
 #menu_openDownloads {
   list-style-image: url("chrome://browser/skin/Toolbar-small.png");
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
-#appmenu_addons,
 #menu_openAddons {
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
 }
@@ -496,8 +478,6 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   list-style-image: url("moz-icon://stock/gtk-info?size=menu");
 }
 
-#appmenu_privateBrowsing,
-#appmenu_newPrivateWindow,
 #privateBrowsingItem {
   list-style-image: url("chrome://browser/skin/Privacy-16.png");
 }
@@ -506,18 +486,14 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   list-style-image: url("moz-icon://stock/gtk-properties?size=menu");
 }
 
-#appmenu_sanitizeHistory,
 #sanitizeItem {
   list-style-image: url("moz-icon://stock/gtk-clear?size=menu");
 }
 
-#appmenu_help,
-#appmenu_openHelp,
 #menu_openHelp {
   list-style-image: url("moz-icon://stock/gtk-help?size=menu");
 }
 
-#appmenu_about,
 #aboutName {
   list-style-image: url("moz-icon://stock/gtk-about?size=menu");
 }
@@ -1772,44 +1748,6 @@ toolbarbutton.chevron > .toolbarbutton-icon {
   margin-top: 10px;
 }
 
-/* Application button menu */
-
-.splitmenu-menuitem {
-  -moz-margin-end: 1px;
-}
-
-#appmenu-toolbar-button:not(:hover):not([open]):not(:-moz-lwtheme) {
-  color: inherit;
-}
-
-#appmenu-toolbar-button > .toolbarbutton-text,
-#appmenu-toolbar-button > .toolbarbutton-menu-dropmarker {
-  margin-top: -2px !important;
-  margin-bottom: -2px !important;
-}
-#appmenuSecondaryPane {
-  -moz-border-start: 1px solid ThreeDShadow;
-}
-#appmenuSecondaryPane-spacer {
-  min-height: 1em;
-}
-#appmenu-cut,
-#appmenu-editmenu-cut {
-  list-style-image: url("moz-icon://stock/gtk-cut?size=menu");
-}
-#appmenu-copy,
-#appmenu-editmenu-copy {
-  list-style-image: url("moz-icon://stock/gtk-copy?size=menu");
-}
-#appmenu-paste,
-#appmenu-editmenu-paste {
-  list-style-image: url("moz-icon://stock/gtk-paste?size=menu");
-}
-#wrapper-appmenu-toolbar-button,
-.appmenu-edit-button[disabled="true"] {
-  opacity: .3;
-}
-
 /* Add-on bar */
 
 #addon-bar {
diff --git a/browser/themes/windows/appmenu-dropmarker.png b/browser/themes/windows/appmenu-dropmarker.png
deleted file mode 100644
index 27deaff72225a4c66865190405b071d728899d9c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 262
zcmeAS@N?(olHy`uVBq!ia0vp^oIuRZ!3HF6%}!4MQjEnx?oJHr&dIz4a@dl*-CY>|
zgW!U_%O?XxI14-?iy0VX6hN5qEdT6zKtc8rPhVH|TWnn18WzvmDt`cl+B{txLnJPj
zo;Tz=<iOx^arsIWtu+b~YqoIQbGB(}t%&naOkB#oq0_T0QkqrpufbU!9%JSn!;kaX
zmib<u6Xf+Vy7qp&L33r~wA~VqZR;;=dn*~Olh9$+QsAL!TXfFySjBO<*Wr9zIjdG#
zmBp5GE6N1yuW9aYWDSdW)Wv;iy*jJg`!;ib{x&zyo2EPMfi7b3boFyt=akR{0IJ<r
A=l}o!

diff --git a/browser/themes/windows/appmenu-icons.png b/browser/themes/windows/appmenu-icons.png
deleted file mode 100644
index 78f36581631f5a7ad49eac9fae3f029e914c7c49..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2115
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

diff --git a/browser/themes/windows/browser-aero.css b/browser/themes/windows/browser-aero.css
index 8c1b490fce10..70585a0281aa 100644
--- a/browser/themes/windows/browser-aero.css
+++ b/browser/themes/windows/browser-aero.css
@@ -11,32 +11,10 @@
 %define glassInactiveBorderColor rgb(102, 102, 102)
 
 @media not all and (-moz-windows-classic) {
-  #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container,
   #main-window[sizemode="normal"] > #tab-view-deck > #browser-panel > #navigator-toolbox > #toolbar-menubar {
     margin-top: 1px;
   }
 
-  #appmenu-button {
-    border-width: 2px;
-    -moz-border-left-colors: @appMenuButtonBorderColor@;
-    -moz-border-bottom-colors: @appMenuButtonBorderColor@;
-    -moz-border-right-colors: @appMenuButtonBorderColor@;
-    margin-bottom: 1px; /* compensate white outer border */
-    box-shadow: 0 1px 0 rgba(255,255,255,.25) inset,
-                0 0 2px 1px rgba(255,255,255,.25) inset;
-  }
-
-  #main-window[privatebrowsingmode=temporary] #appmenu-button {
-    -moz-border-left-colors: rgba(255,255,255,.5) rgba(43,8,65,.9);
-    -moz-border-bottom-colors: rgba(255,255,255,.5) rgba(43,8,65,.9);
-    -moz-border-right-colors: rgba(255,255,255,.5) rgba(43,8,65,.9);
-  }
-
-  #appmenu-popup {
-    margin-top: -1px;
-    -moz-margin-start: 1px;
-  }
-
   .panel-promo-message {
     font-style: italic;
   }
@@ -136,18 +114,10 @@
     -moz-border-top-colors: @glassInactiveBorderColor@ rgba(255,255,255,.6);
   }
 
-  #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container:-moz-lwtheme {
-    margin-top: -1px;
-  }
-
   #main-window[sizemode="normal"] #titlebar-buttonbox:-moz-lwtheme {
     margin-top: -2px;
   }
 
-  #appmenu-button {
-    margin-bottom: -1px; /* compensate white outer border */
-  }
-
   #toolbar-menubar:not(:-moz-lwtheme),
   #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme),
   #nav-bar[tabsontop=false]:not(:-moz-lwtheme),
@@ -407,72 +377,3 @@
 #close-button:-moz-locale-dir(rtl) {
   transform: scaleX(-1);
 }
-
-/* ::::: splitmenu highlight style that imitates Windows 7 start menu ::::: */
-@media (-moz-windows-default-theme) {
-  .splitmenu-menuitem,
-  .splitmenu-menu {
-    -moz-appearance: none;
-    padding-top: 2px;
-    padding-bottom: 2px;
-    border: 1px solid transparent;
-  }
-  .splitmenu-menuitem {
-    -moz-margin-end: 0;
-  }
-  .splitmenu-menu {
-    -moz-margin-start: -1px;
-  }
-  .splitmenu-menuitem:-moz-locale-dir(ltr),
-  .splitmenu-menu:-moz-locale-dir(rtl) {
-    border-top-left-radius: 3px;
-    border-bottom-left-radius: 3px;
-  }
-  .splitmenu-menu:-moz-locale-dir(ltr),
-  .splitmenu-menuitem:-moz-locale-dir(rtl) {
-    border-top-right-radius: 3px;
-    border-bottom-right-radius: 3px;
-  }
-
-  .splitmenu-menuitem > .menu-text {
-    -moz-margin-start: 1px !important;
-    -moz-margin-end: 3px !important;
-  }
-  .splitmenu-menu > .menu-right {
-    -moz-margin-end: -3px;
-  }
-
-  .splitmenu-menuitem[iconic],
-  .splitmenu-menu[iconic] {
-    padding-bottom: 1px;
-  }
-  .splitmenu-menuitem[iconic] > .menu-iconic-left {
-    margin-top: -3px;
-    margin-bottom: -2px;
-    -moz-margin-start: -1px;
-  }
-  .splitmenu-menuitem[iconic] > .menu-iconic-text {
-    -moz-margin-start: 2px !important;
-    -moz-margin-end: 3px !important;
-  }
-  .splitmenu-menu[iconic] > .menu-right {
-    margin-top: -1px;
-  }
-
-  .splitmenu-menuitem[_moz-menuactive],
-  .splitmenu-menu[_moz-menuactive] {
-    background-color: transparent;
-    background-image: linear-gradient(#fafbfd, #ebf3fd);
-    border-color: #aeccf1;
-  }
-
-  .splitmenu-menuitem[disabled][_moz-menuactive],
-  .splitmenu-menu[disabled][_moz-menuactive] {
-    background-image: linear-gradient(#f8f9f9, #eaeaea);
-    border-color: #d8d7d7;
-  }
-
-  .splitmenu-menu[_moz-menuactive]:not(:hover):not([open]) {
-    background-image: none;
-  }
-}
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 60ee3aed6fc2..d99901b09694 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -18,16 +18,6 @@
 %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])) > #nav-bar-customizationtarget > #unified-back-forward-button
 %define conditionalForwardWithUrlbarWidth 27
 
-%ifdef MOZ_OFFICIAL_BRANDING
-%define appMenuButtonBorderColor rgba(255,255,255,.5) rgba(83,42,6,.9)
-%else
-%if MOZ_UPDATE_CHANNEL == aurora
-%define appMenuButtonBorderColor hsla(0,0%,100%,.5) hsla(214,89%,21%,.9)
-%else
-%define appMenuButtonBorderColor hsla(0,0%,100%,.5) hsla(210,59%,13%,.9)
-%endif
-%endif
-
 #menubar-items {
   -moz-box-orient: vertical; /* for flex hack */
 }
@@ -124,446 +114,14 @@
   background-color: -moz-dialog;
 }
 
-/* ::::: app menu button ::::: */
-
-/* The app menu button must appear on top of the navigator-toolbox in order
- * for click and hover mouse events to work properly for the button in the
- * restored window state. Otherwise, elements in the navigator-toolbox, like the
- * menubar can swallow these events. It will also place the button above the
- * fog on themes with Aero Glass.
- */
-#main-window[tabsintitlebar] #appmenu-button-container {
-  z-index: 1;
-}
-
-#appmenu-button {
-  -moz-appearance: none;
-  background-clip: padding-box;
-  border-radius: 0 0 4px 4px;
-  border: 1px solid;
-  border-top: none;
-  color: white;
-  text-shadow: 0 0 1px rgba(0,0,0,.7),
-               0 1px 1.5px rgba(0,0,0,.5);
-  font-weight: bold;
-  padding: 0 1.5em .05em;
-  margin: 0 0 2px;
-}
-
-@media (-moz-windows-classic) {
-  #appmenu-button {
-    margin-bottom: 1px;
-  }
-}
-
 %ifndef WINDOWS_AERO
 @media (-moz-windows-default-theme) {
   #main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar {
     margin-top: 4px;
   }
-
-  #main-window[sizemode="normal"] #appmenu-button {
-    margin-bottom: 5px;
-  }
 }
 %endif
 
-#appmenu-button:hover:active,
-#appmenu-button[open] {
-  border-radius: 0;
-}
-
-%ifdef MOZ_OFFICIAL_BRANDING
-#appmenu-button {
-  background-image: linear-gradient(rgb(247,182,82), rgb(215,98,10) 95%);
-  border-color: rgba(83,42,6,.9);
-  box-shadow: 0 1px 0 rgba(255,255,255,.25) inset,
-              0 0 0 1px rgba(255,255,255,.25) inset;
-}
-#appmenu-button:hover:not(:active):not([open]) {
-  background-image: radial-gradient(farthest-side at bottom, rgba(252,240,89,.5) 10%, rgba(252,240,89,0) 70%),
-                    radial-gradient(farthest-side at bottom, rgb(236,133,0), rgba(255,229,172,0)),
-                    linear-gradient(rgb(246,170,69), rgb(209,74,0) 95%);
-  border-color: rgba(83,42,6,.9);
-  box-shadow: 0 1px 0 rgba(255,255,255,.1) inset,
-              0 0 2px 1px rgba(250,234,169,.7) inset,
-              0 -1px 0 rgba(250,234,169,.5) inset;
-}
-#appmenu-button:hover:active,
-#appmenu-button[open] {
-  background-image: linear-gradient(rgb(246,170,69), rgb(209,74,0) 95%);
-  box-shadow: 0 2px 3px rgba(0,0,0,.4) inset,
-              0 1px 1px rgba(0,0,0,.2) inset;
-}
-%else
-%if MOZ_UPDATE_CHANNEL == aurora
-#appmenu-button {
-  background-image: linear-gradient(hsl(208,99%,37%), hsl(214,90%,23%) 95%);
-  border-color: hsla(214,89%,21%,.9);
-  box-shadow: 0 1px 0 hsla(205,100%,72%,.2) inset,
-              0 0 2px 1px hsla(205,100%,72%,.25) inset;
-}
-#appmenu-button:hover:not(:active):not([open]) {
-  background-image: radial-gradient(farthest-side at bottom, hsla(202,100%,85%,.5) 10%, hsla(202,100%,85%,0) 70%),
-                    radial-gradient(farthest-side at bottom, hsla(205,100%,72%,.7), hsla(205,100%,72%,0)),
-                    linear-gradient(hsl(208,98%,34%), hsl(213,87%,20%) 95%);
-  border-color: hsla(214,89%,21%,.9);
-  box-shadow: 0 1px 0 hsla(205,100%,72%,.15) inset,
-              0 0 2px 1px hsla(205,100%,72%,.5) inset,
-              0 -1px 0 hsla(205,100%,72%,.2) inset;
-}
-#appmenu-button:hover:active,
-#appmenu-button[open] {
-  background-image: linear-gradient(hsl(208,95%,30%), hsl(214,85%,17%) 95%);
-  box-shadow: 0 2px 3px rgba(0,0,0,.4) inset,
-              0 1px 1px rgba(0,0,0,.2) inset;
-}
-%else
-#appmenu-button {
-  background-image: linear-gradient(hsl(211,33%,32%), hsl(209,53%,10%) 95%);
-  border-color: hsla(210,59%,13%,.9);
-  box-shadow: 0 1px 0 hsla(210,48%,90%,.15) inset,
-              0 0 2px 1px hsla(211,65%,85%,.15) inset;
-}
-#appmenu-button:hover:not(:active):not([open]) {
-  background-image: radial-gradient(farthest-side at bottom, hsla(210,48%,90%,.5) 10%, hsla(210,48%,90%,0) 70%),
-                    radial-gradient(farthest-side at bottom, hsla(211,70%,83%,.5), hsla(211,70%,83%,0)),
-                    linear-gradient(hsl(211,33%,32%), hsl(209,53%,10%) 95%);
-  border-color: hsla(210,59%,13%,.9);
-  box-shadow: 0 1px 0 hsla(210,48%,90%,.15) inset,
-              0 0 2px 1px hsla(210,48%,90%,.4) inset,
-              0 -1px 0 hsla(210,48%,90%,.2) inset;
-}
-#appmenu-button:hover:active,
-#appmenu-button[open] {
-  background-image: linear-gradient(hsl(211,33%,26%), hsl(209,53%,6%) 95%);
-  box-shadow: 0 2px 3px rgba(0,0,0,.4) inset,
-              0 1px 1px rgba(0,0,0,.2) inset;
-}
-%endif
-%endif
-
-#main-window[privatebrowsingmode=temporary] #appmenu-button {
-  background-image: linear-gradient(rgb(153,38,211), rgb(105,19,163) 95%);
-  border-color: rgba(43,8,65,.9);
-}
-
-#main-window[privatebrowsingmode=temporary] #appmenu-button:hover:not(:active):not([open]) {
-  background-image: radial-gradient(farthest-side at bottom, rgba(240,193,255,.5) 10%, rgba(240,193,255,0) 70%),
-                    radial-gradient(farthest-side at bottom, rgb(192,81,247), rgba(236,172,255,0)),
-                    linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%);
-  border-color: rgba(43,8,65,.9);
-  box-shadow: 0 1px 0 rgba(255,255,255,.1) inset,
-              0 0 2px 1px rgba(240,193,255,.7) inset,
-              0 -1px 0 rgba(240,193,255,.5) inset;
-}
-
-#main-window[privatebrowsingmode=temporary] #appmenu-button:hover:active,
-#main-window[privatebrowsingmode=temporary] #appmenu-button[open] {
-  background-image: linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%);
-}
-
-#appmenu-button > .button-box {
-  border-style: none;
-  padding: 0;
-}
-
-#appmenu-button > .button-box > .button-menu-dropmarker {
-  list-style-image: url(appmenu-dropmarker.png);
-  width: auto;
-  height: auto;
-  padding: 0;
-  margin: 0;
-  -moz-margin-start: .5em;
-}
-
-.splitmenu-menuitem {
-  -moz-margin-end: 1px;
-%ifdef WINDOWS_AERO
-  -moz-padding-end: 0.5em;
-%endif
-}
-
-.splitmenu-menu {
-  -moz-box-pack: end;
-}
-
-.appmenu-edit-button {
-  -moz-appearance: none;
-  border: 1px solid transparent;
-  padding: 2px;
-  background: transparent;
-  border-radius: 3px;
-}
-
-.appmenu-edit-button[disabled="true"] {
-  opacity: .3;
-}
-
-#appmenuPrimaryPane {
-  -moz-border-end: 1px solid ThreeDShadow;
-}
-
-@media (-moz-windows-default-theme) {
-  #appmenu-popup {
-    -moz-appearance: none;
-    background: white;
-    border: 1px solid ThreeDShadow;
-  }
-  #appmenuPrimaryPane {
-    background-color: rgba(255,255,255,0.5);
-    padding: 2px;
-    -moz-border-end: none;
-  }
-  #appmenuSecondaryPane {
-    background-color: #f1f5fb;
-    box-shadow: 1px 0 2px rgb(204,214,234) inset;
-    -moz-padding-start: 3px;
-    -moz-padding-end: 2px;
-    padding-top: 2px;
-    padding-bottom: 2px;
-    font-family: "Segoe UI Semibold", "Segoe UI", sans-serif;
-  }
-  #appmenuSecondaryPane:-moz-locale-dir(rtl) {
-    box-shadow: -1px 0 2px rgb(204,214,234) inset;
-  }
-
-%ifdef WINDOWS_AERO
-  #appmenuPrimaryPane menupopup {
-    -moz-appearance: none;
-    background-image: linear-gradient(to right, white 26px, ThreeDLightShadow 26px,
-                                      ThreeDLightShadow 27px, ThreeDHighlight 27px,
-                                      ThreeDHighlight 28px, white 28px);
-    border: 3px solid;
-    -moz-border-top-colors: ThreeDShadow white;
-    -moz-border-bottom-colors: ThreeDShadow white;
-    -moz-border-left-colors: ThreeDShadow white;
-    -moz-border-right-colors: ThreeDShadow white;
-  }
-%endif
-
-  #appmenuSecondaryPane menupopup {
-    -moz-appearance: none;
-%ifdef WINDOWS_AERO
-    background-image: linear-gradient(to right, #f1f5fb 26px, ThreeDLightShadow 26px,
-                                      ThreeDLightShadow 27px, ThreeDHighlight 27px,
-                                      ThreeDHighlight 28px, #f1f5fb 28px);
-    border: 3px solid;
-    -moz-border-top-colors: ThreeDShadow #f1f5fb;
-    -moz-border-bottom-colors: ThreeDShadow #f1f5fb;
-    -moz-border-left-colors: ThreeDShadow #f1f5fb;
-    -moz-border-right-colors: ThreeDShadow #f1f5fb;
-%else
-    background-color: #f1f5fb;
-    border: 1px solid ThreeDShadow;
-    padding: 2px;
-%endif
-  }
-
-%ifdef WINDOWS_AERO
-  #appmenuPrimaryPane menupopup:-moz-locale-dir(rtl) {
-    background-image: linear-gradient(to left, white 26px, ThreeDLightShadow 26px,
-                                      ThreeDLightShadow 27px, ThreeDHighlight 27px,
-                                      ThreeDHighlight 28px, white 28px);
-  }
-  #appmenuSecondaryPane menupopup:-moz-locale-dir(rtl) {
-    background-image: linear-gradient(to left, #f1f5fb 26px, ThreeDLightShadow 26px,
-                                      ThreeDLightShadow 27px, ThreeDHighlight 27px,
-                                      ThreeDHighlight 28px, #f1f5fb 28px);
-  }
-
-  /* Hi-DPI overrides of the menu backgrounds, to adjust where the gutter line falls */
-  @media (min-resolution: 1.25dppx) {
-    #appmenuPrimaryPane menupopup {
-      background-image: linear-gradient(to right, white 22.4px, ThreeDLightShadow 22.4px,
-                                        ThreeDLightShadow 23.2px, ThreeDHighlight 23.2px,
-                                        ThreeDHighlight 24px, white 24px);
-    }
-    #appmenuSecondaryPane menupopup {
-      background-image: linear-gradient(to right, #f1f5fb 22.4px, ThreeDLightShadow 22.4px,
-                                        ThreeDLightShadow 23.2px, ThreeDHighlight 23.2px,
-                                        ThreeDHighlight 24px, #f1f5fb 24px);
-    }
-    #appmenuPrimaryPane menupopup:-moz-locale-dir(rtl) {
-      background-image: linear-gradient(to left, white 22.4px, ThreeDLightShadow 22.4px,
-                                        ThreeDLightShadow 23.2px, ThreeDHighlight 23.2px,
-                                        ThreeDHighlight 24px, white 24px);
-    }
-    #appmenuSecondaryPane menupopup:-moz-locale-dir(rtl) {
-      background-image: linear-gradient(to left, #f1f5fb 22.4px, ThreeDLightShadow 22.4px,
-                                        ThreeDLightShadow 23.2px, ThreeDHighlight 23.2px,
-                                        ThreeDHighlight 24px, #f1f5fb 24px);
-    }
-  }
-
-  @media (min-resolution: 1.5dppx) {
-    #appmenuPrimaryPane menupopup {
-      background-image: linear-gradient(to right, white 20.6667px, ThreeDLightShadow 20.6667px,
-                                        ThreeDLightShadow 21.3333px, ThreeDHighlight 21.3333px,
-                                        ThreeDHighlight 22px, white 22px);
-    }
-    #appmenuSecondaryPane menupopup {
-      background-image: linear-gradient(to right, #f1f5fb 20.6667px, ThreeDLightShadow 20.6667px,
-                                        ThreeDLightShadow 21.3333px, ThreeDHighlight 21.3333px,
-                                        ThreeDHighlight 22px, #f1f5fb 22px);
-    }
-    #appmenuPrimaryPane menupopup:-moz-locale-dir(rtl) {
-      background-image: linear-gradient(to left, white 20.6667px, ThreeDLightShadow 20.6667px,
-                                        ThreeDLightShadow 21.3333px, ThreeDHighlight 21.3333px,
-                                        ThreeDHighlight 22px, white 22px);
-    }
-    #appmenuSecondaryPane menupopup:-moz-locale-dir(rtl) {
-      background-image: linear-gradient(to left, #f1f5fb 20.6667px, ThreeDLightShadow 20.6667px,
-                                        ThreeDLightShadow 21.3333px, ThreeDHighlight 21.3333px,
-                                        ThreeDHighlight 22px, #f1f5fb 22px);
-    }
-  }
-
-  @media (min-resolution: 2dppx) {
-    #appmenuPrimaryPane menupopup {
-      background-image: linear-gradient(to right, white 19.5px, ThreeDLightShadow 19.5px,
-                                        ThreeDLightShadow 20px, ThreeDHighlight 20px,
-                                        ThreeDHighlight 20.5px, white 20.5px);
-    }
-    #appmenuSecondaryPane menupopup {
-      background-image: linear-gradient(to right, #f1f5fb 19.5px, ThreeDLightShadow 19.5px,
-                                        ThreeDLightShadow 20px, ThreeDHighlight 20px,
-                                        ThreeDHighlight 20.5px, #f1f5fb 20.5px);
-    }
-    #appmenuPrimaryPane menupopup:-moz-locale-dir(rtl) {
-      background-image: linear-gradient(to left, white 19.5px, ThreeDLightShadow 19.5px,
-                                        ThreeDLightShadow 20px, ThreeDHighlight 20px,
-                                        ThreeDHighlight 20.5px, white 20.5px);
-    }
-    #appmenuSecondaryPane menupopup:-moz-locale-dir(rtl) {
-      background-image: linear-gradient(to left, #f1f5fb 19.5px, ThreeDLightShadow 19.5px,
-                                        ThreeDLightShadow 20px, ThreeDHighlight 20px,
-                                        ThreeDHighlight 20.5px, #f1f5fb 20.5px);
-    }
-  }
-%endif
-
-  .appmenu-menuseparator {
-    -moz-appearance: none;
-    margin-top: 3px;
-    margin-bottom: 3px;
-%ifdef WINDOWS_AERO
-    -moz-margin-start: 30px;
-%else
-    -moz-margin-start: calc(1.45em + 4px);
-%endif
-    padding: 0;
-    border-top: 1px solid #d6e5f5;
-    border-bottom: none;
-  }
-
-%ifdef WINDOWS_AERO
-  @media (min-resolution: 1.25dppx) {
-    .appmenu-menuseparator {
-      -moz-margin-start: 25px;
-    }
-  }
-  @media (min-resolution: 1.5dppx) {
-    .appmenu-menuseparator {
-      -moz-margin-start: 24px;
-    }
-  }
-  @media (min-resolution: 2dppx) {
-    .appmenu-menuseparator {
-      -moz-margin-start: 22px;
-    }
-  }
-%endif
-
-  .appmenu-edit-button:not([disabled]):hover {
-    border: 1px solid #b8d6fb;
-    box-shadow: inset 0 0 1px white;
-    background: linear-gradient(#fafbfd, #ebf3fd);
-    transition: .2s ease-in;
-  }
-}
-
-#appmenuSecondaryPane-spacer {
-  min-height: 1em;
-}
-
-#appmenu-editmenu {
-  -moz-box-pack: end;
-}
-
-#appmenu_print,
-#appmenu_print_popup,
-.appmenu-edit-button,
-#appmenu-editmenu-cut,
-#appmenu-editmenu-copy,
-#appmenu-editmenu-paste,
-#appmenu-quit {
-  list-style-image: url("appmenu-icons.png");
-}
-
-#appmenu-cut,
-#appmenu-editmenu-cut {
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-#appmenu-copy,
-#appmenu-editmenu-copy {
-  -moz-image-region: rect(0 32px 16px 16px);
-}
-
-#appmenu-paste,
-#appmenu-editmenu-paste {
-  -moz-image-region: rect(0 48px 16px 32px);
-}
-
-#appmenu_print,
-#appmenu_print_popup {
-  -moz-image-region: rect(0 64px 16px 48px);
-}
-
-#appmenu-quit {
-  -moz-image-region: rect(0 80px 16px 64px);
-}
-
-#appmenu-edit-label {
-  -moz-appearance: none;
-  background: transparent;
-  font-style: italic;
-}
-
-#appmenu_bookmarks {
-  list-style-image: url("chrome://browser/skin/places/bookmark.png");
-  -moz-image-region: rect(0px 48px 16px 32px);
-}
-
-#appmenu_privateBrowsing,
-#appmenu_newPrivateWindow {
-  list-style-image: url("chrome://browser/skin/Privacy-16.png");
-}
-
-@media (min-resolution: 1.25dppx) {
-  #appmenu_privateBrowsing,
-  #appmenu_newPrivateWindow {
-    list-style-image: url("chrome://browser/skin/Privacy-32.png");
-  }
-}
-
-#appmenu_addons {
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
-}
-
-@media (min-resolution: 1.25dppx) {
-  #appmenu_addons {
-    list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
-  }
-}
-
-#BMB_bookmarkThisPage,
-#appmenu_bookmarkThisPage {
-  list-style-image: url("chrome://browser/skin/places/bookmark.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
 /* ::::: titlebar ::::: */
 
 #main-window[sizemode="normal"] > #titlebar {
@@ -575,7 +133,6 @@
 }
 
 @media (-moz-windows-classic) {
-  #main-window[tabsintitlebar][sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container,
   #main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel > #navigator-toolbox > #toolbar-menubar {
     margin-top: 4px;
   }
@@ -2426,8 +1983,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 }
 
 /* Bookmarks roots menu-items */
-#appmenu_subscribeToPage:not([disabled]),
-#appmenu_subscribeToPageMenu,
 #subscribeToPageMenuitem:not([disabled]),
 #subscribeToPageMenupopup,
 #BMB_subscribeToPageMenuitem:not([disabled]),
@@ -2436,13 +1991,11 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 }
 
 #bookmarksToolbarFolderMenu,
-#appmenu_bookmarksToolbar,
 #BMB_bookmarksToolbar {
   list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png");
   -moz-image-region: auto;
 }
 
-#appmenu_unsortedBookmarks,
 #BMB_unsortedBookmarks {
   list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png");
   -moz-image-region: auto;
@@ -2997,9 +2550,3 @@ chatbox {
 #main-window[privatebrowsingmode=temporary] #toolbar-menubar:-moz-locale-dir(rtl) {
   background-position: top left;
 }
-
-#main-window[privatebrowsingmode=temporary] #appmenu-button > .button-box > .box-inherit > .button-icon {
-  list-style-image: url("chrome://browser/skin/privatebrowsing-light.png");
-  width: 20px;
-  height: 16px;
-}
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index f723ee582401..a2b61c2a536c 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -21,8 +21,6 @@ browser.jar:
 #endif
         skin/classic/browser/actionicon-tab.png
         skin/classic/browser/appmenu.png
-        skin/classic/browser/appmenu-icons.png
-        skin/classic/browser/appmenu-dropmarker.png
 *       skin/classic/browser/browser.css
 *       skin/classic/browser/browser-lightweightTheme.css
         skin/classic/browser/click-to-play-warning-stripes.png
@@ -279,8 +277,6 @@ browser.jar:
 #endif
         skin/classic/aero/browser/actionicon-tab.png
         skin/classic/aero/browser/appmenu.png
-        skin/classic/aero/browser/appmenu-dropmarker.png
-        skin/classic/aero/browser/appmenu-icons.png
 *       skin/classic/aero/browser/browser.css                        (browser-aero.css)
 *       skin/classic/aero/browser/browser-lightweightTheme.css
         skin/classic/aero/browser/click-to-play-warning-stripes.png

From 799b0e9385bc7d796ce3d0d6c587c7b3772e0a04 Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Sat, 4 May 2013 00:17:19 +0200
Subject: [PATCH 085/230] Bug 866837 - add 'Save Page' button widget to toolbar
 / customize panel. r=mconley.

---
 .../customizableui/src/CustomizableUI.jsm     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 0beafe0445ad..b923f85b25c6 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -198,6 +198,26 @@ XPCOMUtils.defineLazyGetter(this, "gBuiltInWidgets", function() {
         }
       }
     }
+  }, {
+    id: "save-page-button",
+    name: "Save Page",
+    shortcut: "Ctrl+S",
+    description: "Save this page",
+    defaultArea: CustomizableUI.AREA_PANEL,
+    allowedAreas: [CustomizableUI.AREA_PANEL],
+    icons: {
+      "16": "chrome://branding/content/icon16.png",
+      "32": "chrome://branding/content/icon48.png",
+      "48": "chrome://branding/content/icon48.png"
+    },
+    onCommand: function(aEvent) {
+      let win = aEvent.target &&
+                aEvent.target.ownerDocument &&
+                aEvent.target.ownerDocument.defaultView;
+      if (win && typeof win.saveDocument == "function") {
+        win.saveDocument(win.content.document);
+      }
+    }
   }];
 });
 
@@ -270,6 +290,7 @@ let gDefaultPlacements = new Map([
   ["PanelUI-contents", [
     "new-window-button",
     "privatebrowsing-button",
+    "save-page-button",
     "print-button",
     "history-button",
     "fullscreen-button",

From a3681a01e90bba9b4e28bdfb8fbf259520b575c1 Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Sat, 4 May 2013 00:17:21 +0200
Subject: [PATCH 086/230] Bug 866838 - add Find button widget to toolbar /
 customize panel. r=mconley.

---
 .../customizableui/src/CustomizableUI.jsm     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index b923f85b25c6..41d5ef238a09 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -218,6 +218,26 @@ XPCOMUtils.defineLazyGetter(this, "gBuiltInWidgets", function() {
         win.saveDocument(win.content.document);
       }
     }
+  }, {
+    id: "find-button",
+    name: "Find",
+    shortcut: "Ctrl+F",
+    description: "Find in this page",
+    defaultArea: CustomizableUI.AREA_PANEL,
+    allowedAreas: [CustomizableUI.AREA_PANEL],
+    icons: {
+      "16": "chrome://branding/content/icon16.png",
+      "32": "chrome://branding/content/icon48.png",
+      "48": "chrome://branding/content/icon48.png"
+    },
+    onCommand: function(aEvent) {
+      let win = aEvent.target &&
+                aEvent.target.ownerDocument &&
+                aEvent.target.ownerDocument.defaultView;
+      if (win && win.gFindBar) {
+        win.gFindBar.onFindCommand();
+      }
+    }
   }];
 });
 
@@ -294,6 +314,7 @@ let gDefaultPlacements = new Map([
     "print-button",
     "history-button",
     "fullscreen-button",
+    "find-button",
     "history-panelmenu",
     "bookmarks-panelmenu",
   ]]

From 751bd0b380c750deb2931fc990114eb452cd10cc Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Sat, 4 May 2013 00:17:23 +0200
Subject: [PATCH 087/230] Bug 866844 - add Open File button widget to toolbar /
 customize panel. r=mconley.

---
 .../customizableui/src/CustomizableUI.jsm     | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 41d5ef238a09..31707d6f6103 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -238,6 +238,26 @@ XPCOMUtils.defineLazyGetter(this, "gBuiltInWidgets", function() {
         win.gFindBar.onFindCommand();
       }
     }
+  }, {
+    id: "open-file-button",
+    name: "Open File",
+    shortcut: "Ctrl+O",
+    description: "Open file",
+    defaultArea: CustomizableUI.AREA_PANEL,
+    allowedAreas: [CustomizableUI.AREA_PANEL],
+    icons: {
+      "16": "chrome://branding/content/icon16.png",
+      "32": "chrome://branding/content/icon48.png",
+      "48": "chrome://branding/content/icon48.png"
+    },
+    onCommand: function(aEvent) {
+      let win = aEvent.target
+                && aEvent.target.ownerDocument
+                && aEvent.target.ownerDocument.defaultView;
+      if (win && typeof win.BrowserOpenFileWindow == "function") {
+        win.BrowserOpenFileWindow();
+      }
+    }
   }];
 });
 
@@ -316,7 +336,7 @@ let gDefaultPlacements = new Map([
     "fullscreen-button",
     "find-button",
     "history-panelmenu",
-    "bookmarks-panelmenu",
+    "bookmarks-panelmenu"
   ]]
 ]);
 

From 5a402141ec0d7bf4b21fdb25f90631e9435b4b07 Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Sat, 4 May 2013 00:17:25 +0200
Subject: [PATCH 088/230] Bug 866845 - add Developer button widget to toolbar /
 customize panel. r=mconley.

---
 .../customizableui/src/CustomizableUI.jsm     | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 31707d6f6103..3740c3fc6206 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -258,6 +258,26 @@ XPCOMUtils.defineLazyGetter(this, "gBuiltInWidgets", function() {
         win.BrowserOpenFileWindow();
       }
     }
+  }, {
+    id: "developer-button",
+    name: "Developer",
+    shortcut: "Shift+F11",
+    description: "Toggle Developer Tools",
+    defaultArea: CustomizableUI.AREA_PANEL,
+    allowedAreas: [CustomizableUI.AREA_PANEL],
+    icons: {
+      "16": "chrome://branding/content/icon16.png",
+      "32": "chrome://branding/content/icon48.png",
+      "48": "chrome://branding/content/icon48.png"
+    },
+    onCommand: function(aEvent) {
+      let win = aEvent.target &&
+                aEvent.target.ownerDocument &&
+                aEvent.target.ownerDocument.defaultView;
+      if (win && win.gDevToolsBrowser) {
+        win.gDevToolsBrowser.toggleToolboxCommand(win.gBrowser);
+      }
+    }
   }];
 });
 

From 47dc668168eaa740e867a7a99739c092fab35b04 Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Sat, 4 May 2013 00:17:27 +0200
Subject: [PATCH 089/230] Bug 866841 - add Add-ons button widget to toolbar /
 customize panel. r=mconley.

---
 .../customizableui/src/CustomizableUI.jsm     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 3740c3fc6206..696774e9d8fb 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -278,6 +278,26 @@ XPCOMUtils.defineLazyGetter(this, "gBuiltInWidgets", function() {
         win.gDevToolsBrowser.toggleToolboxCommand(win.gBrowser);
       }
     }
+  }, {
+    id: "add-ons-button",
+    name: "Add-ons",
+    shortcut: "Ctrl+Shift+A",
+    description: "Add-ons Manager",
+    defaultArea: CustomizableUI.AREA_PANEL,
+    allowedAreas: [CustomizableUI.AREA_PANEL],
+    icons: {
+      "16": "chrome://branding/content/icon16.png",
+      "32": "chrome://branding/content/icon48.png",
+      "48": "chrome://branding/content/icon48.png"
+    },
+    onCommand: function(aEvent) {
+      let win = aEvent.target &&
+                aEvent.target.ownerDocument &&
+                aEvent.target.ownerDocument.defaultView;
+      if (win && typeof win.BrowserOpenAddonsMgr == "function") {
+        win.BrowserOpenAddonsMgr();
+      }
+    }
   }];
 });
 
@@ -355,6 +375,7 @@ let gDefaultPlacements = new Map([
     "history-button",
     "fullscreen-button",
     "find-button",
+    "add-ons-button",
     "history-panelmenu",
     "bookmarks-panelmenu"
   ]]

From e3732833b25cdf738baaac9a84d5409c7cb5e63f Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Sat, 4 May 2013 00:54:55 +0200
Subject: [PATCH 090/230] Bug 866840 - add Preferences button widget to toolbar
 / customize panel. r=mconley.

---
 .../customizableui/src/CustomizableUI.jsm     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 696774e9d8fb..2fd8f9dbf3d3 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -298,6 +298,26 @@ XPCOMUtils.defineLazyGetter(this, "gBuiltInWidgets", function() {
         win.BrowserOpenAddonsMgr();
       }
     }
+  }, {
+    id: "preferences-button",
+    name: "Preferences",
+    shortcut: "Ctrl+Shift+O",
+    description: "Preferences\u2026",
+    defaultArea: CustomizableUI.AREA_PANEL,
+    allowedAreas: [CustomizableUI.AREA_PANEL],
+    icons: {
+      "16": "chrome://branding/content/icon16.png",
+      "32": "chrome://branding/content/icon48.png",
+      "48": "chrome://branding/content/icon48.png"
+    },
+    onCommand: function(aEvent) {
+      let win = aEvent.target &&
+                aEvent.target.ownerDocument &&
+                aEvent.target.ownerDocument.defaultView;
+      if (win && typeof win.openPreferences == "function") {
+        win.openPreferences();
+      }
+    }
   }];
 });
 
@@ -375,6 +395,7 @@ let gDefaultPlacements = new Map([
     "history-button",
     "fullscreen-button",
     "find-button",
+    "preferences-button",
     "add-ons-button",
     "history-panelmenu",
     "bookmarks-panelmenu"

From f404ada218e6ffef353ad42b7bc553bb78f1e78e Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Thu, 9 May 2013 12:11:44 -0400
Subject: [PATCH 091/230] Bug 869660 - Make browser windows with
 chromehidden~="toolbar" have a proper titlebar height. r=dao.

---
 browser/components/customizableui/content/toolbar.xml | 3 +++
 browser/themes/osx/browser.css                        | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/browser/components/customizableui/content/toolbar.xml b/browser/components/customizableui/content/toolbar.xml
index 67f1997dc91d..53f8707c18e7 100644
--- a/browser/components/customizableui/content/toolbar.xml
+++ b/browser/components/customizableui/content/toolbar.xml
@@ -9,6 +9,9 @@
           xmlns:xbl="http://www.mozilla.org/xbl">
 
   <binding id="toolbar">
+    <resources>
+      <stylesheet src="chrome://global/skin/toolbar.css"/>
+    </resources>
     <implementation implements="nsIAccessibleProvider">
       <property name="accessibleType" readonly="true">
         <getter>
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index adbac24d4851..52cc83e985e2 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -48,6 +48,10 @@
   padding-top: 9px;
 }
 
+#main-window[chromehidden~="toolbar"] > #titlebar {
+  padding-top: 22px;
+}
+
 #main-window:not(:-moz-lwtheme):not([privatebrowsingmode=temporary]) > #titlebar {
   -moz-appearance: -moz-window-titlebar;
 }

From 988171ba5375209dd0cae7e8b9f280172a9e9d16 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Sat, 4 May 2013 03:25:59 -0400
Subject: [PATCH 092/230] Bug 865178 - Australis tabs OS X lightweight theme
 support. ui-r=shorlander, r=mconley

--HG--
rename : browser/themes/windows/browser-lightweightTheme.css => browser/themes/osx/browser-lightweightTheme.css
extra : rebase_source : bff72afa778aeec4789a81ec29e73e6df5cc18c9
---
 .../themes/linux/browser-lightweightTheme.css |   4 +-
 browser/themes/linux/linuxShared.inc          |   1 +
 .../themes/osx/browser-lightweightTheme.css   |  28 +++++++++
 browser/themes/osx/browser.css                |  56 ++++++------------
 browser/themes/osx/jar.mn                     |   2 +
 browser/themes/osx/shared.inc                 |   4 ++
 .../tabbrowser/tab-active-middle-lwtheme.png  | Bin 0 -> 148 bytes
 .../themes/osx/tabbrowser/tab-stroke-end.png  | Bin 932 -> 439 bytes
 .../osx/tabbrowser/tab-stroke-start.png       | Bin 903 -> 433 bytes
 browser/themes/shared/tabs.inc.css            |  16 ++++-
 .../windows/browser-lightweightTheme.css      |   4 +-
 browser/themes/windows/windowsShared.inc      |   1 +
 12 files changed, 71 insertions(+), 45 deletions(-)
 create mode 100644 browser/themes/osx/browser-lightweightTheme.css
 create mode 100644 browser/themes/osx/tabbrowser/tab-active-middle-lwtheme.png

diff --git a/browser/themes/linux/browser-lightweightTheme.css b/browser/themes/linux/browser-lightweightTheme.css
index 201e1a4486b0..012b7191ce96 100644
--- a/browser/themes/linux/browser-lightweightTheme.css
+++ b/browser/themes/linux/browser-lightweightTheme.css
@@ -15,7 +15,7 @@
 #tabbrowser-tabs:not([movingtab]) > .tabbrowser-tab > .tab-stack > .tab-background > .tab-background-end[selected=true]:-moz-lwtheme::before {
   background-attachment: scroll, fixed;
   background-color: transparent;
-  background-image: @fgTabTexture@;/*, lwtHeader;*/
+  background-image: @fgTabTextureLWT@;/*, lwtHeader;*/
   background-position: 0 0, right top;
 }
 
@@ -23,7 +23,7 @@
   background-attachment: scroll, scroll, fixed;
   background-color: transparent;
   background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png),
-                    @fgTabTexture@;/*,
+                    @fgTabTextureLWT@;/*,
                     lwtHeader;*/
   background-position: 0 0, 0 0, right top;
 }
diff --git a/browser/themes/linux/linuxShared.inc b/browser/themes/linux/linuxShared.inc
index 97d8e2d8f249..79be97dffb16 100644
--- a/browser/themes/linux/linuxShared.inc
+++ b/browser/themes/linux/linuxShared.inc
@@ -6,4 +6,5 @@
 
 %define toolbarHighlight rgba(255,255,255,.3)
 %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 fgTabTextureLWT @fgTabTexture@
 %define fgTabBackgroundMiddle @fgTabTexture@, linear-gradient(transparent 0px, transparent 2px, -moz-dialog 2px, -moz-dialog)
diff --git a/browser/themes/osx/browser-lightweightTheme.css b/browser/themes/osx/browser-lightweightTheme.css
new file mode 100644
index 000000000000..bf796936437f
--- /dev/null
+++ b/browser/themes/osx/browser-lightweightTheme.css
@@ -0,0 +1,28 @@
+/* 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/. */
+
+%include shared.inc
+
+/*
+ * LightweightThemeListener will append the current lightweight theme's header
+ * image to the background-image for each of the following rulesets.
+ */
+
+/* Lightweight theme on tabs */
+#tabbrowser-tabs:not([movingtab]) > .tabbrowser-tab > .tab-stack > .tab-background > .tab-background-start[selected=true]:-moz-lwtheme::before,
+#tabbrowser-tabs:not([movingtab]) > .tabbrowser-tab > .tab-stack > .tab-background > .tab-background-end[selected=true]:-moz-lwtheme::before {
+  background-attachment: scroll, fixed;
+  background-color: transparent;
+  background-image: @fgTabTextureLWT@;/*, lwtHeader;*/
+  background-position: 0 0, right top;
+}
+
+#tabbrowser-tabs:not([movingtab]) > .tabbrowser-tab > .tab-stack > .tab-background > .tab-background-middle[selected=true]:-moz-lwtheme {
+  background-attachment: scroll, scroll, fixed;
+  background-color: transparent;
+  background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle-lwtheme.png),
+                    @fgTabTextureLWT@;/*,
+                    lwtHeader;*/
+  background-position: 0 0, 0 0, right top;
+}
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 52cc83e985e2..83e138496c51 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -6,8 +6,6 @@
 
 %include shared.inc
 %filter substitution
-%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] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #nav-bar-customizationtarget > #unified-back-forward-button
 %define conditionalForwardWithUrlbarWidth 27
@@ -20,19 +18,26 @@
   opacity: .9;
 }
 
+#navigator-toolbox::after {
+  -moz-box-ordinal-group: 101; /* tabs toolbar is 100 */
+  background-image: linear-gradient(to top, hsla(0,0%,0%,.15), hsla(0,0%,0%,.15) 1px, hsla(0,0%,100%,.15) 1px, hsla(0,0%,100%,.15) 2px, transparent 3px);
+  content: "";
+  display: -moz-box;
+  height: 2px;
+  margin-top: -2px;
+}
+#navigator-toolbox[tabsontop=false]::after,
+#main-window[disablechrome] #navigator-toolbox::after {
+  visibility: collapse;
+}
+
 #navigator-toolbox toolbarbutton:-moz-lwtheme {
   color: inherit;
   text-shadow: inherit;
 }
 
-#PersonalToolbar:-moz-lwtheme,
-#nav-bar:-moz-lwtheme,
 #main-window[privatebrowsingmode=temporary] #nav-bar[tabsontop=false] {
   -moz-appearance: none !important;
-  background: none !important;
-  /* Switching to a lightweight theme shouldn't move the content area,
-     so avoid changing border widths here. */
-  border-color: transparent !important;
 }
 
 #main-window {
@@ -71,12 +76,6 @@ toolbarseparator {
   min-height: 22px;
 }
 
-toolbox[tabsontop=true] > toolbar:not(#TabsToolbar):not(#nav-bar):not(#toolbar-menubar),
-toolbox[tabsontop=false] > toolbar:not(#nav-bar) {
-  margin-top: -2px; /* overlay the bottom border of the toolbar above us */
-  padding-top: 1px !important;
-}
-
 toolbox[tabsontop=true] > toolbar:not(#TabsToolbar):not(#nav-bar):not(:-moz-lwtheme) {
   -moz-appearance: none;
   background: url(chrome://browser/skin/Toolbar-background-noise.png) hsl(0,0%,83%);
@@ -86,33 +85,20 @@ toolbox[tabsontop=true] > toolbar:not(#TabsToolbar):not(#nav-bar):not(:-moz-lwth
   padding-bottom: 4px !important;
 }
 
-#PersonalToolbar {
-  -moz-appearance: none;
-  background-color: -moz-mac-chrome-active;
-  border-bottom: 2px solid;
-  -moz-border-bottom-colors: hsla(0,0%,0%,.15) hsla(0,0%,100%,.15);
-}
-
 #nav-bar[tabsontop=true],
 #nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + toolbar,
 #nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar {
   -moz-appearance: none;
-  margin-top: 0; /* don't overlay the bottom border of the tabs toolbar */
   padding-top: 4px !important;
-  border-bottom: 2px solid;
-  -moz-border-bottom-colors: hsla(0,0%,0%,.15) hsla(0,0%,100%,.15);
   background: url(chrome://browser/skin/Toolbar-background-noise.png),
-              linear-gradient(hsl(0,0%,93%), hsl(0,0%,83%)); !important; /* override lwtheme style */
+              linear-gradient(hsl(0,0%,93%), hsl(0,0%,83%));
   background-clip: border-box;
   background-origin: border-box !important;
 }
 
-#PersonalToolbar:-moz-lwtheme,
-#nav-bar[tabsontop=true]:-moz-lwtheme,
-#nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + toolbar:-moz-lwtheme,
-#nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar:-moz-lwtheme {
-  background-color: transparent;
-  border-bottom-color: transparent;
+#navigator-toolbox[tabsontop=true] > toolbar:not(#TabsToolbar):-moz-lwtheme {
+  background-color: @toolbarColorLWT@;
+  background-image: url(chrome://browser/skin/Toolbar-background-noise.png);
 }
 
 #PersonalToolbar:not(:-moz-lwtheme):-moz-window-inactive,
@@ -2159,12 +2145,6 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 %define TABSONTOP_NEWTAB_BUTTON #tabbrowser-tabs[tabsontop="true"] > .tabbrowser-arrowscrollbox > .tabs-newtab-button
 %define TABSONBOTTOM_NEWTAB_BUTTON #tabbrowser-tabs[tabsontop="false"] > .tabbrowser-arrowscrollbox > .tabs-newtab-button
 
-.tab-background-start[selected=true]::before,
-.tab-background-end[selected=true]::before {
-  /* The fill is in the image of ::after on OS X */
-  background: none;
-}
-
 .tabbrowser-tabs[closebuttons="hidden"] > * > * > * > .tab-close-button:not([pinned]) {
   display: -moz-box;
   visibility: hidden;
@@ -2212,7 +2192,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 /*
  * Draw the bottom border of the tabstrip:
  */
-#TabsToolbar[tabsontop="true"]:not(:-moz-lwtheme)::after {
+#TabsToolbar::after {
   content: '';
   position: absolute;
   bottom: 0;
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index 366e271971da..0a1784aaebab 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -20,6 +20,7 @@ browser.jar:
   skin/classic/browser/actionicon-tab@2x.png
   skin/classic/browser/appmenu.png
 * skin/classic/browser/browser.css                          (browser.css)
+* skin/classic/browser/browser-lightweightTheme.css
   skin/classic/browser/click-to-play-warning-stripes.png
   skin/classic/browser/customizableui/customization-mode-background.jpg (customizableui/customization-mode-background.jpg)
 * skin/classic/browser/engineManager.css                    (engineManager.css)
@@ -184,6 +185,7 @@ browser.jar:
   skin/classic/browser/tabbrowser/loading.png                            (tabbrowser/loading.png)
   skin/classic/browser/tabbrowser/loading@2x.png                         (tabbrowser/loading@2x.png)
   skin/classic/browser/tabbrowser/tab-active-middle.png                  (tabbrowser/tab-active-middle.png)
+  skin/classic/browser/tabbrowser/tab-active-middle-lwtheme.png          (tabbrowser/tab-active-middle-lwtheme.png)
   skin/classic/browser/tabbrowser/tab-arrow-left.png                     (tabbrowser/tab-arrow-left.png)
   skin/classic/browser/tabbrowser/tab-arrow-left@2x.png                  (tabbrowser/tab-arrow-left@2x.png)
   skin/classic/browser/tabbrowser/tab-arrow-right.png                    (tabbrowser/tab-arrow-right.png)
diff --git a/browser/themes/osx/shared.inc b/browser/themes/osx/shared.inc
index 2e8a8f269f46..3a5e5411196b 100644
--- a/browser/themes/osx/shared.inc
+++ b/browser/themes/osx/shared.inc
@@ -1,6 +1,10 @@
 %include ../../../toolkit/themes/osx/global/shared.inc
 %include ../shared/browser.inc
 
+%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 toolbarColorLWT rgba(253,253,253,0.45)
+%define fgTabTextureLWT linear-gradient(transparent, transparent 2px, rgba(254,254,254,0.72) 2px, @toolbarColorLWT@)
+%define fgTabBackgroundMiddle linear-gradient(transparent, transparent)
 %define hudButton -moz-appearance: none; color: #434343; border-radius: 4px; border: 1px solid #b5b5b5; background: linear-gradient(#fff, #f2f2f2); box-shadow: inset 0 1px rgba(255,255,255,.8), inset 0 0 1px rgba(255,255, 255,.25), 0 1px rgba(255,255,255,.3); background-clip: padding-box; background-origin: padding-box; padding: 2px 6px;
 %define hudButtonPressed box-shadow: inset 0 1px 4px -3px #000, 0 1px rgba(255,255,255,.3);
 %define hudButtonFocused box-shadow: 0 0 1px -moz-mac-focusring inset, 0 0 4px 1px -moz-mac-focusring, 0 0 2px 1px -moz-mac-focusring;
diff --git a/browser/themes/osx/tabbrowser/tab-active-middle-lwtheme.png b/browser/themes/osx/tabbrowser/tab-active-middle-lwtheme.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec7c84e3476db7204115f8a9bc03cf2436b0405f
GIT binary patch
literal 148
zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol}0V0ox?vVxwBze2LF#HF>1$&oI28wVNctjR6
zFmMZlFeAgPITAoY_7YEDSN6NC93m{*d+wX60fiJjT^vI+&L^iNB_$;vV3LrOkf_<{
lwddc5&`F6RJxz%$3?4g~-8{VaECDKJ@O1TaS?83{1ORhhCHDXT

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/tabbrowser/tab-stroke-end.png b/browser/themes/osx/tabbrowser/tab-stroke-end.png
index 3efb44726fa16622366738ffbcba296ad0277298..b1b7cc0145523cc8141b939a10b34fe8dda1a445 100755
GIT binary patch
delta 413
zcmZ3&zMXl3N<Cw7kh>GZx^prw85kH?(j9#r85lP9bN@+X1@e0Xd_r7-G#G?3FxWF_
zX)(y#Gl=U63#$vMm<cKw^ULY-N}2Mg7;r1;amg8R%II@Sn{g-@vdinU%bD@X8u2Qa
z@W>f(%NTJh8Uhu7)tGQ98gnWb@yZ+4^T-<WC>rr7m~zVlRTy(A7;(v)a>*M*l>#*@
z81u*jjWFR>FyfXs{xaDz2Iw69k|4ie21aHUHV$rHK7K)AQ87tr8F>XoWpyoGJtJdN
zGjmHDTRTTrcMmUbA3y(~;IPOAdp^$wYVGxOaSV}=Y(3b`)M!x8z<Oc#wkdKQSt+)<
zrpNx*&(nWl#a?e=J<IBt*jD=~XHSQ5x!l{OJfkF2wc~*um%t+PgeAHMQuG*%LlQQr
zuP|j?yguO*yTs3l3D0<XRvwrlJEMZ}spyP%Jj)~wc*r+pn#_11+jLP`!cdY?>BVxE
rmK|$?=e`r!)^Rzv>|b<qr`Q|*4c|G6g%v+60R^(BtDnm{r-UW|tmSXS

literal 932
zcmeAS@N?(olHy`uVBq!ia0vp^azHH4!3-piZ|XG#Qj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07#QONd_r7-ikV=5k&zL|#1sLFBLgQVC!m_opFaahG?1B@
zi7bLu4YC3>HWwF{sHmujhzO7&BO?RUE-Nc5C@83;q-1AjXJKLC=;+wp-R<M!lb4s*
z(9qD)(b3h_HDkt%Ns}gh`t)fg7_3;aV#kghd-m-4@ZrPGojdpK+jr{JsjFA7o<D#7
z+O=!fuU`kUf#A`jN6*0E#fujY9z1ya_U%(Jcm)REzkmPo<;(BizhAz52^4t!`t_SP
zZ-8pvy?gim{d=IvA3uHs+6Z(ZP}$e7U%!3(2GsK7$B&;sfByRQ3#jqWpFe;9{(Y7*
zsU7Iagpwe?U<O7eW)>D!RyKAH4o+S^egOe7F>wh=X<2!B1w~~QRUKVDeFGCya~oSH
zH!mOGprGKeu<(eegv7M8oZRx(o}Ru*Qx_~;vw8c@-Fpw8I(_l_&Aay>KYRA#_4|*X
zzkdJy&u@z#2QXUmJzX3_G|rb!%JzHgAkeb<w%JBmr#UPI6J#SQJu5U7-rh@mUoSsn
z)!&CKKaXaZ%nCev{p#H;|I0UZI`5n{*!bsy$?mf{oy$u9fB*OEPtlI}BWc3&F;~|w
z-+%o1cB_6K<-3dy+uPIr@916jqAd5`w@}I6L%)A6+NIY$v2K~_+gDrvdocf~4d*-k
z`og2LTHEGlh8(@hQ11ET*>rFD%T0dklV<u<J}wc7yyw49*oR@$o$9%zrDsm+$X0FV
zauA$x{P3CE8=4L_T)o=bpTU(Rtv2`jUQWS9A}XFY_e`JNottLjaOmlp^nZV^D@bmM
zTWYsJ_2ZU>dtPkYyVhF5|LNx{+47R*9SMv|nwP|0Z!(^oS2RO1g>A-)+?}0&ZLaVs
zdvXdm3V+Tmo$QjA$Mz$<fv17Vh2z}qUAK;TiX7$J;mD;Zz_EyF-<Qg}Z{*)k+bL6^
z!7)LDVSx&FWN}U9EPbAWLp)-PEIfY9zVlzc`|<Jl-^9=I5qeKA{Je4KHz+N8y85}S
Ib4q9e0Gz>};{X5v

diff --git a/browser/themes/osx/tabbrowser/tab-stroke-start.png b/browser/themes/osx/tabbrowser/tab-stroke-start.png
index 8e0cd509f524a09b26556f5c3f1dd2eb215824bd..08941c8a783419fd8c0e743c3cafbfaaf6b43ea5 100755
GIT binary patch
delta 407
zcmZo?-^e^crJk`k$lZxy-8q?;3=9k`>5jgR3=A9lx&I`x0{QI$J|V6^8Vo`i80;Ce
zv=~%W7{v92h1CU>jQQnsd8JIb<W0Hcj5uZVIi=0m<@Nbwjre2?c@<1}<c)dc47g>C
zfU+P3ipHD@M!fQdymBTyvc^0Lrrh$z_1yAC+;WE8awgo0##{<UAhYC+p&EcjC>Zm|
z8}R@&$QdW~XWIfDqFWN=7tFxO%)-Xb&C4$+EFmc^qoAy!uA!xCWNc<`X=P*Q;OOk)
z>h9s??c?Vk7#zxN{cZ+OW51`1V~B+0+=JOnP7V^R7k(Rl;!v#jtxO5hO#J^ko7wn#
zd+~<gihXzI8?Onm)VprfEt0corzMxnlAkICudVs>ZgJeXbh3T6k7UOq#xx(t7JJ6P
zYy)S$G;Rl%c!T9~J?jqa5fZqkrclJZOxIzBDMR2^g)2hMFHG*Z^fN8L!DF}PisH(%
kL7Z#!UjMnav)%Szv@?6XK%0`F87O!?UHx3vIVCg!010$!X#fBK

literal 903
zcmeAS@N?(olHy`uVBq!ia0vp^azHH4!3-piZ|XG#Qj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07#QONd_r7-ikV=5k&zL|#1sLFBLgQVC!m_opFaahG?1B@
zi7bLu4YC3>HWwF{sHmujhzO7&BO?RUE-Nc5C@83;q-1AjXJKLC=;+wp-R<M!lb4s*
z(9qD)(b3h_HDkt%Ns}gh`t)fg7_3;aV#kghd-m-4@ZrPGojdpK+jr{JsjFA7o<D#7
z+O=!fuU`kUf#A`jN6*0E#fujY9z1ya_U%(Jcm)REzkmPo<;(BizhAz52^4t!`t_SP
zZ-8pvy?gim{d=IvA3uHs+6Z(ZP}$e7U%!3(2GsK7$B&;sfByRQ3#jqWpFe;9{(Y7*
zsU7Iagpwe?U<O7eW)>D!RyKAH4o+S^egOe7F>wh=X<2!B1w~~QRUKVDeFGCya~oSH
zH!mOGprGKeu<(eegv7M8oZRx(o}Ru*Qx_~;vw8c@-Fpw8I(_l_&Aay>KYRA#_4|*X
zzkdJy&u@z#2QXTLJY5_^G|rb!jt)L#AktFqFD1gw6r@wmBBNn!q4od&e8oulTTHE!
z+I=Rye>3m2Psc1*0TbqfR$jAqUZ0kJ#7cAV4*Bno)a_GwOV7W5oM$dtknguEandqR
z$r|^|FKg7UBwZ?fe)?zVDy?lVl%pRqs@=^fz2KbFdp50!eMU+CO?|oK{U@e9pPjeS
zw0w75o!I*;&#G?v>#a6a|C_OUuVf*s{^rb|M{du&{O5T&|014K+N&R|*l8a#W&5*d
zlkTotFeM^%a^1Grm{~%aVL|J^*ETvl*t>IQ#s5%?=|?|%$@H47o+Q#R{mi<JXQQTN
zr>d9VHBYSD6XmSL;xvVIp6v;Znd{?Q7G(suD4e!`IO$`GK*B+$l}aoua~S(Ftt98@
z1WaHRYLIX_p#AObHG|CmPk%B5{p4fn-Ldmc$!&M1)Pt4DN;mU)t$JJgCRht9DY7(s
bihSW;GbN@ys-(&Slw3Vs{an^LB{Ts5WfFx7

diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
index ed1dbfbd0957..00a78c2999a1 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -170,15 +170,25 @@
   background-color: transparent;
   background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png),
                     @fgTabBackgroundMiddle@;
-  background-size: 100% 100%;
   background-repeat: repeat-x;
+  background-size: 100% 100%;
+}
+
+/* Selected tab lightweight theme styles */
+.tab-background-middle[selected=true]:-moz-lwtheme {
+  /* Don't stretch the LWT header images */
+  background-size: 100% 100%, 100% 100%, auto auto;
+}
+
+.tab-background-start[selected=true]:-moz-lwtheme::before,
+.tab-background-end[selected=true]:-moz-lwtheme::before {
+  background-image: @fgTabTextureLWT@;
 }
 
 .tab-background-middle[selected=true]:-moz-lwtheme {
-  background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png);
+  background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle-lwtheme.png), @fgTabTextureLWT@;
 }
 
-/* Same as above but without border or -moz-dialog background */
 .tab-background-start[selected=true]:-moz-lwtheme::before,
 .tab-background-end[selected=true]:-moz-lwtheme::before,
 .tab-background-middle[selected=true]:-moz-lwtheme {
diff --git a/browser/themes/windows/browser-lightweightTheme.css b/browser/themes/windows/browser-lightweightTheme.css
index 840a9ae6947e..a486b442aa96 100644
--- a/browser/themes/windows/browser-lightweightTheme.css
+++ b/browser/themes/windows/browser-lightweightTheme.css
@@ -15,7 +15,7 @@
 #tabbrowser-tabs:not([movingtab]) > .tabbrowser-tab > .tab-stack > .tab-background > .tab-background-end[selected=true]:-moz-lwtheme::before {
   background-attachment: scroll, fixed;
   background-color: transparent;
-  background-image: @fgTabTexture@;/*, lwtHeader;*/
+  background-image: @fgTabTextureLWT@;/*, lwtHeader;*/
   background-position: 0 0, right top;
 }
 
@@ -23,7 +23,7 @@
   background-attachment: scroll, scroll, fixed;
   background-color: transparent;
   background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle-lwtheme.png),
-                    @fgTabTexture@;/*,
+                    @fgTabTextureLWT@;/*,
                     lwtHeader;*/
   background-position: 0 0, 0 0, right top;
 }
diff --git a/browser/themes/windows/windowsShared.inc b/browser/themes/windows/windowsShared.inc
index 9f76d90c2b88..4a26b63a2dcf 100644
--- a/browser/themes/windows/windowsShared.inc
+++ b/browser/themes/windows/windowsShared.inc
@@ -6,3 +6,4 @@
 
 %define toolbarHighlight rgba(253,253,253,0.45)
 %define fgTabTexture linear-gradient(transparent, transparent 2px, rgba(254,254,254,0.72) 2px, rgba(254,254,254,0.72) 2px, rgba(250,250,250,0.88) 3px, rgba(250,250,250,0.88) 3px, rgba(254,254,254,0.72) 4px, rgba(254,254,254,0.72) 4px, @toolbarHighlight@)
+%define fgTabTextureLWT @fgTabTexture@

From 68ac266d21a65ef3dcd966c430e18929ea28bc4c Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Mon, 6 May 2013 13:57:40 -0400
Subject: [PATCH 093/230] Bug 869069 - Use correct default item set for menu
 panel, and remove dummy widgets. r=jaws.

---
 .../customizableui/content/panelUI.inc.xul    | 10 ---
 .../customizableui/src/CustomizableUI.jsm     | 90 +------------------
 2 files changed, 2 insertions(+), 98 deletions(-)

diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index 11515c4b2631..d6005a217e8e 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -67,16 +67,6 @@
            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" flex="1">
-          <label value="&appMenuBookmarks.label;"/>
-          <vbox flex="1">
-            <toolbarbutton label="&bookmarkThisPageCmd.label;"/>
-            <toolbarbutton label="&viewBookmarksToolbar.label;"/>
-            <toolbarbutton label="&showAllBookmarks2.label;"/>
-            <spacer flex="1"/>
-          </vbox>
-          <vbox id="PanelUI-bookmarks-tall-maker"/>
-        </vbox>
         <vbox id="PanelUI-history" flex="1">
           <label value="&appMenuHistory.label;"/>
           <vbox id="PanelUI-historyItems"/>
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 2fd8f9dbf3d3..7a34742ee8e2 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -26,89 +26,6 @@ const kPrefCustomizationDebug        = "browser.uiCustomization.debug";
  */
 XPCOMUtils.defineLazyGetter(this, "gBuiltInWidgets", function() {
   return [{
-    id: "bookmarks-panelmenu",
-    type: "view",
-    viewId: "PanelUI-bookmarks",
-    name: "Bookmarks...",
-    description: "Bookmarks, yo!",
-    defaultArea: CustomizableUI.AREA_PANEL,
-    //XXXunf Need to enforce this, and make it optional.
-    allowedAreas: [CustomizableUI.AREA_PANEL],
-    icons: {
-      "16": "chrome://branding/content/icon16.png",
-      "32": "chrome://branding/content/icon48.png",
-      "48": "chrome://branding/content/icon48.png"
-    },
-    // These are automatically bound to the ViewShowing and ViewHiding events
-    // that the Panel will dispatch, targetted at the view referenced by
-    // viewId.
-    // XXXmconley: Is this too magical?
-    onViewShowing: function(aEvent) {
-      LOG("Bookmark view is being shown!");
-    },
-    onViewHiding: function(aEvent) {
-      LOG("Bookmark view is being hidden!");
-    }
-  }, {
-    id: "weather-indicator",
-    name: "Weather",
-    description: "Don't look out the window, look at your browser!",
-    defaultArea: CustomizableUI.AREA_PANEL,
-    //XXXunf Need to enforce this, and make it optional.
-    allowedAreas: [CustomizableUI.AREA_PANEL],
-    icons: {
-      "16": "chrome://branding/content/icon16.png",
-      "32": "chrome://branding/content/icon48.png",
-      "48": "chrome://branding/content/icon48.png"
-    }
-  }, {
-    id: "share-page",
-    name: "Share 1",
-    shortcut: "Ctrl+Alt+S",
-    description: "Share this page",
-    defaultArea: CustomizableUI.AREA_NAVBAR,
-    allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
-    icons: {
-      "16": "chrome://branding/content/icon16.png",
-      "32": "chrome://branding/content/icon48.png",
-      "48": "chrome://branding/content/icon48.png"
-    }
-  }, {
-    id: "share-page-2",
-    name: "Share 2",
-    shortcut: "Ctrl+Alt+S",
-    description: "Share this page",
-    defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL],
-    icons: {
-      "16": "chrome://branding/content/icon16.png",
-      "32": "chrome://branding/content/icon48.png",
-      "48": "chrome://branding/content/icon48.png"
-    }
-  }, {
-    id: "share-page-3",
-    name: "Share 3",
-    shortcut: "Ctrl+Alt+S",
-    description: "Share this page",
-    allowedAreas: [CustomizableUI.AREA_PANEL],
-    icons: {
-      "16": "chrome://branding/content/icon16.png",
-      "32": "chrome://branding/content/icon48.png",
-      "48": "chrome://branding/content/icon48.png"
-    }
-  }, {
-    id: "share-page-4",
-    name: "Share 4",
-    shortcut: "Ctrl+Alt+S",
-    description: "Share this page",
-    defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL],
-    icons: {
-      "16": "chrome://branding/content/icon16.png",
-      "32": "chrome://branding/content/icon48.png",
-      "48": "chrome://branding/content/icon48.png"
-    }
-  }, {
     id: "history-panelmenu",
     type: "view",
     viewId: "PanelUI-history",
@@ -382,7 +299,6 @@ let gDefaultPlacements = new Map([
     "downloads-button",
     "home-button",
     "social-toolbar-button",
-    "share-page"
   ]],
   ["PersonalToolbar", [
     "personal-bookmarks",
@@ -392,13 +308,11 @@ let gDefaultPlacements = new Map([
     "privatebrowsing-button",
     "save-page-button",
     "print-button",
-    "history-button",
+    "history-panelmenu",
     "fullscreen-button",
     "find-button",
     "preferences-button",
-    "add-ons-button",
-    "history-panelmenu",
-    "bookmarks-panelmenu"
+    "add-ons-button"
   ]]
 ]);
 

From 0728733c752e468c17805c2771aca87068a998f7 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Tue, 7 May 2013 16:08:36 -0400
Subject: [PATCH 094/230] Bug 869581 - [australis] search bar cannot be resized
 after enter customization mode. r=mconley

---
 browser/components/customizableui/src/CustomizeMode.jsm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index 32981b1c755e..d2f36fa3c609 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -205,6 +205,11 @@ CustomizeMode.prototype = {
     let browser = document.getElementById("browser");
     browser.parentNode.selectedPanel = browser;
 
+    // We need to set this._customizing to false before removing the tab
+    // or the TabSelect event handler will think that we are exiting
+    // customization mode for a second time.
+    this._customizing = false;
+
     if (this.browser.selectedBrowser.currentURI.spec == kAboutURI) {
       let custBrowser = this.browser.selectedBrowser;
       if (custBrowser.canGoBack) {
@@ -220,7 +225,6 @@ CustomizeMode.prototype = {
     }
 
     this._changed = false;
-    this._customizing = false;
   },
 
   populatePalette: function() {

From d40b72ad24f63c07deeaac6a8c32a084024af73d Mon Sep 17 00:00:00 2001
From: Blair McBride <bmcbride@mozilla.com>
Date: Tue, 7 May 2013 20:42:28 +1200
Subject: [PATCH 095/230] Bug 869334 - about:customizing should disable the
 Find commands. r=jaws

---
 .../components/customizableui/content/aboutCustomizing.xhtml   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/browser/components/customizableui/content/aboutCustomizing.xhtml b/browser/components/customizableui/content/aboutCustomizing.xhtml
index 7abd16c7248b..9a55f5b5ff6f 100644
--- a/browser/components/customizableui/content/aboutCustomizing.xhtml
+++ b/browser/components/customizableui/content/aboutCustomizing.xhtml
@@ -14,7 +14,8 @@
   %browserDTD;
 ]>
 
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      disablefastfind="true">
 	<head>
 		<title>&customizeMode.tabTitle;</title>
 	</head>

From 29888de26b0a10575a1db464c0073222229fc970 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Thu, 9 May 2013 12:00:31 -0400
Subject: [PATCH 096/230] Bug 869349 - When customization is finished, persist
 toolbar currentsets after unwrapping them - not before. r=jaws.

---
 .../customizableui/src/CustomizeMode.jsm         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index d2f36fa3c609..92580c9be49b 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -170,14 +170,6 @@ CustomizeMode.prototype = {
     let window = this.window;
     let document = this.document;
 
-    if (this._changed) {
-      // XXXmconley: At first, it seems strange to also persist the old way with
-      //             currentset - but this might actually be useful for switching
-      //             to old builds. We might want to keep this around for a little
-      //             bit.
-      this.persistCurrentSets();
-    }
-
     document.documentElement.removeAttribute("customizing");
 
     for (let target of this.areas) {
@@ -192,6 +184,14 @@ CustomizeMode.prototype = {
       target.removeEventListener("drop", this);
     }
 
+    if (this._changed) {
+      // XXXmconley: At first, it seems strange to also persist the old way with
+      //             currentset - but this might actually be useful for switching
+      //             to old builds. We might want to keep this around for a little
+      //             bit.
+      this.persistCurrentSets();
+    }
+
     // And drop all area references.
     this.areas = [];
 

From be4db4870ed1d1e7e771f411e187a9f82d1b2f9a Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Thu, 9 May 2013 12:00:33 -0400
Subject: [PATCH 097/230] Bug 867585 - Create panelmultiview binding for panels
 with subviews. r=Unfocused.

---
 .../components/customizableui/content/jar.mn  |   1 +
 .../customizableui/content/panelUI.css        |  30 +++
 .../customizableui/content/panelUI.inc.xul    | 118 +++++------
 .../customizableui/content/panelUI.js         | 187 ++---------------
 .../customizableui/content/panelUI.xml        | 196 ++++++++++++++++++
 .../customizableui/panelUIOverlay.inc.css     |  97 ++++-----
 .../windows/customizableui/panelUIOverlay.css |   2 +-
 7 files changed, 333 insertions(+), 298 deletions(-)
 create mode 100644 browser/components/customizableui/content/panelUI.css

diff --git a/browser/components/customizableui/content/jar.mn b/browser/components/customizableui/content/jar.mn
index 73664afe9e8f..f254bef3b772 100644
--- a/browser/components/customizableui/content/jar.mn
+++ b/browser/components/customizableui/content/jar.mn
@@ -4,6 +4,7 @@
 
 browser.jar:
   content/browser/customizableui/aboutCustomizing.xhtml
+  content/browser/customizableui/panelUI.css
   content/browser/customizableui/panelUI.js
   content/browser/customizableui/panelUI.xml
   content/browser/customizableui/panelUIOverlay.xul
diff --git a/browser/components/customizableui/content/panelUI.css b/browser/components/customizableui/content/panelUI.css
new file mode 100644
index 000000000000..8d77de102678
--- /dev/null
+++ b/browser/components/customizableui/content/panelUI.css
@@ -0,0 +1,30 @@
+/* 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/. */
+
+.panel-viewstack[view="main"] > .panel-clickcapturer {
+  pointer-events: none;
+}
+
+.panel-viewcontainer,
+.panel-viewstack {
+  overflow: hidden;
+}
+
+.panel-viewstack {
+  position: relative;
+}
+
+.panel-subviews {
+  -moz-stack-sizing: ignore;
+  transform: translateX(0);
+  overflow-y: hidden;
+}
+
+.panel-subviews[panelopen] {
+  transition: transform 150ms;
+}
+
+.panel-viewcontainer[panelopen] {
+  transition: height 150ms;
+}
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index d6005a217e8e..2d2716042f5a 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -7,75 +7,59 @@
        type="arrow"
        level="top"
        consumeoutsideclicks="true">
-  <box id="PanelUI-container">
-    <stack id="PanelUI-viewStack" view="main">
-      <vbox id="PanelUI-mainView">
-        <vbox class="PanelUI-pageControls" pack="center">
-          <hbox class="PanelUI-editControls">
-            <toolbarbutton id="PanelUI-cut-btn" flex="1"
-                           label="&cutCmd.label;"
-                           tooltiptext="&cutButton.tooltip;"
-                           command="cmd_cut"/>
-            <toolbarbutton id="PanelUI-copy-btn" flex="1"
-                           label="&copyCmd.label;"
-                           tooltiptext="&copyButton.tooltip;"
-                           command="cmd_copy"/>
-            <toolbarbutton id="PanelUI-paste-btn" flex="1"
-                           label="&pasteCmd.label;"
-                           tooltiptext="&pasteButton.tooltip;"
-                           command="cmd_paste"/>
-          </hbox>
-          <hbox class="PanelUI-zoomControls">
-            <toolbarbutton id="PanelUI-zoomOut-btn" flex="1"
-                           noautoclose="true" label="&fullZoomReduceCmd.label;"
-                           command="cmd_fullZoomReduce"
-                           tooltiptext="&zoomOutButton.tooltip;"/>
-            <toolbarbutton id="PanelUI-zoomReset-btn" flex="1"
-                           noautoclose="true" label="&zoomReset.label;"
-                           tooltiptext="&zoomReset.tooltip;"
-                           command="cmd_fullZoomReset"/>
-            <toolbarbutton id="PanelUI-zoomIn-btn" flex="1"
-                           noautoclose="true" label="&fullZoomEnlargeCmd.label;"
-                           command="cmd_fullZoomEnlarge"
-                           tooltiptext="&zoomInButton.tooltip;"/>
-          </hbox>
-        </vbox>
-
-        <vbox id="PanelUI-contents" type="grid"/>
-
-        <vbox id="PanelUI-mainView-spring"/>
-
-        <hbox class="PanelUI-footer" align="center">
-          <toolbarbutton id="PanelUI-help-btn" label="&helpMenu.label;"
-                         command="openHelpLink('firefox-help');"/>
-          <spacer flex="1"/>
-          <toolbarbutton id="PanelUI-customize-btn" label="&appMenuCustomize.label;"
-                         command="cmd_CustomizeToolbars"/>
+  <panelmultiview id="PanelUI-multiView">
+    <panelmainview id="PanelUI-mainView">
+      <vbox class="PanelUI-pageControls" pack="center">
+        <hbox class="PanelUI-editControls">
+          <toolbarbutton id="PanelUI-cut-btn" flex="1"
+                         label="&cutCmd.label;"
+                         tooltiptext="&cutButton.tooltip;"
+                         command="cmd_cut"/>
+          <toolbarbutton id="PanelUI-copy-btn" flex="1"
+                         label="&copyCmd.label;"
+                         tooltiptext="&copyButton.tooltip;"
+                         command="cmd_copy"/>
+          <toolbarbutton id="PanelUI-paste-btn" flex="1"
+                         label="&pasteCmd.label;"
+                         tooltiptext="&pasteButton.tooltip;"
+                         command="cmd_paste"/>
+        </hbox>
+        <hbox class="PanelUI-zoomControls">
+          <toolbarbutton id="PanelUI-zoomOut-btn" flex="1"
+                         noautoclose="true" label="&fullZoomReduceCmd.label;"
+                         command="cmd_fullZoomReduce"
+                         tooltiptext="&zoomOutButton.tooltip;"/>
+          <toolbarbutton id="PanelUI-zoomReset-btn" flex="1"
+                         noautoclose="true" label="&zoomReset.label;"
+                         tooltiptext="&zoomReset.tooltip;"
+                         command="cmd_fullZoomReset"/>
+          <toolbarbutton id="PanelUI-zoomIn-btn" flex="1"
+                         noautoclose="true" label="&fullZoomEnlargeCmd.label;"
+                         command="cmd_fullZoomEnlarge"
+                         tooltiptext="&zoomInButton.tooltip;"/>
         </hbox>
       </vbox>
 
-      <!-- Used to capture click events over the PanelUI-mainView if we're in
-           subview mode. That way, any click on the PanelUI-mainView causes us
-           to revert to the mainView mode, whereupon PanelUI-click-capture then
-           allows click events to go through it. -->
-      <box id="PanelUI-clickCapturer">
-      </box>
+      <vbox id="PanelUI-contents" type="grid"/>
 
-      <!-- We manually set display: none (via a CSS attribute selector) on the
-           subviews that are not being displayed. We're using this over a deck
-           because a deck assumes the size of its largest child, regardless of
-           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-history" flex="1">
-          <label value="&appMenuHistory.label;"/>
-          <vbox id="PanelUI-historyItems"/>
-          <label value="&appMenuHistoryMore.label;"
-                 id="PanelUI-historyMore"
-                 class="text-link"
-                 onclick="PlacesCommandHook.showPlacesOrganizer('History'); PanelUI.hide();"/>
-        </vbox>
-      </box>
-    </stack>
-  </box>
+      <vbox id="PanelUI-mainView-spring" flex="1"/>
+
+      <footer class="PanelUI-footer" align="center">
+        <toolbarbutton id="PanelUI-help-btn" label="&helpMenu.label;"
+                       command="openHelpLink('firefox-help');"/>
+        <spacer flex="1"/>
+        <toolbarbutton id="PanelUI-customize-btn" label="&appMenuCustomize.label;"
+                       command="cmd_CustomizeToolbars"/>
+      </footer>
+    </panelmainview>
+
+    <panelsubview id="PanelUI-history" flex="1">
+      <label value="&appMenuHistory.label;"/>
+      <vbox id="PanelUI-historyItems"/>
+      <label value="&appMenuHistoryMore.label;"
+             id="PanelUI-historyMore"
+             class="text-link"
+             onclick="PlacesCommandHook.showPlacesOrganizer('History'); PanelUI.hide();"/>
+    </panelsubview>
+  </panelmultiview>
 </panel>
diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
index a04bc6fcc83f..191a72903a40 100644
--- a/browser/components/customizableui/content/panelUI.js
+++ b/browser/components/customizableui/content/panelUI.js
@@ -17,27 +17,14 @@ const PanelUI = {
    */
   get kElements() {
     return {
-      clickCapturer: "PanelUI-clickCapturer",
-      container: "PanelUI-container",
       contents: "PanelUI-contents",
       mainView: "PanelUI-mainView",
-      mainViewSpring: "PanelUI-mainView-spring",
+      multiView: "PanelUI-multiView",
       menuButton: "PanelUI-menu-button",
       panel: "PanelUI-popup",
-      subViews: "PanelUI-subViews",
-      viewStack: "PanelUI-viewStack"
     };
   },
 
-  /**
-   * Returns whether we're in subview mode. This can return true even if
-   * the transition to subview mode is not yet complete.
-   **/
-  get _showingSubView() {
-    return (this.viewStack.hasAttribute("view") &&
-            this.viewStack.getAttribute("view") == "subview");
-  },
-
   init: function() {
     for (let [k, v] of Iterator(this.kElements)) {
       // Need to do fresh let-bindings per iteration
@@ -52,31 +39,12 @@ const PanelUI = {
     for (let event of this.kEvents) {
       this.panel.addEventListener(event, this);
     }
-
-    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) {
-      this._syncContainerWithSubView();
-    }.bind(this));
   },
 
   uninit: function() {
     for (let event of this.kEvents) {
       this.panel.removeEventListener(event, this);
     }
-
-    this.clickCapturer.removeEventListener("click", this._onCapturerClick,
-                                           true);
   },
 
   /**
@@ -88,8 +56,7 @@ const PanelUI = {
    *        The mainView node to put back into place.
    */
   replaceMainView: function(aMainView) {
-    this.viewStack.insertBefore(aMainView, this.viewStack.firstChild);
-    this._syncContainerWithMainView();
+    this.multiView.insertBefore(aMainView, this.multiView.firstChild);
   },
 
   /**
@@ -104,6 +71,8 @@ const PanelUI = {
     if (this.panel.state == "open") {
       this.hide();
     } else if (this.panel.state == "closed") {
+      this.ensureRegistered();
+
       let anchor = aEvent.target;
       let iconAnchor =
         document.getAnonymousElementByAttribute(anchor, "class",
@@ -122,17 +91,12 @@ const PanelUI = {
   handleEvent: function(aEvent) {
     switch (aEvent.type) {
       case "popupshowing":
-        this.ensureRegistered();
-        let cstyle = window.getComputedStyle(this.viewStack, null);
-        this.container.style.height = cstyle.getPropertyValue("height");
-        this.container.style.width = cstyle.getPropertyValue("width");
         // Fall through
       case "popupshown":
         // Fall through
       case "popuphiding":
         // Fall through
       case "popuphidden": {
-        this.showMainView();
         this._updatePanelButton(aEvent.target);
         break;
       }
@@ -154,22 +118,7 @@ const PanelUI = {
    * in that view.
    */
   showMainView: function() {
-    // Are we showing a subview? If so, fire the ViewHiding event on it.
-    if (this._showingSubView) {
-      let viewNode = this._currentSubView;
-      let evt = document.createEvent("CustomEvent");
-      evt.initCustomEvent("ViewHiding", true, true, viewNode);
-      viewNode.dispatchEvent(evt);
-
-      viewNode.removeAttribute("current");
-      this._currentSubView = null;
-      this._subViewObserver.disconnect();
-    }
-
-    this.viewStack.setAttribute("view", "main");
-    this._syncContainerWithMainView();
-
-    this._shiftMainView();
+    this.multiView.showMainView();
   },
 
   /**
@@ -192,46 +141,7 @@ const PanelUI = {
     }
 
     if (aPlacementArea == CustomizableUI.AREA_PANEL) {
-      // The subview can get moved if the widget is not in the
-      // panel. For robustness, check that the subview is in the
-      // right place and move it if necessary.
-      if (viewNode.parentElement != this.subViews) {
-        this.subViews.appendChild(viewNode);
-      }
-
-      let oldHeight = this.mainView.clientHeight;
-      viewNode.setAttribute("current", true);
-      this._currentSubView = viewNode;
-
-      // Emit the ViewShowing event so that the widget definition has a chance
-      // to lazily populate the subview with things.
-      let evt = document.createEvent("CustomEvent");
-      evt.initCustomEvent("ViewShowing", true, true, viewNode);
-      viewNode.dispatchEvent(evt);
-
-      this.viewStack.setAttribute("view", "subview");
-      this.mainViewSpring.style.height = this.subViews.scrollHeight - oldHeight + "px";
-      this.container.style.height = this.subViews.scrollHeight + "px";
-
-      // Now we have to transition to transition the panel. There are a few parts
-      // to this:
-      //
-      // 1) The main view content gets shifted so that the center of the anchor
-      //    node is at the left-most edge of the panel.
-      // 2) The subview deck slides in so that it takes up almost all of the
-      //    panel.
-      // 3) If the subview is taller then the main panel contents, then the panel
-      //    must grow to meet that new height. Otherwise, it must shrink.
-      //
-      // All three of these actions make use of CSS transformations, so they
-      // should all occur simultaneously.
-      this._shiftMainView(aAnchor);
-      this._subViewObserver.observe(viewNode, {
-        attributes: true,
-        characterData: true,
-        childList: true,
-        subtree: true
-      });
+      this.multiView.showSubView(aViewId, aAnchor);
     } else {
       // Emit the ViewShowing event so that the widget definition has a chance
       // to lazily populate the subview with things.
@@ -239,43 +149,21 @@ const PanelUI = {
       evt.initCustomEvent("ViewShowing", true, true, viewNode);
       viewNode.dispatchEvent(evt);
 
-      let panel = document.createElement("panel");
-      panel.appendChild(viewNode);
-      panel.setAttribute("type", "arrow");
-      panel.setAttribute("id", "customizationui-widget-panel");
-      document.getElementById(CustomizableUI.AREA_NAVBAR).appendChild(panel);
-      panel.addEventListener("popuphidden", function() {
-        this.subViews.appendChild(viewNode);
-        panel.parentElement.removeChild(panel);
-      });
+      let tempPanel = document.createElement("panel");
+      tempPanel.appendChild(viewNode);
+      tempPanel.setAttribute("type", "arrow");
+      tempPanel.setAttribute("id", "customizationui-widget-panel");
+      document.getElementById(CustomizableUI.AREA_NAVBAR).appendChild(tempPanel);
+      tempPanel.addEventListener("popuphidden", function panelRemover() {
+        tempPanel.removeEventListener("popuphidden", panelRemover);
+        this.multiView.appendChild(viewNode);
+        tempPanel.parentElement.removeChild(tempPanel);
+      }.bind(this));
 
-      panel.openPopup(aAnchor, "bottomcenter topright");
+      tempPanel.openPopup(aAnchor, "bottomcenter topright");
     }
   },
 
-  /**
-   * Ensures that the container has the same height as the main view, minus
-   * any spring height. This is usually done after customization completes, or
-   * when switching back from a subview.
-   */
-  _syncContainerWithMainView: function() {
-    let springHeight = this.mainViewSpring.getBoundingClientRect().height;
-    this.container.style.height = (this.mainView.scrollHeight - springHeight) + "px";
-    this.mainViewSpring.style.height = "";
-  },
-
-  /**
-   * Ensures that the container has the same height as the subview holder.
-   * This is usually done when switching to a subview, or if a subview changes
-   * in size.
-   */
-  _syncContainerWithSubView: function() {
-    let springHeight = this.mainViewSpring.getBoundingClientRect().height;
-    let mainViewHeight = this.mainView.clientHeight - springHeight;
-    this.container.style.height = this.subViews.scrollHeight + "px";
-    this.mainViewSpring.style.height = (this.subViews.scrollHeight - mainViewHeight) + "px";
-  },
-
   /**
    * Sets the anchor node into the open or closed state, depending
    * on the state of the panel.
@@ -283,44 +171,5 @@ const PanelUI = {
   _updatePanelButton: function() {
     this.menuButton.open = this.panel.state == "open" ||
                            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
-   * at the clipping edge. If aAnchor is undefined or null, the main view
-   * content is shifted back to its original position.
-   */
-  _shiftMainView: function(aAnchor) {
-    if (aAnchor) {
-      // We need to find the left edge of the anchor, relative to the main
-      // panel. Then we need to add half the width of the anchor. This is the
-      // target that we need to transition to.
-      let anchorRect = aAnchor.getBoundingClientRect();
-      let mainViewRect = this.mainView.getBoundingClientRect();
-      let leftEdge = anchorRect.left - mainViewRect.left;
-      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;
-  },
-
-  /**
-   * When viewing a subview, any click on the main view gets intercepted by our
-   * capturer, and then we switch to the main view.
-   */
-  _onCapturerClick: function(aEvent) {
-    PanelUI.showMainView();
-  },
+  }
 };
diff --git a/browser/components/customizableui/content/panelUI.xml b/browser/components/customizableui/content/panelUI.xml
index 1ef86ddd62ae..edf9c6efccb1 100644
--- a/browser/components/customizableui/content/panelUI.xml
+++ b/browser/components/customizableui/content/panelUI.xml
@@ -37,4 +37,200 @@
       </property>
     </implementation>
   </binding>
+
+  <binding id="panelmultiview">
+    <resources>
+      <stylesheet src="chrome://browser/content/customizableui/panelUI.css"/>
+    </resources>
+    <content>
+      <xul:box anonid="viewContainer" class="panel-viewcontainer" xbl:inherits="panelopen">
+        <xul:stack anonid="viewStack" view="main" class="panel-viewstack">
+          <children includes="panelmainview"/>
+
+          <!-- Used to capture click events over the PanelUI-mainView if we're in
+               subview mode. That way, any click on the PanelUI-mainView causes us
+               to revert to the mainView mode, whereupon PanelUI-click-capture then
+               allows click events to go through it. -->
+          <xul:vbox anonid="clickCapturer" class="panel-clickcapturer"/>
+
+          <!-- We manually set display: none (via a CSS attribute selector) on the
+               subviews that are not being displayed. We're using this over a deck
+               because a deck assumes the size of its largest child, regardless of
+               whether or not it is shown. That's not good for our case, since we
+               want to allow each subview to be uniquely sized. -->
+          <xul:vbox anonid="subViews" class="panel-subviews" xbl:inherits="panelopen">
+            <children includes="panelsubview"/>
+          </xul:vbox>
+        </xul:stack>
+      </xul:box>
+    </content>
+    <implementation implements="nsIDOMEventListener">
+      <field name="_clickCapturer" readonly="true">
+        document.getAnonymousElementByAttribute(this, "anonid", "clickCapturer");
+      </field>
+      <field name="_viewContainer" readonly="true">
+        document.getAnonymousElementByAttribute(this, "anonid", "viewContainer");
+      </field>
+      <field name="_mainView" readonly="true">
+        this.querySelector("panelmainview");
+      </field>
+      <field name="_subViews" readonly="true">
+        document.getAnonymousElementByAttribute(this, "anonid", "subViews");
+      </field>
+      <field name="_viewStack" readonly="true">
+        document.getAnonymousElementByAttribute(this, "anonid", "viewStack");
+      </field>
+      <field name="_panel" readonly="true">
+        this.parentNode;
+      </field>
+
+      <field name="_currentSubView">null</field>
+      <field name="_anchorElement">null</field>
+      <field name="_mainViewHeight">0</field>
+      <field name="_subViewObserver">null</field>
+
+      <property name="showingSubView" readonly="true"
+                onget="return this._viewStack.getAttribute('view') == 'subview'"/>
+
+      <constructor><![CDATA[
+        this._clickCapturer.addEventListener("click", this);
+        this._panel.addEventListener("popupshowing", this);
+        this._panel.addEventListener("popuphidden", this);
+        // 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(this._syncContainerWithSubView.bind(this));
+        this._subViews.addEventListener("overflow", this);
+      ]]></constructor>
+
+      <destructor><![CDATA[
+        this._subViewObserver.disconnect();
+        this._panel.removeEventListener("popupshowing", this);
+        this._panel.removeEventListener("popuphidden", this);
+        this._clickCapturer.removeEventListener("click", this);
+      ]]></destructor>
+
+      <method name="showMainView">
+        <body><![CDATA[
+          if (this.showingSubView) {
+            let viewNode = this._currentSubView;
+            let evt = document.createEvent("CustomEvent");
+            evt.initCustomEvent("ViewHiding", true, true, viewNode);
+            viewNode.dispatchEvent(evt);
+
+            viewNode.removeAttribute("current");
+            this._currentSubView = null;
+
+            this._viewContainer.style.height = this._mainViewHeight + "px";
+            this._subViewObserver.disconnect();
+
+            this._viewStack.setAttribute("view", "main");
+          }
+
+          this._shiftMainView();
+        ]]></body>
+      </method>
+
+      <method name="showSubView">
+        <parameter name="aViewId"/>
+        <parameter name="aAnchor"/>
+        <body><![CDATA[
+          let viewNode = this.querySelector("#" + aViewId);
+          viewNode.setAttribute("current", true);
+          // Emit the ViewShowing event so that the widget definition has a chance
+          // to lazily populate the subview with things.
+          let evt = document.createEvent("CustomEvent");
+          evt.initCustomEvent("ViewShowing", true, true, viewNode);
+          viewNode.dispatchEvent(evt);
+
+          this._currentSubView = viewNode;
+
+          // Now we have to transition to transition the panel. There are a few parts
+          // to this:
+          //
+          // 1) The main view content gets shifted so that the center of the anchor
+          //    node is at the left-most edge of the panel.
+          // 2) The subview deck slides in so that it takes up almost all of the
+          //    panel.
+          // 3) If the subview is taller then the main panel contents, then the panel
+          //    must grow to meet that new height. Otherwise, it must shrink.
+          //
+          // All three of these actions make use of CSS transformations, so they
+          // should all occur simultaneously.
+          this._viewStack.setAttribute("view", "subview");
+          this._shiftMainView(aAnchor);
+
+          this._mainViewHeight = this._viewStack.clientHeight;
+          this._viewContainer.style.height = this._subViews.scrollHeight + "px";
+          this._subViewObserver.observe(viewNode, {
+            attributes: true,
+            characterData: true,
+            childList: true,
+            subtree: true
+          });
+        ]]></body>
+      </method>
+
+      <method name="_shiftMainView">
+        <parameter name="aAnchor"/>
+        <body><![CDATA[
+          if (aAnchor) {
+            // We need to find the left edge of the anchor, relative to the main
+            // panel. Then we need to add half the width of the anchor. This is the
+            // target that we need to transition to.
+            let anchorRect = aAnchor.getBoundingClientRect();
+            let mainViewRect = this._mainView.getBoundingClientRect();
+            let leftEdge = anchorRect.left - mainViewRect.left;
+            let center = aAnchor.clientWidth / 2;
+            let target = leftEdge + center;
+            this._mainView.style.transform = "translateX(-" + target + "px)";
+            aAnchor.classList.add("panel-multiview-anchor");
+          } else {
+            this._mainView.style.transform = "";
+            if (this.anchorElement)
+              this.anchorElement.classList.remove("panel-multiview-anchor");
+          }
+          this.anchorElement = aAnchor;
+        ]]></body>
+      </method>
+
+      <method name="handleEvent">
+        <parameter name="aEvent"/>
+        <body><![CDATA[
+          switch(aEvent.type) {
+            case "click":
+              if (aEvent.originalTarget == this._clickCapturer) {
+                this.showMainView();
+              }
+              break;
+            case "overflow":
+              // Resize the subview on the next tick.
+              setTimeout(this._syncContainerWithSubView.bind(this), 0);
+              break;
+            case "popupshowing":
+              this.setAttribute("panelopen", "true");
+              this._syncContainerWithMainView();
+              break;
+            case "popuphidden":
+              this.removeAttribute("panelopen");
+              this.showMainView();
+              break;
+          }
+        ]]></body>
+      </method>
+
+      <method name="_syncContainerWithSubView">
+        <body><![CDATA[
+          this._viewContainer.style.height = this._subViews.scrollHeight + "px";
+        ]]></body>
+      </method>
+      <method name="_syncContainerWithMainView">
+        <body><![CDATA[
+          this._viewContainer.style.height = this._mainView.scrollHeight + "px";
+        ]]></body>
+      </method>
+
+    </implementation>
+  </binding>
+
 </bindings>
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index 7dc5db9d83cd..0f5fcec89ba4 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -2,6 +2,34 @@
  * 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/. */
 
+panelmultiview {
+  -moz-binding: url("chrome://browser/content/customizableui/panelUI.xml#panelmultiview");
+}
+
+panelmainview,
+panelsubview {
+  display: -moz-box;
+  -moz-box-orient: vertical;
+}
+
+panelmainview {
+  transition: transform 150ms;
+}
+
+panelmultiview > panelsubview:not([current]) {
+  display: none;
+}
+
+.panel-subviews {
+  background-image: linear-gradient(to bottom, white 1px, rgba(255, 255, 255, 0) 15px);
+  background-color: -moz-dialog;
+  box-shadow: -1px 0px 0px rgba(0, 0, 0, 0.2), -1px 0px 2px rgba(0, 0, 0, 0.1), 1px 0px 0px rgba(255, 255, 255, 0.2) inset;
+  margin-left: 38px;
+}
+
+.panel-viewstack[view="main"] > .panel-subviews {
+  transform: translateX(@menuPanelWidth@);
+}
 
 #PanelUI-contents[type="list"] > toolbarbutton {
   -moz-binding: url("chrome://browser/content/panelUI.xml#toolbarbutton");
@@ -55,61 +83,8 @@
   padding: .5em 1em;
 }
 
-#PanelUI-container {
-  overflow: hidden;
-}
-
-#PanelUI-popup[panelopen="true"] > #PanelUI-container,
-#PanelUI-mainView-spring {
-  transition: height 150ms;
-}
-
-#PanelUI-popup[panelopen="true"] > #PanelUI-container > #PanelUI-viewStack > #PanelUI-mainView {
-  transition: transform 150ms;
-}
-
-#PanelUI-viewStack[view="main"] > #PanelUI-clickCapturer {
-  pointer-events: none;
-}
-
-#PanelUI-viewStack {
-  position: relative;
-}
-
-#PanelUI-viewStack,
-#PanelUI-container {
-  min-width: @menuPanelWidth@;
-}
-
-#PanelUI-mainView-spring {
-  height: 0;
-}
-
-#PanelUI-subViews {
-  -moz-stack-sizing: ignore;
-  background-image: linear-gradient(to bottom, white 1px, rgba(255, 255, 255, 0) 15px);
-  background-color: -moz-dialog;
-  box-shadow: -1px 0px 0px rgba(0, 0, 0, 0.2), -1px 0px 2px rgba(0, 0, 0, 0.1), 1px 0px 0px rgba(255, 255, 255, 0.2) inset;
-  margin-left: 38px;
-  transform: translateX(@menuPanelWidth@);
-  transition: transform 150ms;
-  overflow-y: hidden;
-}
-
-#PanelUI-subViews > .PanelUI-subView:not([current]) {
-  display: none;
-}
-
-#PanelUI-viewStack[view="subview"] > #PanelUI-subViews {
-  transform: translateX(0);
-}
-
-#PanelUI-contents[type="list"] > toolbarbutton {
-  -moz-box-orient: horizontal;
-}
-
 #PanelUI-contents[type="list"] toolbarbutton > .toolbarbutton-text,
-#PanelUI-subViews toolbarbutton > .toolbarbutton-text,
+panelsubview toolbarbutton > .toolbarbutton-text,
 #customizationui-widget-panel toolbarbutton > .toolbarbutton-text {
   text-align: start;
   -moz-padding-start: 8px;
@@ -194,8 +169,8 @@
   display: none;
 }
 
-#PanelUI-subViews toolbarbutton,
-#PanelUI-mainView toolbarbutton,
+panelmainview toolbarbutton,
+panelsubview toolbarbutton,
 #customizationui-widget-panel toolbarbutton {
   -moz-appearance: none;
   padding: 2px 6px;
@@ -210,8 +185,8 @@
   transition-duration: 150ms;
 }
 
-#PanelUI-subViews toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
-#PanelUI-mainView toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
+panelmainview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
+panelsubview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #customizationui-widget-panel toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #PanelUI-mainView .PanelUI-pageControls toolbarbutton,
 #PanelUI-mainView #PanelUI-customize-btn {
@@ -222,8 +197,8 @@
               0 0 2px hsla(210,54%,20%,.1);
 }
 
-#PanelUI-subViews toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
-#PanelUI-mainView toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
+panelmainview toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
+panelsubview toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
 #customizationui-widget-panel toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active) {
   background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
   background-color: hsla(210,54%,20%,.15);
@@ -240,7 +215,7 @@
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
-#PanelUI-contents > toolbarbutton.panelui-mainview-anchor {
+toolbarbutton.panel-multiview-anchor {
   background-color: Highlight;
   background-image: linear-gradient(rgba(255,255,255,0.3), rgba(255,255,255,0));
   background-repeat: repeat-x;
diff --git a/browser/themes/windows/customizableui/panelUIOverlay.css b/browser/themes/windows/customizableui/panelUIOverlay.css
index 0afbeb7780da..990029662e64 100644
--- a/browser/themes/windows/customizableui/panelUIOverlay.css
+++ b/browser/themes/windows/customizableui/panelUIOverlay.css
@@ -30,4 +30,4 @@
   -moz-image-region: rect(0, 306px, 18px, 288px);
   padding-left: 12px;
   padding-right: 12px;
-}
\ No newline at end of file
+}

From 55b1525f3382931b48d67a8130492e15f3277ba3 Mon Sep 17 00:00:00 2001
From: Blake Winton <bwinton@latte.ca>
Date: Thu, 9 May 2013 16:31:15 -0400
Subject: [PATCH 098/230] Bug 858660 - Remove done button from customize mode. 
 r,ui-r=mconley

---
 .../components/customizableui/content/customizeMode.inc.xul    | 3 +--
 browser/locales/en-US/chrome/browser/browser.dtd               | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/browser/components/customizableui/content/customizeMode.inc.xul b/browser/components/customizableui/content/customizeMode.inc.xul
index 49ab3c42de10..862ff8ce66cb 100644
--- a/browser/components/customizableui/content/customizeMode.inc.xul
+++ b/browser/components/customizableui/content/customizeMode.inc.xul
@@ -41,8 +41,7 @@
       </vbox>
     </deck>
   </hbox>
-  <hbox pack="end">
+  <hbox pack="start">
     <button oncommand="gCustomizeMode.reset();" label="&customizeMode.restoreDefaults;"/>
-    <button oncommand="BrowserToolboxCustomizeDone();" label="&customizeMode.done;"/>
   </hbox>
 </vbox>
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 1d3d8ffa6ea5..6d25790677d0 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -645,7 +645,6 @@ just addresses the organization to follow, e.g. "This site is run by " -->
 <!ENTITY customizeMode.appearance.label "Appearance">
 <!ENTITY customizeMode.appearance.header "Bling!">
 <!ENTITY customizeMode.restoreDefaults "Restore Defaults">
-<!ENTITY customizeMode.done "Done">
 
 <!ENTITY social.chatBar.commandkey "c">
 <!ENTITY social.chatBar.label "Focus chats">

From 90667056f85a6b1de7e2af67a2d28d672be45fb0 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Thu, 9 May 2013 18:28:02 -0400
Subject: [PATCH 099/230] Bug 869101 - Update in-content customization to
 remove the Appearance section and clean up the styling. r=mconley

---
 .../content/customizeMode.inc.xul             |  68 +++++++-----------
 .../locales/en-US/chrome/browser/browser.dtd  |   4 +-
 browser/themes/linux/browser.css              |  15 ++++
 .../background-noise-toolbar.png              | Bin 0 -> 15601 bytes
 .../customization-mode-background.jpg         | Bin 92662 -> 0 bytes
 .../customizeMode-gridTexture.png             | Bin 0 -> 118 bytes
 .../customizeMode-separatorHorizontal.png     | Bin 0 -> 1426 bytes
 .../customizeMode-separatorVertical.png       | Bin 0 -> 1649 bytes
 browser/themes/linux/jar.mn                   |   5 +-
 .../background-noise-toolbar.png              | Bin 0 -> 15601 bytes
 .../customization-mode-background.jpg         | Bin 92662 -> 0 bytes
 .../customizeMode-gridTexture.png             | Bin 0 -> 118 bytes
 .../customizeMode-separatorHorizontal.png     | Bin 0 -> 1426 bytes
 .../customizeMode-separatorVertical.png       | Bin 0 -> 1649 bytes
 .../osx/customizableui/panelUIOverlay.css     |  11 +++
 browser/themes/osx/jar.mn                     |   5 +-
 .../customizableui/customizeMode.inc.css      |  60 ++++++++++------
 .../customizableui/panelUIOverlay.inc.css     |  13 ++--
 browser/themes/windows/browser.css            |  15 ++++
 .../background-noise-toolbar.png              | Bin 0 -> 15601 bytes
 .../customization-mode-background.jpg         | Bin 92662 -> 0 bytes
 .../customizeMode-gridTexture.png             | Bin 0 -> 118 bytes
 .../customizeMode-separatorHorizontal.png     | Bin 0 -> 1426 bytes
 .../customizeMode-separatorVertical.png       | Bin 0 -> 1649 bytes
 browser/themes/windows/jar.mn                 |  10 ++-
 25 files changed, 130 insertions(+), 76 deletions(-)
 create mode 100644 browser/themes/linux/customizableui/background-noise-toolbar.png
 delete mode 100644 browser/themes/linux/customizableui/customization-mode-background.jpg
 create mode 100644 browser/themes/linux/customizableui/customizeMode-gridTexture.png
 create mode 100644 browser/themes/linux/customizableui/customizeMode-separatorHorizontal.png
 create mode 100644 browser/themes/linux/customizableui/customizeMode-separatorVertical.png
 create mode 100644 browser/themes/osx/customizableui/background-noise-toolbar.png
 delete mode 100644 browser/themes/osx/customizableui/customization-mode-background.jpg
 create mode 100644 browser/themes/osx/customizableui/customizeMode-gridTexture.png
 create mode 100644 browser/themes/osx/customizableui/customizeMode-separatorHorizontal.png
 create mode 100644 browser/themes/osx/customizableui/customizeMode-separatorVertical.png
 create mode 100644 browser/themes/windows/customizableui/background-noise-toolbar.png
 delete mode 100644 browser/themes/windows/customizableui/customization-mode-background.jpg
 create mode 100644 browser/themes/windows/customizableui/customizeMode-gridTexture.png
 create mode 100644 browser/themes/windows/customizableui/customizeMode-separatorHorizontal.png
 create mode 100644 browser/themes/windows/customizableui/customizeMode-separatorVertical.png

diff --git a/browser/components/customizableui/content/customizeMode.inc.xul b/browser/components/customizableui/content/customizeMode.inc.xul
index 862ff8ce66cb..11563b4297b0 100644
--- a/browser/components/customizableui/content/customizeMode.inc.xul
+++ b/browser/components/customizableui/content/customizeMode.inc.xul
@@ -2,46 +2,28 @@
    - 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/. -->
 
-<vbox id="customization-container" flex="1" style="background: #DBEAF9;">
-  <hbox flex="1">
-    <richlistbox id="customization-categories"
-                 onselect="document.getElementById('customization-content').selectedIndex = this.selectedIndex;">
-      <richlistitem>
-        <label value="&customizeMode.menuAndToolbars.label;"/>
-        </richlistitem>
-        <richlistitem>
-        <label value="&customizeMode.appearance.label;"/>
-      </richlistitem>
-    </richlistbox>
-    <deck id="customization-content" flex="1">
-      <hbox id="customization-widgets">
-        <vbox flex="1">
-          <label value="&customizeMode.menuAndToolbars.header;"/>
-          <vbox id="customization-palette" flex="1"/>
-        </vbox>
-        <vbox>
-          <vbox id="customization-panelWrapper">
-            <html:style html:type="text/html" scoped="scoped">
-              @import url(chrome://global/skin/popup.css);
-            </html:style>
-            <box class="panel-arrowbox">
-              <box flex="1"/>
-              <image class="panel-arrow" side="top"/>
-            </box>
-            <box class="panel-arrowcontent" flex="1">
-              <hbox id="customization-panelHolder"/>
-              <box class="panel-inner-arrowcontentfooter" hidden="true"/>
-            </box>
-          </vbox>
-          <spacer flex="1"/>
-        </vbox>
-      </hbox>
-      <vbox id="customization-appearance">
-        <label value="&customizeMode.appearance.header;"/>
-      </vbox>
-    </deck>
-  </hbox>
-  <hbox pack="start">
-    <button oncommand="gCustomizeMode.reset();" label="&customizeMode.restoreDefaults;"/>
-  </hbox>
-</vbox>
+<hbox id="customization-container" flex="1">
+  <vbox flex="1" id="customization-palette-container">
+    <label id="customization-header" value="&customizeMode.menuAndToolbars.header;"/>
+    <vbox id="customization-palette" flex="1"/>
+    <hbox pack="start">
+      <button oncommand="gCustomizeMode.reset();" label="&customizeMode.restoreDefaults;" class="customizationmode-button"/>
+    </hbox>
+  </vbox>
+  <vbox id="customization-panel-container">
+    <vbox id="customization-panelWrapper">
+      <html:style html:type="text/html" scoped="scoped">
+        @import url(chrome://global/skin/popup.css);
+      </html:style>
+      <box class="panel-arrowbox">
+        <box flex="1"/>
+        <image class="panel-arrow" side="top"/>
+      </box>
+      <box class="panel-arrowcontent" flex="1">
+        <hbox id="customization-panelHolder"/>
+        <box class="panel-inner-arrowcontentfooter" hidden="true"/>
+      </box>
+    </vbox>
+    <spacer flex="1"/>
+  </vbox>
+</hbox>
\ No newline at end of file
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 6d25790677d0..76eee3a7d277 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -641,9 +641,7 @@ 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.header "More tools to add to the menu and toolbar">
-<!ENTITY customizeMode.appearance.label "Appearance">
-<!ENTITY customizeMode.appearance.header "Bling!">
+<!ENTITY customizeMode.menuAndToolbars.header "More Tools to Add to the Menu and Toolbar">
 <!ENTITY customizeMode.restoreDefaults "Restore Defaults">
 
 <!ENTITY social.chatBar.commandkey "c">
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index ede338f6fea6..0796b208fc07 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -2062,6 +2062,21 @@ chatbox {
 
 %include ../shared/customizableui/customizeMode.inc.css
 
+#main-window[customizing] #tab-view-deck {
+  background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png"),
+                    url("chrome://browser/skin/customizableui/background-noise-toolbar.png"),
+                    linear-gradient(to bottom, #bcbcbc, #b5b5b5);
+  background-attachment: fixed;
+}
+
+#main-window[customizing] #tab-view-deck {
+  padding: 2em;
+}
+
+#main-window[customizing] #tab-view-deck > #browser-panel {
+  box-shadow: 0 0 3px #333;
+}
+
 /* End customization mode */
 
 .click-to-play-plugins-notification-content {
diff --git a/browser/themes/linux/customizableui/background-noise-toolbar.png b/browser/themes/linux/customizableui/background-noise-toolbar.png
new file mode 100644
index 0000000000000000000000000000000000000000..d09ba9dafb5ede66e92ce577ecaa6f9575dba104
GIT binary patch
literal 15601
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
LNkvXXu0mjfSmbEw

literal 0
HcmV?d00001

diff --git a/browser/themes/linux/customizableui/customization-mode-background.jpg b/browser/themes/linux/customizableui/customization-mode-background.jpg
deleted file mode 100644
index 465cdb71f9bff80e491341780634956f8921d254..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 92662
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

diff --git a/browser/themes/linux/customizableui/customizeMode-gridTexture.png b/browser/themes/linux/customizableui/customizeMode-gridTexture.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7c2775cfc799da31a505b249f5a59b89c148a58
GIT binary patch
literal 118
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3ww^AIAr-gYUfIaWpuppLFlU13
zo%)jzH=|it_dY6Z)V5Pum31fM;KsnRdyNMlls~YU+j}r!!}-)?gCEKjOuj1pzc){H
R6$2W?;OXk;vd$@?2>=UhDL4QC

literal 0
HcmV?d00001

diff --git a/browser/themes/linux/customizableui/customizeMode-separatorHorizontal.png b/browser/themes/linux/customizableui/customizeMode-separatorHorizontal.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e17cb4db08e310e6c3a9e14c5bd722772dfb639
GIT binary patch
literal 1426
zcmV;D1#S9?P)<h;3K|Lk000e1NJLTq00H0t000aK1^@s6x+QMd000G9Nkl<ZcwX(B
zO>g8j42Jp2&TP87-2_FZ*z`~YX#f8&$|0v-TD03O+GIW~_Au6rWZI@|*6s|(0=Oef
z<V%hN>?7I<zJ2)NCprvAU4sc?4Z&YAsqGrtL{MTBO{tKpXU?nV*0rS?|0gxWT$4Rk
zkDq6Nu6OXn`raBhV?2-0_U3vZGP6O?P^%%gJ+DtHfU3z^dAVgB<XdX;8F{>6-g3=8
z#sk;;h`5Ij-#^|G5f#TWiW4lD8x^whqh#Wuxx}uaD}y=tQ2h$Y0e5uiL<09ifHnU#
zGmA_)={O5VPW94tmGYFkWHq({k?Ep`n}Bd<40otN!Hnl8UBM564!pS@pN%O<Pbd*d
zft6k>^cwWr;FGJWH56^iUiAxVNY_!3*S`zWWypI|h0Q&Pl6nxug~ff)Ask{N|0o70
zU(|K)2nWE{pR_|*^#s(KAbeauu4+)$qNVGiBDWB;q!32LB8CMt0-;$2NC!C5Dr8Jq
z1n^7HWB}e-LBmBZQJlg|HyfQ;*|f_$6Q7u`0JN72W(f^gVd*D*=mEoRHi*J^>g!ri
z;i|JAgJM&N?JI?U7{GJL8LF1L(fB~kx%vaa7d>1*64%FIhtv<EQRqGv@<+Iapt!C8
z?Oj;gg<Ju)KKKM3xE<mB!{h3Ph?rwYlqm?f4SFoyxz~$`xgRcR4Fb|bpb=^+WDz|e
zEX9BJY=IIF1r8e;>45NpOrtOn+bOOlycd`ERQIZ$uvfZ^H#A~4=gR!;x)F-pLj)#j
z{GqLcF0BXrNTwAfP|{NS4!EW{0S)%@tk4BY+4c71+56KLXxE{Q)7;ZG=p1n?wSfkJ
zW55QN?V%HYBiaC|4~X#byU%482xa%e>2!4?m+OmFB%?u#Q%BcLn~+a|WG<{ra)U72
zb4VGC7*-+-S`)#=jfP|~sz7(fEL;W*9i--4!N5;L!DcBas|vtIb+;05x&lO~LT_a|
ztnB){5(st=B(mG%Dx}MHM+6Cf9mwPf=+-4fb#5XVq<Ud@lYrF=EyQ}Sr#V2lzyDk&
z0KApJk)RCru4j*3FB8QAn;u7UC%EO(O}JjwR|DEi=ILm_{o+o~dDA648hkuumslEP
z7rXo>d_P#&&w^XXXdN(mjQ}RQ$$%0gmUf=D4QxV>M}7f5#}9;I@K545U3>B!@LS>+
zT|&kuGBq?I{9=p1i%wwUZ`Xi35k9Qft_G+Z4v24Bh{Rzhip$kwE%!iU*Q@g`{9^^A
ztljR$S~2syl4Q0^bk(*p<X`N(EeAGR!#iMGem~du1YwfL&33?Vh&Ea*l>4OBpu$vT
z^lKC=onCV~YYozQd(NG5HT>{btl{FhSo;HClHVJ~-QABhfTMf;NkAvR6ZL*v2g_^*
zK{!Nc_C7sCD7lq7ZKQQl-(G{gW1XpnTUy37+nZei!2kKa+~?MS(P?1^pY%=8_D_DC
zHy=oVadFP&#>qTisRfW-YhQXh+~323b6OqJrzlSIUupo;dhLcn@1b$+y&nV%J5=tY
zxYpdc`>r+jr+GRvd0?3<@63?5YAv>O&vro1U$YJri}~!lUkAckf=Ywd5cr$@TnaY-
z+t{B;&`BYw`AaLy!{jCRJ==5K*FUAIPn0+Idm22vr%|J-!pxj=JqK{);lylur$0ZC
zucZcQcXVFk&okjBuCfN%8QRS`H|zcRRfCOg5@Nd9bCzWuR9+M?3OLSV2wmW1+0Vv!
z<?!${MpDt7hVFE+qpD~bi-nHkBFzrTF~Auf^P-B9Z9LQRC-LJ9be+S|G8VHP0ME#t
gX&H-M9>A9IFDL!=ycbq6DF6Tf07*qoM6N<$g5jpFQvd(}

literal 0
HcmV?d00001

diff --git a/browser/themes/linux/customizableui/customizeMode-separatorVertical.png b/browser/themes/linux/customizableui/customizeMode-separatorVertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc4caee812878f246c87d71093768eb36c5656fc
GIT binary patch
literal 1649
zcmV-%29EiOP)<h;3K|Lk000e1NJLTq000aC00H0#1^@s6k%Ww@000I!Nkl<ZcwX&W
z&2ro}3<e<WI@^q$G<B01PYyo#{hug@+}lH&L(@7E(3uTMuNI_0ijuN+q)bM;8GHf2
z55M#nu5a)5*T3Dtn-3r0@a_&?zkd%mHy;6RZvo&VoIeBtARr*T0}ucZfw6}GpM*pt
z`~_x!JJx`ss22hO{XCp$_%23I!iOX9S9u#Z36G%f_Fs9EUOQ9zUIUJ=-O+7=S71C2
z5Kc#g+#5tV1rQMMr?iha-kk%G&d*=G2Ija)yQ7YsleT>r{Lj`yLGY;HNFW(bdo2P{
zo9?3~weDzxY2-enco6V^;L08GwL^F6ScgVjSx!6hbS~J(s)W<Tfj`yL+z_#jRh#rK
zX;LdBPiZ>T&YV0Yl2fyoJs;X6ZSMh6PdhlJ;5u7?)@PhoW}T9g+GppqgNOq^1z{o6
z@Ya=@hoMR0-EgXWxm1rz9?AA0E-b=P9`HoO;YNbbzmxVbM}rSe<4Bj-E*{=HAA};~
zPB-EcN0&<tD0+fP4FI$Otem({YG{YKabs4EY^Egu)prr?gAS*$@RnintEc{0L(l~^
zW<HQ{PG!e>dnQXE8$#I+8a;^wT}K0x1{t^Cxwdi`H>uV6nQ^SGc7>S}Ot*?*iwDUs
zGtxMqgN9GZ9v5hs5KDW9KIAejVrxJzrDgSrQF?Y7HK{p^C#%d@8OIzu)+Xk_>?x|g
z<!eaiw3M2JA&wMLnI@@?CBATI9*nwVXszWTSkPty%1fnkmg;=ydj(KNrG{P7#_uMS
zd!zDEbMjpaza8wP1cm2HhO8A!_83R*WoR;p69bTvO0ENN{O4BHC2Jih?GGaK1eYlp
zCu9O5UZ_Q!)JaKk##w-T=Io5~&+l=7&beRoz)q72ndW|<-oz<hk9HJ>ESqU@*mSu^
zg9ZnxEyh$iO6wisel(Wsd<bA!rlHtR{aO}l>iHVPSn-SN5(x;UYn#+Aezsq<2oKuC
zuG0X^A3e7&7fX`m$K=LthX*qoHz$ki)AdZt^x!j=CRw{`2(tp<vUMr&OnF-hjTscf
zkzY?LW<C#;`FU{Gt;94H03<i3#UjJ58X|#tvYj?smhB^RMKSgQYow_75iS?dEHyd^
z8Q|5Y86zy#HmMXC1YZO|EbRecXI^~=l0iDi+Fev+HVrcTB(fsYBC@E4`u)MSy}ry;
zIemeRy;*58UaS~P0YE&sk>Pid`FWt{QoZ|L0rVZyD<dD|BJ+V3(jd<wH0=H$vH}lH
zVMC#k3tB9#-csrVmI7+lfu9Yq0XDz}z>S9=v_HIY?}rKv7INc(UX;@tU;}Ib&ID{c
z@Jc3O0`Rwcf4Y1gHoykh0P+%?-T?SQoW@K*pAbUCIZQ&VbQ*Cv9@qxpPn-{!3E=2&
zw><*DzcnT`%>W=%eBcY?0li5*4!<LgXu$P+KnsA=HS~o5ex?b;vuQv?3xF3|W_a#~
zq8-MC`-8T>UPG|958rq#;&23jONRF<0Df_O8u5p(G{~zt-4_CaZQmxD#3SL2wd=qf
z#1YLg8KWv<{>>_Zl6Kpb4=05NU%=d2Jyjy4c)+0~ni>R5vb9O<Ga)d0$(0X@iU4fz
zu<FK+qp^gm94nRr(z#7Ul?z8&5a)Cn`vq5;EKu7{zeJGbnZ`k*?n<gRPAip&=7!QM
zX+(TZ_Zpx;HUMXw1irZU=QAES-Vm(mzN^b=dyn&I41z&8HEW!VaQ^|o*9@jRV0d)$
zDg*0dX*g5<qknCmRRYCM=8uXC+S-PKg-x-KvP=L(IhSh4_7!kfoDa4W6qI+R{Q;w4
z&4x(<%SO59Ab|C^4ipDqL1=JsWA8_2&%fOJlWJKCWR)3fhYNso#^KaiqiM#fH!iSn
zn8kSgpKxH5Ff6;KNSAx@DuR&V1J*m8Gi%@(*EsL3G^gfPJ6hv*$BJ>U+HOt};4Ed%
zlp_d>ZbJjpg~UC&X7bepV8OjN_A!<bkZ3G4Ft1dqk-KOC@3b3~T93Qj+aJ|DAJuTB
zQj}A16tuK${)X~rZK-T^QX(MEx<4R@s(b~b1G_1}*ntq!q#2WOY31vN+P=WpTGn~n
v^^a&jS9T!o5dhA50U|OYjr;H|BZ2-0oREJsIP+wJ00000NkvXXu0mjf%MJD6

literal 0
HcmV?d00001

diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index e66e4ff8dcd1..33f991af039d 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -22,7 +22,10 @@ browser.jar:
 * skin/classic/browser/browser.css
 * skin/classic/browser/browser-lightweightTheme.css
   skin/classic/browser/click-to-play-warning-stripes.png
-  skin/classic/browser/customizableui/customization-mode-background.jpg (customizableui/customization-mode-background.jpg)
+  skin/classic/browser/customizableui/background-noise-toolbar.png  (customizableui/background-noise-toolbar.png)
+  skin/classic/browser/customizableui/customizeMode-gridTexture.png  (customizableui/customizeMode-gridTexture.png)
+  skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png  (customizableui/customizeMode-separatorHorizontal.png)
+  skin/classic/browser/customizableui/customizeMode-separatorVertical.png  (customizableui/customizeMode-separatorVertical.png)
 * skin/classic/browser/engineManager.css
   skin/classic/browser/Geolocation-16.png
   skin/classic/browser/Geolocation-64.png
diff --git a/browser/themes/osx/customizableui/background-noise-toolbar.png b/browser/themes/osx/customizableui/background-noise-toolbar.png
new file mode 100644
index 0000000000000000000000000000000000000000..d09ba9dafb5ede66e92ce577ecaa6f9575dba104
GIT binary patch
literal 15601
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
LNkvXXu0mjfSmbEw

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/customizableui/customization-mode-background.jpg b/browser/themes/osx/customizableui/customization-mode-background.jpg
deleted file mode 100644
index 465cdb71f9bff80e491341780634956f8921d254..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 92662
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

diff --git a/browser/themes/osx/customizableui/customizeMode-gridTexture.png b/browser/themes/osx/customizableui/customizeMode-gridTexture.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7c2775cfc799da31a505b249f5a59b89c148a58
GIT binary patch
literal 118
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3ww^AIAr-gYUfIaWpuppLFlU13
zo%)jzH=|it_dY6Z)V5Pum31fM;KsnRdyNMlls~YU+j}r!!}-)?gCEKjOuj1pzc){H
R6$2W?;OXk;vd$@?2>=UhDL4QC

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/customizableui/customizeMode-separatorHorizontal.png b/browser/themes/osx/customizableui/customizeMode-separatorHorizontal.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e17cb4db08e310e6c3a9e14c5bd722772dfb639
GIT binary patch
literal 1426
zcmV;D1#S9?P)<h;3K|Lk000e1NJLTq00H0t000aK1^@s6x+QMd000G9Nkl<ZcwX(B
zO>g8j42Jp2&TP87-2_FZ*z`~YX#f8&$|0v-TD03O+GIW~_Au6rWZI@|*6s|(0=Oef
z<V%hN>?7I<zJ2)NCprvAU4sc?4Z&YAsqGrtL{MTBO{tKpXU?nV*0rS?|0gxWT$4Rk
zkDq6Nu6OXn`raBhV?2-0_U3vZGP6O?P^%%gJ+DtHfU3z^dAVgB<XdX;8F{>6-g3=8
z#sk;;h`5Ij-#^|G5f#TWiW4lD8x^whqh#Wuxx}uaD}y=tQ2h$Y0e5uiL<09ifHnU#
zGmA_)={O5VPW94tmGYFkWHq({k?Ep`n}Bd<40otN!Hnl8UBM564!pS@pN%O<Pbd*d
zft6k>^cwWr;FGJWH56^iUiAxVNY_!3*S`zWWypI|h0Q&Pl6nxug~ff)Ask{N|0o70
zU(|K)2nWE{pR_|*^#s(KAbeauu4+)$qNVGiBDWB;q!32LB8CMt0-;$2NC!C5Dr8Jq
z1n^7HWB}e-LBmBZQJlg|HyfQ;*|f_$6Q7u`0JN72W(f^gVd*D*=mEoRHi*J^>g!ri
z;i|JAgJM&N?JI?U7{GJL8LF1L(fB~kx%vaa7d>1*64%FIhtv<EQRqGv@<+Iapt!C8
z?Oj;gg<Ju)KKKM3xE<mB!{h3Ph?rwYlqm?f4SFoyxz~$`xgRcR4Fb|bpb=^+WDz|e
zEX9BJY=IIF1r8e;>45NpOrtOn+bOOlycd`ERQIZ$uvfZ^H#A~4=gR!;x)F-pLj)#j
z{GqLcF0BXrNTwAfP|{NS4!EW{0S)%@tk4BY+4c71+56KLXxE{Q)7;ZG=p1n?wSfkJ
zW55QN?V%HYBiaC|4~X#byU%482xa%e>2!4?m+OmFB%?u#Q%BcLn~+a|WG<{ra)U72
zb4VGC7*-+-S`)#=jfP|~sz7(fEL;W*9i--4!N5;L!DcBas|vtIb+;05x&lO~LT_a|
ztnB){5(st=B(mG%Dx}MHM+6Cf9mwPf=+-4fb#5XVq<Ud@lYrF=EyQ}Sr#V2lzyDk&
z0KApJk)RCru4j*3FB8QAn;u7UC%EO(O}JjwR|DEi=ILm_{o+o~dDA648hkuumslEP
z7rXo>d_P#&&w^XXXdN(mjQ}RQ$$%0gmUf=D4QxV>M}7f5#}9;I@K545U3>B!@LS>+
zT|&kuGBq?I{9=p1i%wwUZ`Xi35k9Qft_G+Z4v24Bh{Rzhip$kwE%!iU*Q@g`{9^^A
ztljR$S~2syl4Q0^bk(*p<X`N(EeAGR!#iMGem~du1YwfL&33?Vh&Ea*l>4OBpu$vT
z^lKC=onCV~YYozQd(NG5HT>{btl{FhSo;HClHVJ~-QABhfTMf;NkAvR6ZL*v2g_^*
zK{!Nc_C7sCD7lq7ZKQQl-(G{gW1XpnTUy37+nZei!2kKa+~?MS(P?1^pY%=8_D_DC
zHy=oVadFP&#>qTisRfW-YhQXh+~323b6OqJrzlSIUupo;dhLcn@1b$+y&nV%J5=tY
zxYpdc`>r+jr+GRvd0?3<@63?5YAv>O&vro1U$YJri}~!lUkAckf=Ywd5cr$@TnaY-
z+t{B;&`BYw`AaLy!{jCRJ==5K*FUAIPn0+Idm22vr%|J-!pxj=JqK{);lylur$0ZC
zucZcQcXVFk&okjBuCfN%8QRS`H|zcRRfCOg5@Nd9bCzWuR9+M?3OLSV2wmW1+0Vv!
z<?!${MpDt7hVFE+qpD~bi-nHkBFzrTF~Auf^P-B9Z9LQRC-LJ9be+S|G8VHP0ME#t
gX&H-M9>A9IFDL!=ycbq6DF6Tf07*qoM6N<$g5jpFQvd(}

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/customizableui/customizeMode-separatorVertical.png b/browser/themes/osx/customizableui/customizeMode-separatorVertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc4caee812878f246c87d71093768eb36c5656fc
GIT binary patch
literal 1649
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

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/customizableui/panelUIOverlay.css b/browser/themes/osx/customizableui/panelUIOverlay.css
index 3d65a4a0391f..c15671de2433 100644
--- a/browser/themes/osx/customizableui/panelUIOverlay.css
+++ b/browser/themes/osx/customizableui/panelUIOverlay.css
@@ -11,6 +11,17 @@
   list-style-image: url("chrome://browser/skin/Toolbar.png");
 }
 
+.PanelUI-pageControls toolbarbutton:not(:first-child) {
+  -moz-margin-start: 0;
+}
+.PanelUI-pageControls toolbarbutton:not(:last-child) {
+  -moz-margin-end: 0;
+}
+.PanelUI-pageControls toolbarbutton:not(:first-child):not(:last-child) {
+  margin-left: 0;
+  margin-right: 0;
+}
+
 #PanelUI-cut-btn {
   -moz-image-region: rect(0, 260px, 20px, 240px);
 }
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index 366e271971da..1a1774e1826c 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -21,7 +21,10 @@ 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/customizableui/customization-mode-background.jpg (customizableui/customization-mode-background.jpg)
+  skin/classic/browser/customizableui/background-noise-toolbar.png  (customizableui/background-noise-toolbar.png)
+  skin/classic/browser/customizableui/customizeMode-gridTexture.png  (customizableui/customizeMode-gridTexture.png)
+  skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png  (customizableui/customizeMode-separatorHorizontal.png)
+  skin/classic/browser/customizableui/customizeMode-separatorVertical.png  (customizableui/customizeMode-separatorVertical.png)
 * skin/classic/browser/engineManager.css                    (engineManager.css)
   skin/classic/browser/Geolocation-16.png
   skin/classic/browser/Geolocation-16@2x.png
diff --git a/browser/themes/shared/customizableui/customizeMode.inc.css b/browser/themes/shared/customizableui/customizeMode.inc.css
index c315bbdfe2d0..cf89968ed7e2 100644
--- a/browser/themes/shared/customizableui/customizeMode.inc.css
+++ b/browser/themes/shared/customizableui/customizeMode.inc.css
@@ -4,24 +4,10 @@
 
 /* Customization mode */
 
-#main-window[customizing] {
-  background-image: url("chrome://browser/skin/customizableui/customization-mode-background.jpg");
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-}
-
-#main-window[customizing] #tab-view-deck {
+#tab-view-deck {
   transition-property: padding;
-  transition-duration: 300ms;
+  transition-duration: 150ms;
   transition-timing-function: ease-out;
-  padding: 8em;
-}
-
-#main-window:not([customizing]) #tab-view-deck {
-  transition-property: padding;
-  transition-duration: 200ms;
-  transition-timing-function: ease-out;
-  padding: 0;
 }
 
 #main-window[customizing] .tabbrowser-tab:not([selected]),
@@ -29,10 +15,9 @@
   opacity: 0.4;
 }
 
-#main-window[customizing] .customization-target,
-#customization-panelHolder > #PanelUI-mainView {
-  box-shadow: inset 0 0 3px hsl(204,100%,40%);
-  border-radius: 2px;
+#main-window[customizing] .customization-target {
+  border: 1px dashed #bbb;
+  margin: 3px;
 }
 
 #main-window[customizing] .customization-target {
@@ -41,8 +26,38 @@
   padding-right: 10px;
 }
 
-#customization-panelWrapper {
-  padding: 0px 8px;
+#customization-container {
+  background-color: rgb(247,247,247);
+}
+
+#customization-palette-container {
+  padding: 25px;
+}
+
+#customization-header {
+  font-size: 1.5em;
+  line-height: 1.5em;
+  color: rgb(64,100,128);
+  font-weight: lighter;
+  margin-bottom: 1em;
+}
+
+#customization-panel-container {
+  padding: 15px 25px 25px;
+  background-image: url("chrome://browser/skin/customizableui/customizeMode-separatorHorizontal.png"),
+                    url("chrome://browser/skin/customizableui/customizeMode-separatorVertical.png"),
+                    url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png"),
+                    url("chrome://browser/skin/customizableui/background-noise-toolbar.png"),
+                    linear-gradient(to bottom, #3e86ce, #3878ba);
+  background-position: center top, left center, left top, left top, left top;
+  background-repeat: no-repeat, no-repeat, repeat, repeat, no-repeat;
+  background-size: auto 12px, 12px 100%, auto, auto, auto;
+  background-attachment: scroll, scroll, fixed, fixed, scroll;
+
+}
+
+#customization-panelWrapper > .panel-arrowcontent {
+  padding: 0 !important;
 }
 
 toolbarpaletteitem {
@@ -63,6 +78,7 @@ toolbarpaletteitem[mousedown] {
   display: block;
   overflow: auto;
   min-height: 3em;
+  margin-bottom: 25px;
 }
 
 #customization-palette > toolbarpaletteitem {
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index 0f5fcec89ba4..0723ca0dcdb6 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -111,14 +111,15 @@ panelsubview toolbarbutton > .toolbarbutton-text,
 
 .PanelUI-pageControls toolbarbutton {
   min-width: 7em;
-  max-width: 7em;
 }
 
 .PanelUI-pageControls toolbarbutton > .toolbarbutton-icon {
   -moz-margin-end: 0;
 }
 
-#PanelUI-contents[type="grid"] toolbarbutton {
+#PanelUI-contents[type="grid"] toolbarbutton,
+#customization-palette toolbarbutton {
+  -moz-appearance: none;
   -moz-box-orient: vertical;
   min-width: 7em;
   max-width: 7em;
@@ -126,7 +127,8 @@ panelsubview toolbarbutton > .toolbarbutton-text,
   max-height: 6em;
 }
 
-#PanelUI-contents[type="grid"] toolbarbutton .toolbarbutton-icon {
+#PanelUI-contents[type="grid"] toolbarbutton > .toolbarbutton-icon,
+#customization-palette toolbarbutton > .toolbarbutton-icon {
   min-width: calc(8em / 3);
   max-width: calc(8em / 3);
   min-height: calc(8em / 3);
@@ -171,7 +173,8 @@ panelsubview toolbarbutton > .toolbarbutton-text,
 
 panelmainview toolbarbutton,
 panelsubview toolbarbutton,
-#customizationui-widget-panel toolbarbutton {
+#customizationui-widget-panel toolbarbutton,
+.customizationmode-button {
   -moz-appearance: none;
   padding: 2px 6px;
   background: hsla(210,32%,93%,0) padding-box;
@@ -189,6 +192,7 @@ panelmainview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:acti
 panelsubview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #customizationui-widget-panel toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #PanelUI-mainView .PanelUI-pageControls toolbarbutton,
+.customizationmode-button,
 #PanelUI-mainView #PanelUI-customize-btn {
   background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
   border-color: hsla(210,54%,20%,.15) hsla(210,54%,20%,.2) hsla(210,54%,20%,.25);
@@ -199,6 +203,7 @@ panelsubview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:activ
 
 panelmainview toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
 panelsubview toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
+.customizationmode-button:hover:active,
 #customizationui-widget-panel toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active) {
   background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
   background-color: hsla(210,54%,20%,.15);
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 3152f96c7378..e0bedc0fabb0 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2439,6 +2439,21 @@ chatbox {
 
 %include ../shared/customizableui/customizeMode.inc.css
 
+#main-window[customizing] {
+  background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png");
+  background-attachment: fixed;
+}
+
+#main-window[customizing] #tab-view-deck {
+  padding: 0 2em 2em;
+}
+
+#customization-container {
+  border-left: 1px solid @toolbarShadowColor@;
+  border-right: 1px solid @toolbarShadowColor@;
+  background-clip: padding-box;
+}
+
 /* End customization mode */
 
 .click-to-play-plugins-notification-content {
diff --git a/browser/themes/windows/customizableui/background-noise-toolbar.png b/browser/themes/windows/customizableui/background-noise-toolbar.png
new file mode 100644
index 0000000000000000000000000000000000000000..d09ba9dafb5ede66e92ce577ecaa6f9575dba104
GIT binary patch
literal 15601
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
LNkvXXu0mjfSmbEw

literal 0
HcmV?d00001

diff --git a/browser/themes/windows/customizableui/customization-mode-background.jpg b/browser/themes/windows/customizableui/customization-mode-background.jpg
deleted file mode 100644
index 465cdb71f9bff80e491341780634956f8921d254..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 92662
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

diff --git a/browser/themes/windows/customizableui/customizeMode-gridTexture.png b/browser/themes/windows/customizableui/customizeMode-gridTexture.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7c2775cfc799da31a505b249f5a59b89c148a58
GIT binary patch
literal 118
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3ww^AIAr-gYUfIaWpuppLFlU13
zo%)jzH=|it_dY6Z)V5Pum31fM;KsnRdyNMlls~YU+j}r!!}-)?gCEKjOuj1pzc){H
R6$2W?;OXk;vd$@?2>=UhDL4QC

literal 0
HcmV?d00001

diff --git a/browser/themes/windows/customizableui/customizeMode-separatorHorizontal.png b/browser/themes/windows/customizableui/customizeMode-separatorHorizontal.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e17cb4db08e310e6c3a9e14c5bd722772dfb639
GIT binary patch
literal 1426
zcmV;D1#S9?P)<h;3K|Lk000e1NJLTq00H0t000aK1^@s6x+QMd000G9Nkl<ZcwX(B
zO>g8j42Jp2&TP87-2_FZ*z`~YX#f8&$|0v-TD03O+GIW~_Au6rWZI@|*6s|(0=Oef
z<V%hN>?7I<zJ2)NCprvAU4sc?4Z&YAsqGrtL{MTBO{tKpXU?nV*0rS?|0gxWT$4Rk
zkDq6Nu6OXn`raBhV?2-0_U3vZGP6O?P^%%gJ+DtHfU3z^dAVgB<XdX;8F{>6-g3=8
z#sk;;h`5Ij-#^|G5f#TWiW4lD8x^whqh#Wuxx}uaD}y=tQ2h$Y0e5uiL<09ifHnU#
zGmA_)={O5VPW94tmGYFkWHq({k?Ep`n}Bd<40otN!Hnl8UBM564!pS@pN%O<Pbd*d
zft6k>^cwWr;FGJWH56^iUiAxVNY_!3*S`zWWypI|h0Q&Pl6nxug~ff)Ask{N|0o70
zU(|K)2nWE{pR_|*^#s(KAbeauu4+)$qNVGiBDWB;q!32LB8CMt0-;$2NC!C5Dr8Jq
z1n^7HWB}e-LBmBZQJlg|HyfQ;*|f_$6Q7u`0JN72W(f^gVd*D*=mEoRHi*J^>g!ri
z;i|JAgJM&N?JI?U7{GJL8LF1L(fB~kx%vaa7d>1*64%FIhtv<EQRqGv@<+Iapt!C8
z?Oj;gg<Ju)KKKM3xE<mB!{h3Ph?rwYlqm?f4SFoyxz~$`xgRcR4Fb|bpb=^+WDz|e
zEX9BJY=IIF1r8e;>45NpOrtOn+bOOlycd`ERQIZ$uvfZ^H#A~4=gR!;x)F-pLj)#j
z{GqLcF0BXrNTwAfP|{NS4!EW{0S)%@tk4BY+4c71+56KLXxE{Q)7;ZG=p1n?wSfkJ
zW55QN?V%HYBiaC|4~X#byU%482xa%e>2!4?m+OmFB%?u#Q%BcLn~+a|WG<{ra)U72
zb4VGC7*-+-S`)#=jfP|~sz7(fEL;W*9i--4!N5;L!DcBas|vtIb+;05x&lO~LT_a|
ztnB){5(st=B(mG%Dx}MHM+6Cf9mwPf=+-4fb#5XVq<Ud@lYrF=EyQ}Sr#V2lzyDk&
z0KApJk)RCru4j*3FB8QAn;u7UC%EO(O}JjwR|DEi=ILm_{o+o~dDA648hkuumslEP
z7rXo>d_P#&&w^XXXdN(mjQ}RQ$$%0gmUf=D4QxV>M}7f5#}9;I@K545U3>B!@LS>+
zT|&kuGBq?I{9=p1i%wwUZ`Xi35k9Qft_G+Z4v24Bh{Rzhip$kwE%!iU*Q@g`{9^^A
ztljR$S~2syl4Q0^bk(*p<X`N(EeAGR!#iMGem~du1YwfL&33?Vh&Ea*l>4OBpu$vT
z^lKC=onCV~YYozQd(NG5HT>{btl{FhSo;HClHVJ~-QABhfTMf;NkAvR6ZL*v2g_^*
zK{!Nc_C7sCD7lq7ZKQQl-(G{gW1XpnTUy37+nZei!2kKa+~?MS(P?1^pY%=8_D_DC
zHy=oVadFP&#>qTisRfW-YhQXh+~323b6OqJrzlSIUupo;dhLcn@1b$+y&nV%J5=tY
zxYpdc`>r+jr+GRvd0?3<@63?5YAv>O&vro1U$YJri}~!lUkAckf=Ywd5cr$@TnaY-
z+t{B;&`BYw`AaLy!{jCRJ==5K*FUAIPn0+Idm22vr%|J-!pxj=JqK{);lylur$0ZC
zucZcQcXVFk&okjBuCfN%8QRS`H|zcRRfCOg5@Nd9bCzWuR9+M?3OLSV2wmW1+0Vv!
z<?!${MpDt7hVFE+qpD~bi-nHkBFzrTF~Auf^P-B9Z9LQRC-LJ9be+S|G8VHP0ME#t
gX&H-M9>A9IFDL!=ycbq6DF6Tf07*qoM6N<$g5jpFQvd(}

literal 0
HcmV?d00001

diff --git a/browser/themes/windows/customizableui/customizeMode-separatorVertical.png b/browser/themes/windows/customizableui/customizeMode-separatorVertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc4caee812878f246c87d71093768eb36c5656fc
GIT binary patch
literal 1649
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

literal 0
HcmV?d00001

diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index 39fcdfbcd057..faa117a4cc24 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -24,7 +24,10 @@ browser.jar:
 *       skin/classic/browser/browser.css
 *       skin/classic/browser/browser-lightweightTheme.css
         skin/classic/browser/click-to-play-warning-stripes.png
-        skin/classic/browser/customizableui/customization-mode-background.jpg (customizableui/customization-mode-background.jpg)
+        skin/classic/browser/customizableui/background-noise-toolbar.png  (customizableui/background-noise-toolbar.png)
+        skin/classic/browser/customizableui/customizeMode-gridTexture.png  (customizableui/customizeMode-gridTexture.png)
+        skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png  (customizableui/customizeMode-separatorHorizontal.png)
+        skin/classic/browser/customizableui/customizeMode-separatorVertical.png  (customizableui/customizeMode-separatorVertical.png)
 *       skin/classic/browser/engineManager.css
         skin/classic/browser/Geolocation-16.png
         skin/classic/browser/Geolocation-64.png
@@ -282,7 +285,10 @@ browser.jar:
 *       skin/classic/aero/browser/browser.css                        (browser-aero.css)
 *       skin/classic/aero/browser/browser-lightweightTheme.css
         skin/classic/aero/browser/click-to-play-warning-stripes.png
-        skin/classic/aero/browser/customizableui/customization-mode-background.jpg (customizableui/customization-mode-background.jpg)
+        skin/classic/aero/browser/customizableui/background-noise-toolbar.png  (customizableui/background-noise-toolbar.png)
+        skin/classic/aero/browser/customizableui/customizeMode-gridTexture.png  (customizableui/customizeMode-gridTexture.png)
+        skin/classic/aero/browser/customizableui/customizeMode-separatorHorizontal.png  (customizableui/customizeMode-separatorHorizontal.png)
+        skin/classic/aero/browser/customizableui/customizeMode-separatorVertical.png  (customizableui/customizeMode-separatorVertical.png)
 *       skin/classic/aero/browser/engineManager.css
         skin/classic/aero/browser/Geolocation-16.png
         skin/classic/aero/browser/Geolocation-64.png

From b0ac4e2369a06f2618afdb11e6bdc134852770e4 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Fri, 10 May 2013 10:41:21 -0400
Subject: [PATCH 100/230] Bug 870463 - Set a minimum width for the location bar
 and search container. r=mconley

---
 browser/base/content/browser.css | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index c01af1690a44..f0c65465fbd5 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -185,6 +185,14 @@ toolbar[printpreview="true"] {
   direction: rtl;
 }
 
+#urlbar-container {
+  min-width: 50ch;
+}
+
+#search-container {
+  min-width: 25ch;
+}
+
 #main-window:-moz-lwtheme {
   background-repeat: no-repeat;
   background-position: top right;

From 3e4d98678588409a5eaaf12be7244ab6d2e02b6e Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Fri, 10 May 2013 16:24:18 -0400
Subject: [PATCH 101/230] Bug 870574 - Adjust customization look of OS X
 browser window to have grid background and padding. r=mconley

---
 .../customizableui/src/CustomizeMode.jsm      | 11 +++++-
 browser/themes/osx/browser.css                | 39 ++++++++++++++++++-
 .../customizableui/customizeMode.inc.css      |  5 ---
 3 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index 92580c9be49b..f391079743d1 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -170,7 +170,16 @@ CustomizeMode.prototype = {
     let window = this.window;
     let document = this.document;
 
-    document.documentElement.removeAttribute("customizing");
+    let documentElement = document.documentElement;
+    documentElement.setAttribute("customize-exiting", "true");
+    let tabViewDeck = document.getElementById("tab-view-deck");
+    tabViewDeck.addEventListener("transitionend", function onTransitionEnd(evt) {
+      if (evt.propertyName != "padding-top")
+        return;
+      tabViewDeck.removeEventListener("transitionend", onTransitionEnd);
+      documentElement.removeAttribute("customize-exiting");
+    });
+    documentElement.removeAttribute("customizing");
 
     for (let target of this.areas) {
       for (let toolbarItem of target.children) {
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 83e138496c51..bde42e835a91 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -2165,7 +2165,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   text-shadow: inherit;
 }
 
-#main-window:not([privatebrowsingmode=temporary]) #navigator-toolbox[tabsontop="true"]:not(:-moz-lwtheme)::before {
+#main-window:not([privatebrowsingmode=temporary]):not([customizing]):not([customize-exiting]) #navigator-toolbox[tabsontop="true"]:not(:-moz-lwtheme)::before {
   /* We want the titlebar to be unified, but we still want to be able
    * to give #TabsToolbar a background. So we can't set -moz-appearance:
    * toolbar on #TabsToolbar itself. Instead, we set it on a box of the
@@ -3533,6 +3533,43 @@ chatbox {
 
 %include ../shared/customizableui/customizeMode.inc.css
 
+#main-window[customizing] #titlebar {
+  padding-top: 0;
+}
+
+#main-window[customizing] #tab-view-deck {
+  padding: 28px 2em 2em;
+}
+
+#main-window[customizing] #tab-view-deck,
+#main-window[customize-exiting] #tab-view-deck {
+  background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png"),
+                    url("chrome://browser/skin/customizableui/background-noise-toolbar.png"),
+                    linear-gradient(to bottom, rgb(233,233,233), rgb(178,178,178) 21px);
+  background-attachment: fixed;
+}
+
+#main-window[customizing] #navigator-toolbox > toolbar:not(#TabsToolbar),
+#main-window[customizing] #customization-container {
+  border: 3px solid hsla(0,0%,0%,.1);
+  border-top-width: 0;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  -moz-border-right-colors: hsla(0,0%,0%,.05) hsla(0,0%,0%,.1) hsla(0,0%,0%,.2);
+  -moz-border-bottom-colors: hsla(0,0%,0%,.05) hsla(0,0%,0%,.1) hsla(0,0%,0%,.2);
+  -moz-border-left-colors: hsla(0,0%,0%,.05) hsla(0,0%,0%,.1) hsla(0,0%,0%,.2);
+}
+
+#main-window[customizing] #navigator-toolbox > toolbar:not(#TabsToolbar) {
+  border-bottom-width: 0;
+}
+
+#main-window[customizing] #TabsToolbar {
+  background-clip: padding-box;
+  border-right: 3px solid transparent;
+  border-left: 3px solid transparent;
+}
+
 /* End customization mode */
 
 panel[type="arrow"][popupid="click-to-play-plugins"] > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="top"],
diff --git a/browser/themes/shared/customizableui/customizeMode.inc.css b/browser/themes/shared/customizableui/customizeMode.inc.css
index cf89968ed7e2..784d17062b2c 100644
--- a/browser/themes/shared/customizableui/customizeMode.inc.css
+++ b/browser/themes/shared/customizableui/customizeMode.inc.css
@@ -10,11 +10,6 @@
   transition-timing-function: ease-out;
 }
 
-#main-window[customizing] .tabbrowser-tab:not([selected]),
-#main-window[customizing] .tabs-newtab-button {
-  opacity: 0.4;
-}
-
 #main-window[customizing] .customization-target {
   border: 1px dashed #bbb;
   margin: 3px;

From dc7acfe0d1e04d7a8a51b5be3350f7435cb81762 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 10 May 2013 16:32:55 -0400
Subject: [PATCH 102/230] Bug 870985 - Menu panel is too small to accommodate 3
 columns of buttons on Ubuntu. r=jaws.

---
 browser/themes/linux/customizableui/panelUIOverlay.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/themes/linux/customizableui/panelUIOverlay.css b/browser/themes/linux/customizableui/panelUIOverlay.css
index acf69a84fbb7..4c0ba6516319 100644
--- a/browser/themes/linux/customizableui/panelUIOverlay.css
+++ b/browser/themes/linux/customizableui/panelUIOverlay.css
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 %filter substitution
-%define menuPanelWidth 21em
+%define menuPanelWidth 23em
 
 %include ../../shared/customizableui/panelUIOverlay.inc.css
 

From ace0748b9b51ff946f91eab2887b6fa2d0962efb Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Tue, 14 May 2013 18:15:36 +0200
Subject: [PATCH 103/230] Bug 870545 - Prevent hiding the nav-bar from the
 menu, r=jaws

--HG--
extra : rebase_source : 8f4ba205d78a89ba8700585a4793920848829a32
---
 browser/base/content/browser.xul                 |  2 +-
 browser/components/nsBrowserGlue.js              | 11 ++++++++++-
 browser/locales/en-US/chrome/browser/browser.dtd |  1 -
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 788b190c9c04..6cd7fc5d5d41 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -498,7 +498,7 @@
     </toolbar>
 
     <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
-             toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
+             aria-label="&navbarCmd.label;"
              fullscreentoolbar="true" mode="icons" customizable="true"
              iconsize="large"
              defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button,window-controls"
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index f5c76375bb40..4936e6af35c3 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -1170,7 +1170,7 @@ BrowserGlue.prototype = {
   },
 
   _migrateUI: function BG__migrateUI() {
-    const UI_VERSION = 13;
+    const UI_VERSION = 14;
     const BROWSER_DOCURL = "chrome://browser/content/browser.xul#";
     let currentUIVersion = 0;
     try {
@@ -1379,6 +1379,15 @@ BrowserGlue.prototype = {
       }
     }
 
+    if (currentUIVersion < 14) {
+      let toolbarResource = this._rdf.GetResource(BROWSER_DOCURL + "nav-bar");
+      let collapsedResource = this._rdf.GetResource("collapsed");
+      let isCollapsed = this._getPersist(toolbarResource, collapsedResource);
+      if (isCollapsed == "true") {
+        this._setPersist(toolbarResource, collapsedResource, "false");
+      }
+    }
+
     if (this._dirty)
       this._dataSource.QueryInterface(Ci.nsIRDFRemoteDataSource).Flush();
 
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 1fcf4428354e..ba6e963c9e1a 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -70,7 +70,6 @@ can reach it easily. -->
 <!ENTITY menubarCmd.label "Menu Bar">
 <!ENTITY menubarCmd.accesskey "M">
 <!ENTITY navbarCmd.label "Navigation Toolbar">
-<!ENTITY navbarCmd.accesskey "N">
 <!ENTITY personalbarCmd.label "Bookmarks Toolbar">
 <!ENTITY personalbarCmd.accesskey "B">
 <!ENTITY bookmarksToolbarItem.label "Bookmarks Toolbar Items">

From 68cd4da8c3d5bd36e424681ade9e3363fd7cc871 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Tue, 14 May 2013 20:20:45 +0200
Subject: [PATCH 104/230] Bug 752434 - Stop hiding toolbars for about:addons &
 co, r=dao

---
 browser/base/content/browser.js               |  29 +--
 browser/base/content/test/Makefile.in         |   2 -
 .../content/test/browser_disablechrome.js     | 216 ------------------
 browser/base/content/test/disablechrome.html  |   4 -
 .../components/customizableui/content/jar.mn  |   8 -
 .../customizableui/content/panelUIOverlay.js  |   9 -
 .../customizableui/content/panelUIOverlay.xul |  26 ---
 toolkit/themes/linux/global/inContentUI.css   |   4 +-
 toolkit/themes/windows/global/inContentUI.css |  12 +-
 9 files changed, 14 insertions(+), 296 deletions(-)
 delete mode 100644 browser/base/content/test/browser_disablechrome.js
 delete mode 100644 browser/base/content/test/disablechrome.html
 delete mode 100644 browser/components/customizableui/content/panelUIOverlay.js
 delete mode 100644 browser/components/customizableui/content/panelUIOverlay.xul

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 9ea1012a5b0a..0fdace231dbd 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -3457,11 +3457,8 @@ var XULBrowserWindow = {
   startTime: 0,
   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/components/customizableui/content/jar.mn
-  inContentWhitelist: ["about:addons", "about:downloads", "about:permissions",
-                       "about:sync-progress", "about:preferences"],
+  // Left here for add-on compatibility, see bug 752434
+  inContentWhitelist: [],
 
   QueryInterface: function (aIID) {
     if (aIID.equals(Ci.nsIWebProgressListener) ||
@@ -3751,16 +3748,12 @@ var XULBrowserWindow = {
         SocialShare.update();
       }
 
-      // Show or hide browser chrome based on the whitelist
-      if (this.hideChromeForLocation(location)) {
+      // Show or hide browser chrome for apps
+      let ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
+      if (ss.getTabValue(gBrowser.selectedTab, "appOrigin"))
         document.documentElement.setAttribute("disablechrome", "true");
-      } else {
-        let ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
-        if (ss.getTabValue(gBrowser.selectedTab, "appOrigin"))
-          document.documentElement.setAttribute("disablechrome", "true");
-        else
-          document.documentElement.removeAttribute("disablechrome");
-      }
+      else
+        document.documentElement.removeAttribute("disablechrome");
 
       // Utility functions for disabling find
       var shouldDisableFind = function shouldDisableFind(aDocument) {
@@ -3838,12 +3831,8 @@ var XULBrowserWindow = {
     FeedHandler.updateFeeds();
   },
 
-  hideChromeForLocation: function(aLocation) {
-    aLocation = aLocation.toLowerCase();
-    return this.inContentWhitelist.some(function(aSpec) {
-      return aSpec == aLocation;
-    });
-  },
+  // Left here for add-on compatibility, see bug 752434
+  hideChromeForLocation: function() {},
 
   onStatusChange: function (aWebProgress, aRequest, aStatus, aMessage) {
     this.status = aMessage;
diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index 860f11a92df6..f1695f348ed8 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -171,7 +171,6 @@ _BROWSER_FILES = \
                  browser_contextSearchTabPosition.js \
                  browser_ctrlTab.js \
                  browser_customize_popupNotification.js \
-                 browser_disablechrome.js \
                  browser_discovery.js \
                  browser_duplicateIDs.js \
                  browser_fullscreen-window-open.js \
@@ -238,7 +237,6 @@ _BROWSER_FILES = \
                  browser_visibleTabs_bookmarkAllTabs.js \
                  browser_visibleTabs_tabPreview.js \
                  bug592338.html \
-                 disablechrome.html \
                  discovery.html \
                  domplate_test.js \
                  file_bug822367_1.html \
diff --git a/browser/base/content/test/browser_disablechrome.js b/browser/base/content/test/browser_disablechrome.js
deleted file mode 100644
index 24b3f4811935..000000000000
--- a/browser/base/content/test/browser_disablechrome.js
+++ /dev/null
@@ -1,216 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Tests that the disablechrome attribute gets propogated to the main UI
-
-const HTTPSRC = "http://example.com/browser/browser/base/content/test/";
-
-function is_element_hidden(aElement) {
-  var style = window.getComputedStyle(document.getElementById("nav-bar"), "");
-  if (style.visibility != "visible" || style.display == "none")
-    return true;
-
-  if (aElement.ownerDocument != aElement.parentNode)
-    return is_element_hidden(aElement.parentNode);
-
-  return false;
-}
-
-function is_chrome_hidden() {
-  is(document.documentElement.getAttribute("disablechrome"), "true", "Attribute should be set");
-  if (TabsOnTop.enabled)
-    ok(is_element_hidden(document.getElementById("nav-bar")), "Toolbar should be hidden");
-  else
-    ok(!is_element_hidden(document.getElementById("nav-bar")), "Toolbar should not be hidden");
-}
-
-function is_chrome_visible() {
-  isnot(document.getElementById("main-window").getAttribute("disablechrome"), "true", "Attribute should not be set");
-  ok(!is_element_hidden(document.getElementById("nav-bar")), "Toolbar should not be hidden");
-}
-
-function load_page(aURL, aCanHide, aCallback) {
-  gNewBrowser.addEventListener("pageshow", function() {
-    // Filter out about:blank loads
-    if (gNewBrowser.currentURI.spec != aURL)
-      return;
-
-    gNewBrowser.removeEventListener("pageshow", arguments.callee, false);
-
-    if (aCanHide)
-      is_chrome_hidden();
-    else
-      is_chrome_visible();
-
-    if (aURL == "about:addons") {
-      function check_after_init() {
-        if (aCanHide)
-          is_chrome_hidden();
-        else
-          is_chrome_visible();
-
-        aCallback();
-      }
-
-      if (gNewBrowser.contentWindow.gIsInitializing) {
-        gNewBrowser.contentDocument.addEventListener("Initialized", function() {
-          gNewBrowser.contentDocument.removeEventListener("Initialized", arguments.callee, false);
-
-          check_after_init();
-        }, false);
-      }
-      else {
-        check_after_init();
-      }
-    }
-    else {
-      executeSoon(aCallback);
-    }
-  }, false);
-  gNewBrowser.loadURI(aURL);
-}
-
-var gOldTab;
-var gNewTab;
-var gNewBrowser;
-
-function test() {
-  // Opening the add-ons manager and waiting for it to load the discovery pane
-  // takes more time in windows debug builds
-  requestLongerTimeout(2);
-
-  var gOldTabsOnTop = TabsOnTop.enabled;
-  registerCleanupFunction(function() {
-    TabsOnTop.enabled = gOldTabsOnTop;
-  });
-
-  waitForExplicitFinish();
-
-  gOldTab = gBrowser.selectedTab;
-  gNewTab = gBrowser.selectedTab = gBrowser.addTab("about:blank");
-  gNewBrowser = gBrowser.selectedBrowser;
-
-  info("Tabs on top");
-  TabsOnTop.enabled = true;
-
-  run_http_test_1();
-}
-
-function end_test() {
-  gBrowser.removeTab(gNewTab);
-  finish();
-}
-
-function test_url(aURL, aCanHide, aNextTest) {
-  is_chrome_visible();
-  info("Page load");
-  load_page(aURL, aCanHide, function() {
-    info("Switch away");
-    gBrowser.selectedTab = gOldTab;
-    is_chrome_visible();
-
-    info("Switch back");
-    gBrowser.selectedTab = gNewTab;
-    if (aCanHide)
-      is_chrome_hidden();
-    else
-      is_chrome_visible();
-
-    gBrowser.removeTab(gNewTab);
-    gNewTab = gBrowser.selectedTab = gBrowser.addTab("about:blank");
-    gNewBrowser = gBrowser.selectedBrowser;
-
-    gBrowser.selectedTab = gOldTab;
-
-    info("Background load");
-    load_page(aURL, false, function() {
-      info("Switch back");
-      gBrowser.selectedTab = gNewTab;
-      if (aCanHide)
-        is_chrome_hidden();
-      else
-        is_chrome_visible();
-
-      load_page("about:blank", false, aNextTest);
-    });
-  });
-}
-
-// Should never hide the chrome
-function run_http_test_1() {
-  info("HTTP tests");
-  test_url(HTTPSRC + "disablechrome.html", false, run_chrome_about_test);
-}
-
-// Should hide the chrome
-function run_chrome_about_test() {
-  info("Chrome about: tests");
-  test_url("about:addons", true, function() {
-    info("Tabs on bottom");
-    TabsOnTop.enabled = false;
-    run_http_test_2();
-  });
-}
-
-// Should never hide the chrome
-function run_http_test_2() {
-  info("HTTP tests");
-  test_url(HTTPSRC + "disablechrome.html", false, run_chrome_about_test_2);
-}
-
-// Should not hide the chrome
-function run_chrome_about_test_2() {
-  info("Chrome about: tests");
-  test_url("about:addons", true, run_http_test3);
-}
-
-function run_http_test3() {
-  info("HTTP tests");
-  test_url(HTTPSRC + "disablechrome.html", false, run_chrome_about_test_3);
-}
-
-// Should not hide the chrome
-function run_chrome_about_test_3() {
-  info("Chrome about: tests");
-  test_url("about:Addons", true, function(){
-    info("Tabs on top");
-    TabsOnTop.enabled = true;
-    run_http_test4();
-  });
-}
-
-function run_http_test4() {
-  info("HTTP tests");
-  test_url(HTTPSRC + "disablechrome.html", false, run_chrome_about_test_4);
-}
-
-function run_chrome_about_test_4() {
-  info("Chrome about: tests");
-  test_url("about:Addons", true, run_http_test5);
- }
-
-function run_http_test5() {
-  info("HTTP tests");
-  test_url(HTTPSRC + "disablechrome.html", false, run_chrome_about_test_5);
-}
-
-// Should hide the chrome
-function run_chrome_about_test_5() {
-  info("Chrome about: tests");
-  test_url("about:preferences", true, function(){
-    info("Tabs on bottom");
-    TabsOnTop.enabled = false;
-    run_http_test6();
-  });
-}
-
-function run_http_test6() {
-  info("HTTP tests");
-  test_url(HTTPSRC + "disablechrome.html", false, run_chrome_about_test_6);
-}
-
-function run_chrome_about_test_6() {
-  info("Chrome about: tests");
-  test_url("about:preferences", true, end_test);
-}
\ No newline at end of file
diff --git a/browser/base/content/test/disablechrome.html b/browser/base/content/test/disablechrome.html
deleted file mode 100644
index 7879e1ce9fd7..000000000000
--- a/browser/base/content/test/disablechrome.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<html>
-<body>
-</body>
-</html>
diff --git a/browser/components/customizableui/content/jar.mn b/browser/components/customizableui/content/jar.mn
index f254bef3b772..43f68f4c3dea 100644
--- a/browser/components/customizableui/content/jar.mn
+++ b/browser/components/customizableui/content/jar.mn
@@ -7,13 +7,5 @@ browser.jar:
   content/browser/customizableui/panelUI.css
   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/panelUIOverlay.js b/browser/components/customizableui/content/panelUIOverlay.js
deleted file mode 100644
index 0fdad43ab058..000000000000
--- a/browser/components/customizableui/content/panelUIOverlay.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-if (typeof XPCOMUtils == "undefined")
-  Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "CustomizableUI",
-                                  "resource:///modules/CustomizableUI.jsm");
diff --git a/browser/components/customizableui/content/panelUIOverlay.xul b/browser/components/customizableui/content/panelUIOverlay.xul
deleted file mode 100644
index 8f49fa9b0818..000000000000
--- a/browser/components/customizableui/content/panelUIOverlay.xul
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!DOCTYPE overlay [
-  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
-  %brandDTD;
-  <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
-  %browserDTD;
-]>
-
-<?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/customizableui/panelUIOverlay.js"/>
-
-  <hbox id="app-extension-point-end">
-    <toolbarbutton id="PanelUI-menu-button"
-                   class="toolbarbutton-1"
-                   label="&brandShortName;"
-                   tooltiptext="&appmenu.title;"
-                   oncommand="CustomizableUI.showPanel(this);"/>
-  </hbox>
-</overlay>
diff --git a/toolkit/themes/linux/global/inContentUI.css b/toolkit/themes/linux/global/inContentUI.css
index aa12377a345d..784ed4dd6bdd 100644
--- a/toolkit/themes/linux/global/inContentUI.css
+++ b/toolkit/themes/linux/global/inContentUI.css
@@ -14,8 +14,8 @@
   -moz-appearance: none;
   padding: 18px;
   background-color: Window;
-  background-image: linear-gradient(rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0) 160px),
-                    linear-gradient(-moz-dialog, Window 160px);
+  background-image: /* Texture */
+                    url("chrome://global/skin/inContentUI/background-texture.png");
   color: WindowText;
 }
 
diff --git a/toolkit/themes/windows/global/inContentUI.css b/toolkit/themes/windows/global/inContentUI.css
index cc9dbeee3d66..61a663df18c7 100644
--- a/toolkit/themes/windows/global/inContentUI.css
+++ b/toolkit/themes/windows/global/inContentUI.css
@@ -16,9 +16,7 @@
   background-repeat: repeat;
   color: -moz-dialogText;
   background-color: -moz-dialog;
-  background-image: /* Fade-out texture at the top, and blend with browser tab */
-                    linear-gradient(rgba(255,255,255,0.45), rgba(255,255,255,0) 30%),
-                    /* Texture */
+  background-image: /* Texture */
                     url("chrome://global/skin/inContentUI/background-texture.png");
 }
 
@@ -31,9 +29,7 @@ html|html {
   *|*:root {
     color: #000;
     background-color: #CCD9EA;
-    background-image: /* Fade-out texture at the top */
-                      linear-gradient(rgb(237,245,252), rgba(237,245,252,0) 156px),
-                      /* Texture */
+    background-image: /* Texture */
                       url("chrome://global/skin/inContentUI/background-texture.png");
   }
 }
@@ -42,9 +38,7 @@ html|html {
   *|*:root {
     color: #000;
     /* Blame shorlander for this monstrosity. */
-    background-image: /* Fade-out texture and light beams at the top */
-                      linear-gradient(rgb(237,245,252) 3px, rgba(237,245,252,0) 156px),
-                      /* Side gradients */
+    background-image: /* Side gradients */
                       linear-gradient(to right,
                                       rgba(255,255,255,0.2), rgba(255,255,255,0) 40%,
                                       rgba(255,255,255,0) 60%, rgba(255,255,255,0.2)),

From b9cd1e89ab93e177c9efecf8b8d78cf9c8dc446f Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Tue, 7 May 2013 17:08:12 +0200
Subject: [PATCH 105/230] Bug 868586: Print preview for all, except OSX, r=jaws

---
 browser/base/content/browser.xul | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 6cd7fc5d5d41..d1bc6e80062f 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -955,8 +955,12 @@
                      aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
 
       <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-                     label="&printButton.label;" command="cmd_print"
-                     tooltiptext="&printButton.tooltip;"/>
+#ifdef XP_MACOSX
+                     command="cmd_print"
+#else
+                     command="cmd_printPreview"
+#endif
+                     label="&printButton.label;" tooltiptext="&printButton.tooltip;"/>
 
       <!-- This is a placeholder for the Downloads Indicator.  It is visible
            during the customization of the toolbar, in the palette, and before

From f59d22ab75f9ef6feb2b2fff472e442e4e94a82d Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Tue, 14 May 2013 18:55:21 +0200
Subject: [PATCH 106/230] Bug 869933: adjust zoom reset button label whilst
 zooming in/out. r=jaws

---
 browser/base/content/browser-fullZoom.js      |  4 ++++
 browser/base/content/browser.js               |  9 ++++----
 .../customizableui/content/panelUI.inc.xul    |  5 ++---
 .../customizableui/content/panelUI.js         | 21 +++++++++++++++++++
 .../locales/en-US/chrome/browser/browser.dtd  |  2 --
 .../en-US/chrome/browser/browser.properties   |  3 +++
 6 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/browser/base/content/browser-fullZoom.js b/browser/base/content/browser-fullZoom.js
index 67b1c52a702f..9084b6d41bab 100644
--- a/browser/base/content/browser-fullZoom.js
+++ b/browser/base/content/browser-fullZoom.js
@@ -382,6 +382,8 @@ var FullZoom = {
    *                            when done.
    */
   _applySettingToPref: function FullZoom__applySettingToPref(suppressZoomChange, callback) {
+    Services.obs.notifyObservers(null, "browser-fullZoom:zoomChange", "");
+
     if (!this.siteSpecific ||
         gInPrintPreviewMode ||
         content.document.mozSyntheticDocument) {
@@ -410,6 +412,8 @@ var FullZoom = {
    * @param callback  Optional.  If given, it's asynchronously called when done.
    */
   _removePref: function FullZoom__removePref(callback) {
+    Services.obs.notifyObservers(null, "browser-fullZoom:zoomReset", "");
+
     if (content.document.mozSyntheticDocument) {
       this._executeSoon(callback);
       return;
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 0fdace231dbd..5ec664f58050 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1039,6 +1039,10 @@ var gBrowserInit = {
     OfflineApps.init();
     IndexedDBPromptHelper.init();
     gFormSubmitObserver.init();
+    // Initialize the full zoom setting.
+    // We do this before the session restore service gets initialized so we can
+    // apply full zoom settings to tabs restored by the session restore service.
+    FullZoom.init();
     PanelUI.init();
     SocialUI.init();
     LightweightThemeListener.init();
@@ -1088,11 +1092,6 @@ var gBrowserInit = {
     if (!getBoolPref("ui.click_hold_context_menus", false))
       SetClickAndHoldHandlers();
 
-    // Initialize the full zoom setting.
-    // We do this before the session restore service gets initialized so we can
-    // apply full zoom settings to tabs restored by the session restore service.
-    FullZoom.init();
-
     // Bug 666804 - NetworkPrioritizer support for e10s
     if (!gMultiProcessBrowser) {
       let NP = {};
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index 2d2716042f5a..5c7c8e6ee17a 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -30,9 +30,8 @@
                          command="cmd_fullZoomReduce"
                          tooltiptext="&zoomOutButton.tooltip;"/>
           <toolbarbutton id="PanelUI-zoomReset-btn" flex="1"
-                         noautoclose="true" label="&zoomReset.label;"
-                         tooltiptext="&zoomReset.tooltip;"
-                         command="cmd_fullZoomReset"/>
+                         noautoclose="true" command="cmd_fullZoomReset"
+                         tooltiptext="&zoomReset.tooltip;"/>
           <toolbarbutton id="PanelUI-zoomIn-btn" flex="1"
                          noautoclose="true" label="&fullZoomEnlargeCmd.label;"
                          command="cmd_fullZoomEnlarge"
diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
index 191a72903a40..9e8a69eaad1a 100644
--- a/browser/components/customizableui/content/panelUI.js
+++ b/browser/components/customizableui/content/panelUI.js
@@ -22,6 +22,7 @@ const PanelUI = {
       multiView: "PanelUI-multiView",
       menuButton: "PanelUI-menu-button",
       panel: "PanelUI-popup",
+      zoomResetButton: "PanelUI-zoomReset-btn"
     };
   },
 
@@ -39,12 +40,20 @@ const PanelUI = {
     for (let event of this.kEvents) {
       this.panel.addEventListener(event, this);
     }
+
+    // Register ourselves with the service so we know when the zoom prefs change.
+    Services.obs.addObserver(this, "browser-fullZoom:zoomChange", false);
+    Services.obs.addObserver(this, "browser-fullZoom:zoomReset", false);
+
+    this._updateZoomResetButton();
   },
 
   uninit: function() {
     for (let event of this.kEvents) {
       this.panel.removeEventListener(event, this);
     }
+    Services.obs.removeObserver(this, "browser-fullZoom:zoomChange");
+    Services.obs.removeObserver(this, "browser-fullZoom:zoomReset");
   },
 
   /**
@@ -103,6 +112,13 @@ const PanelUI = {
     }
   },
 
+  /**
+   * nsIObserver implementation, responding to zoom pref changes
+   */
+  observe: function (aSubject, aTopic, aData) {
+    this._updateZoomResetButton();
+  },
+
   /**
    * Registering the menu panel is done lazily for performance reasons. This
    * method is exposed so that CustomizationMode can force registration in the
@@ -171,5 +187,10 @@ const PanelUI = {
   _updatePanelButton: function() {
     this.menuButton.open = this.panel.state == "open" ||
                            this.panel.state == "showing";
+  },
+
+  _updateZoomResetButton: function() {
+    this.zoomResetButton.setAttribute("label", gNavigatorBundle
+      .getFormattedString("zoomReset.label", [Math.floor(ZoomManager.zoom * 100)]));
   }
 };
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index ba6e963c9e1a..a22ea46b9ec2 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -535,8 +535,6 @@ you can use these alternative items. Otherwise, their values should be empty.  -
 <!ENTITY zoomInButton.tooltip           "Zoom in">
 <!ENTITY zoomControls.label             "Zoom Controls">
 <!ENTITY zoomReset.tooltip              "Reset Zoom">
-<!-- LOCALIZATION NOTE(zoomReset.label): the &#37; is the percent symbol. -->
-<!ENTITY zoomReset.label                "100&#37;">
 
 <!ENTITY quitApplicationCmdWin.label       "Exit"> 
 <!ENTITY quitApplicationCmdWin.accesskey   "x">
diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties
index d16583f45793..c1be434cb1db 100644
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -465,3 +465,6 @@ slowStartup.helpButton.label = Learn How to Speed It Up
 slowStartup.helpButton.accesskey = L
 slowStartup.disableNotificationButton.label = Don't Tell Me Again
 slowStartup.disableNotificationButton.accesskey = A
+
+# LOCALIZATION NOTE(zoomReset.label): %S is the current zoom level.
+zoomReset.label = %S%%

From 126b04af27d9a8f6381b68424c6c045f7e307c2c Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Wed, 15 May 2013 11:05:58 +0200
Subject: [PATCH 107/230] Bug 872162 - Remove dead openURL function from web
 apps code, no longer check appOrigin in browser.js' onLocationChange,
 r=felipe

---
 browser/base/content/browser.js |  7 ------
 browser/modules/webappsUI.jsm   | 39 ---------------------------------
 2 files changed, 46 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index caa0d843a62b..15f11cf8c11a 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -3746,13 +3746,6 @@ var XULBrowserWindow = {
         SocialShare.update();
       }
 
-      // Show or hide browser chrome for apps
-      let ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
-      if (ss.getTabValue(gBrowser.selectedTab, "appOrigin"))
-        document.documentElement.setAttribute("disablechrome", "true");
-      else
-        document.documentElement.removeAttribute("disablechrome");
-
       // Utility functions for disabling find
       var shouldDisableFind = function shouldDisableFind(aDocument) {
         let docElt = aDocument.documentElement;
diff --git a/browser/modules/webappsUI.jsm b/browser/modules/webappsUI.jsm
index 2eecea7fc012..cf744b09f335 100644
--- a/browser/modules/webappsUI.jsm
+++ b/browser/modules/webappsUI.jsm
@@ -47,45 +47,6 @@ this.webappsUI = {
     }
   },
 
-  openURL: function(aUrl, aOrigin) {
-    let browserEnumerator = Services.wm.getEnumerator("navigator:browser");
-    let ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
-
-    // Check each browser instance for our URL
-    let found = false;
-    while (!found && browserEnumerator.hasMoreElements()) {
-      let browserWin = browserEnumerator.getNext();
-      let tabbrowser = browserWin.gBrowser;
-
-      // Check each tab of this browser instance
-      let numTabs = tabbrowser.tabs.length;
-      for (let index = 0; index < numTabs; index++) {
-        let tab = tabbrowser.tabs[index];
-        let appURL = ss.getTabValue(tab, "appOrigin");
-        if (appURL == aOrigin) {
-          // The URL is already opened. Select this tab.
-          tabbrowser.selectedTab = tab;
-          browserWin.focus();
-          found = true;
-          break;
-        }
-      }
-    }
-
-    // Our URL isn't open. Open it now.
-    if (!found) {
-      let recentWindow = Services.wm.getMostRecentWindow("navigator:browser");
-      if (recentWindow) {
-        // Use an existing browser window
-        let browser = recentWindow.gBrowser;
-        let tab = browser.addTab(aUrl);
-        browser.pinTab(tab);
-        browser.selectedTab = tab;
-        ss.setTabValue(tab, "appOrigin", aOrigin);
-      }
-    }
-  },
-
   _getBrowserForId: function(aId) {
     let content = Services.wm.getOuterWindowWithId(aId);
     if (content) {

From 7760d259e9161944ea77f904ec6776e9da9469e8 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Wed, 15 May 2013 11:32:09 +0200
Subject: [PATCH 108/230] Bug 872162 - Remove obsolete disablechrome CSS, r=dao

---
 browser/base/content/browser.css        |  4 ----
 browser/themes/linux/browser.css        |  2 +-
 browser/themes/osx/browser.css          |  3 +--
 browser/themes/windows/browser-aero.css | 18 ++----------------
 browser/themes/windows/browser.css      |  3 +--
 5 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 971496b9d84a..b429c6a52ec4 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -162,10 +162,6 @@ toolbar[printpreview="true"] {
   display: -moz-box;
 }
 
-#main-window[disablechrome] #navigator-toolbox[tabsontop="true"] > toolbar:not(#toolbar-menubar):not(#TabsToolbar) {
-  visibility: collapse;
-}
-
 #wrapper-urlbar-container #urlbar-container > #urlbar > toolbarbutton,
 #urlbar-container:not([combined]) > #urlbar > toolbarbutton,
 #urlbar-container[combined] + #reload-button + #stop-button,
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 6da8728bbcd7..5df87fb18076 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -33,7 +33,7 @@
   border-top: none;
 }
 
-#main-window:not([disablechrome]) #navigator-toolbox[tabsontop=true] {
+#navigator-toolbox[tabsontop=true] {
   border-bottom: 1px solid ThreeDShadow;
 }
 
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index b7fb2f5368d8..04dacc9df1e7 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -26,8 +26,7 @@
   height: 2px;
   margin-top: -2px;
 }
-#navigator-toolbox[tabsontop=false]::after,
-#main-window[disablechrome] #navigator-toolbox::after {
+#navigator-toolbox[tabsontop=false]::after {
   visibility: collapse;
 }
 
diff --git a/browser/themes/windows/browser-aero.css b/browser/themes/windows/browser-aero.css
index ffced48e015d..4d88d9920e5a 100644
--- a/browser/themes/windows/browser-aero.css
+++ b/browser/themes/windows/browser-aero.css
@@ -167,22 +167,16 @@
   }
 
   /* Toolbar shadow behind tabs */
-  #nav-bar[tabsontop=true],
-  #main-window[disablechrome] #navigator-toolbox[tabsontop=true]::after {
+  #nav-bar[tabsontop=true] {
     border-top: 1px solid @toolbarShadowColor@ !important;
     background-clip: padding-box;
   }
 
-  #main-window[disablechrome] #navigator-toolbox[tabsontop=true]::after {
-    visibility: visible;
-  }
-
   /* This code is only needed for restored windows (i.e. sizemode=normal)
      because of the border radius on the toolbar below the tab bar. */
   #main-window[sizemode=normal] #nav-bar[tabsontop=true],
   #main-window[sizemode=normal] #nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + toolbar,
-  #main-window[sizemode=normal] #nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar,
-  #main-window[sizemode=normal][disablechrome] #navigator-toolbox[tabsontop=true]::after {
+  #main-window[sizemode=normal] #nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar {
     border-top: 1px solid @toolbarShadowColor@;
     border-top-left-radius: 2.5px;
     border-top-right-radius: 2.5px;
@@ -213,14 +207,6 @@
     padding-right: 2px;
   }
 
-  /* Rounded corners for when chrome is disabled */
-  #main-window[sizemode=normal][disablechrome] #navigator-toolbox[tabsontop=true]:not(:-moz-lwtheme)::after {
-    visibility: visible;
-    background-color: @customToolbarColor@;
-    background-image: linear-gradient(@toolbarHighlight@, @toolbarHighlight@);
-    height: 4px;
-  }
-
   /* Make the window draggable by glassed toolbars (bug 555081) */
   #toolbar-menubar:not([autohide="true"]),
   #TabsToolbar[tabsontop="true"],
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index e6afe472b946..355a44beeca2 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -54,8 +54,7 @@
   height: 1px;
   background-color: ThreeDShadow;
 }
-#navigator-toolbox[tabsontop=false]::after,
-#main-window[disablechrome] #navigator-toolbox::after {
+#navigator-toolbox[tabsontop=false]::after {
   visibility: collapse;
 }
 

From 89e24c4b3ad2b27bee435c6cbe26668345443173 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 16 May 2013 12:00:22 +0200
Subject: [PATCH 109/230] Bug 872578 - Customization shouldn't force a large
 window size, r=jaws

--HG--
extra : rebase_source : 0435554351130ce8b66ba72d345e4bbd77f7e332
---
 .../customizableui/content/customizeMode.inc.xul           | 4 ++--
 browser/components/customizableui/src/CustomizeMode.jsm    | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/browser/components/customizableui/content/customizeMode.inc.xul b/browser/components/customizableui/content/customizeMode.inc.xul
index 11563b4297b0..eb6d46749cb3 100644
--- a/browser/components/customizableui/content/customizeMode.inc.xul
+++ b/browser/components/customizableui/content/customizeMode.inc.xul
@@ -2,7 +2,7 @@
    - 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/. -->
 
-<hbox id="customization-container" flex="1">
+<hbox id="customization-container" flex="1" hidden="true">
   <vbox flex="1" id="customization-palette-container">
     <label id="customization-header" value="&customizeMode.menuAndToolbars.header;"/>
     <vbox id="customization-palette" flex="1"/>
@@ -26,4 +26,4 @@
     </vbox>
     <spacer flex="1"/>
   </vbox>
-</hbox>
\ No newline at end of file
+</hbox>
diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index f391079743d1..d045bb37b8e3 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -75,6 +75,9 @@ CustomizeMode.prototype = {
     let window = this.window;
     let document = this.document;
 
+    let customizer = document.getElementById("customization-container");
+    customizer.hidden = false;
+
     // We don't need to switch to kAboutURI, or open a new tab at
     // kAboutURI if we're already on it.
     if (this.browser.selectedBrowser.currentURI.spec != kAboutURI) {
@@ -105,7 +108,6 @@ CustomizeMode.prototype = {
     evt.initCustomEvent("CustomizationStart", true, true, window);
     window.dispatchEvent(evt);
 
-    let customizer = document.getElementById("customization-container");
     customizer.parentNode.selectedPanel = customizer;
 
     window.PanelUI.hide();
@@ -233,6 +235,9 @@ CustomizeMode.prototype = {
       }
     }
 
+    let customizer = document.getElementById("customization-container");
+    customizer.hidden = true;
+
     this._changed = false;
   },
 

From c017943e4547bfd57669d7af4ec702345e2aa20b Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 9 May 2013 13:46:21 +0200
Subject: [PATCH 110/230] Bug 855683 - We should support insertItem, r=mconley

---
 .../customizableui/content/toolbar.xml        | 29 +++++++++++++++++++
 .../customizableui/src/CustomizableUI.jsm     | 26 ++++++++++++-----
 2 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/browser/components/customizableui/content/toolbar.xml b/browser/components/customizableui/content/toolbar.xml
index 53f8707c18e7..728b9d3076fe 100644
--- a/browser/components/customizableui/content/toolbar.xml
+++ b/browser/components/customizableui/content/toolbar.xml
@@ -57,6 +57,35 @@
         ]]></body>
       </method>
 
+      <method name="insertItem">
+        <parameter name="aId"/>
+        <parameter name="aBeforeElt"/>
+        <parameter name="aWrapper"/>
+        <body><![CDATA[
+          if (aWrapper) {
+            Cu.reportError("Can't insert " + aId + ": using insertItem " +
+                           "no longer supports wrapper elements.");
+            return null;
+          }
+
+          // Hack, the customizable UI code makes this be the last position
+          let pos = null;
+          if (aBeforeElt) {
+            let beforeInfo = CustomizableUI.getPlacementOfWidget(aBeforeElt.id);
+            if (beforeInfo.area != this.id) {
+              Cu.reportError("Can't insert " + aId + " before " +
+                             aBeforeElt.id + " which isn't in this area (" +
+                             this.id + ").");
+              return null;
+            }
+            pos = beforeInfo.position;
+          }
+
+          CustomizableUI.addWidgetToArea(aId, this.id, pos);
+          return this.ownerDocument.getElementById(aId);
+        ]]></body>
+      </method>
+
       <property name="toolbarName"
                 onget="return this.getAttribute('toolbarname');"
                 onset="this.setAttribute('toolbarname', val); return val;"/>
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 7a34742ee8e2..d6f32e9bcd67 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -610,7 +610,8 @@ let CustomizableUIInternal = {
         this.ensureButtonClosesPanel(widgetNode);
       }
 
-      let nextNode = container.querySelector("#" + nextNodeId);
+      let nextNode = nextNodeId ? container.querySelector(idToSelector(nextNodeId))
+                                : null;
       container.insertBefore(widgetNode, nextNode);
       this._addParentFlex(widgetNode);
     }
@@ -657,13 +658,16 @@ let CustomizableUIInternal = {
 
     for (let areaNode of areaNodes) {
       let container = areaNode.customizationTarget;
-      let widgetNode = container.ownerDocument.getElementById(aWidgetId);
+      let [provider, widgetNode] = this.getWidgetNode(aWidgetId,
+                                                      container.ownerDocument,
+                                                      areaNode.toolbox);
       if (!widgetNode) {
         ERROR("Widget not found, unable to move");
         continue;
       }
 
-      let nextNode = container.querySelector("#" + nextNodeId);
+      let nextNode = nextNodeId ? container.querySelector(idToSelector(nextNodeId))
+                                : null;
       container.insertBefore(widgetNode, nextNode);
     }
   },
@@ -756,7 +760,7 @@ let CustomizableUIInternal = {
     if (aToolbox.palette) {
       // Attempt to locate a node with a matching ID within
       // the palette.
-      return aToolbox.palette.querySelector("#" + aId);
+      return aToolbox.palette.querySelector(idToSelector(aId));
     }
     return null;
   },
@@ -990,10 +994,12 @@ let CustomizableUIInternal = {
     }
 
     let placements = gPlacements.get(oldPlacement.area);
-    if (aPosition < 0) {
+    if (typeof aPosition != "number") {
+      aPosition = placements.length;
+    } else if (aPosition < 0) {
       aPosition = 0;
-    } else if (aPosition > placements.length - 1) {
-      aPosition = placements.length - 1;
+    } else if (aPosition > placements.length) {
+      aPosition = placements.length;
     }
 
     if (aPosition == oldPlacement.position) {
@@ -1736,7 +1742,7 @@ function XULWidgetGroupWrapper(aWidgetId) {
     if (!instance) {
       // Toolbar palettes aren't part of the document, so elements in there
       // won't be found via document.getElementById().
-      instance = aWindow.gNavToolbox.palette.querySelector("#" + aWidgetId);
+      instance = aWindow.gNavToolbox.palette.querySelector(idToSelector(aWidgetId));
     }
 
     let wrapper = gWrapperCache.get(instance);
@@ -1766,5 +1772,9 @@ function XULWidgetSingleWrapper(aWidgetId, aNode) {
   Object.freeze(this);
 }
 
+// When IDs contain special characters, we need to escape them for use with querySelector:
+function idToSelector(aId) {
+  return "#" + aId.replace(/[ !"'#$%&\(\)*+\-,.\/:;<=>?@\[\\\]^`{|}~]/g, '\\$&');
+}
 
 CustomizableUIInternal.initialize();

From 9def0b8a8630ef0933e76c3d5278016aa9e1c315 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Wed, 15 May 2013 14:06:27 -0400
Subject: [PATCH 111/230] Bug 864608 - Update tab drag dropmarker position for
 Australis. ui-r=shorlander r=fryn

--HG--
extra : rebase_source : 5e6083347b86dc7e6382658e7f9e28852e3c99c4
---
 browser/themes/linux/browser.css   | 3 ++-
 browser/themes/osx/browser.css     | 3 ++-
 browser/themes/windows/browser.css | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 5df87fb18076..136cff114d00 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -1651,7 +1651,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 /* Tab drag and drop */
 .tab-drop-indicator {
   list-style-image: url(chrome://browser/skin/tabbrowser/tabDragIndicator.png);
-  margin-bottom: -11px;
+  margin-bottom: -9px;
+  z-index: 3;
 }
 
 /* In-tab close button */
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 04dacc9df1e7..e66331cc6028 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -2297,7 +2297,8 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 
 .tab-drop-indicator {
   list-style-image: url(chrome://browser/skin/tabbrowser/tabDragIndicator.png);
-  margin-bottom: -8px;
+  margin-top: -2px;
+  z-index: 3;
 }
 
 @media (min-resolution: 2dppx) {
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 355a44beeca2..1557988eaa9d 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1604,7 +1604,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 /* Tab DnD indicator */
 .tab-drop-indicator {
   list-style-image: url(chrome://browser/skin/tabbrowser/tabDragIndicator.png);
-  margin-bottom: -11px;
+  margin-bottom: -9px;
+  z-index: 3;
 }
 
 /* Tab close button */

From 02eb17690c170f212d43ab790de89e39fb23de9c Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Thu, 16 May 2013 16:32:15 -0400
Subject: [PATCH 112/230] Bug 858089 - Adjust tab height and polish selected
 tab stroke seam and toolbar highlight. r=mconley,dao

--HG--
extra : rebase_source : 19713992684aa70bd3f6b2364e9fb9e2e1829295
---
 browser/themes/linux/browser.css              |  33 +++++++++++++++---
 browser/themes/linux/linuxShared.inc          |   2 +-
 .../linux/tabbrowser/tab-stroke-end.png       | Bin 439 -> 473 bytes
 .../linux/tabbrowser/tab-stroke-start.png     | Bin 433 -> 483 bytes
 browser/themes/osx/browser.css                |   9 +++--
 .../themes/osx/tabbrowser/tab-stroke-end.png  | Bin 439 -> 3073 bytes
 browser/themes/shared/tabs.inc.css            |   7 ++--
 browser/themes/windows/browser.css            |   5 +++
 .../windows/tabbrowser/tab-stroke-end.png     | Bin 439 -> 473 bytes
 .../windows/tabbrowser/tab-stroke-start.png   | Bin 433 -> 483 bytes
 10 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 136cff114d00..424daec63539 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -58,6 +58,16 @@
   background-image: linear-gradient(@toolbarHighlight@, rgba(255,255,255,0));
 }
 
+#nav-bar[tabsontop=true],
+#nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + toolbar,
+#nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar {
+  box-shadow: 0 1px 0 @toolbarHighlight@ inset;
+  margin-top: -1px; /* Move up 1px into the TabsToolbar */
+  /* Position the toolbar above the bottom of background tabs */
+  position: relative;
+  z-index: 1;
+}
+
 #personal-bookmarks {
   min-height: 29px;
 }
@@ -1589,9 +1599,28 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 %include ../shared/tabs.inc.css
 
+#tabbrowser-tabs {
+  /* override the global style to allow the selected tab to be above the nav-bar */
+  z-index: auto;
+}
+
 #TabsToolbar {
   min-height: 0;
   padding: 0;
+  position: relative;
+}
+
+/*
+ * Draw the bottom border of the tabstrip:
+ */
+#TabsToolbar::after {
+  content: "";
+  position: absolute;
+  bottom: 1px;
+  left: 0;
+  right: 0;
+  z-index: 0;
+  border-bottom: 1px solid hsla(0,0%,0%,.3);
 }
 
 #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme) {
@@ -1599,10 +1628,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   color: -moz-menubartext;
 }
 
-#TabsToolbar[tabsontop=true] {
-  box-shadow: 0 -1px 0 rgba(0,0,0,.1) inset;
-}
-
 #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme):-moz-system-metric(menubar-drag) {
   -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-drag");
 }
diff --git a/browser/themes/linux/linuxShared.inc b/browser/themes/linux/linuxShared.inc
index 79be97dffb16..1ab7eb8c1aee 100644
--- a/browser/themes/linux/linuxShared.inc
+++ b/browser/themes/linux/linuxShared.inc
@@ -5,6 +5,6 @@
 %filter substitution
 
 %define toolbarHighlight rgba(255,255,255,.3)
-%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 fgTabTexture linear-gradient(transparent 0px, transparent 2px, hsla(0,0%,100%,0.35) 2px, hsla(0,0%,100%,0.35) 3px, hsla(0,0%,100%,0.65) 3px, hsla(0,0%,100%,0.65) 4px, @toolbarHighlight@)
 %define fgTabTextureLWT @fgTabTexture@
 %define fgTabBackgroundMiddle @fgTabTexture@, linear-gradient(transparent 0px, transparent 2px, -moz-dialog 2px, -moz-dialog)
diff --git a/browser/themes/linux/tabbrowser/tab-stroke-end.png b/browser/themes/linux/tabbrowser/tab-stroke-end.png
index b1b7cc0145523cc8141b939a10b34fe8dda1a445..6d9e07ddfdb2012daaac0159b313dd4cc32fcc36 100644
GIT binary patch
delta 458
zcmV;*0X6=&1K9(R8Gi-<008i8eFp#l0ia1lK~#9!y_VZf!axv)fgZM743;3$g|=vo
zu^h^w)f+Kr;Et&8|2FtHnWkjD(2I7Oe7ztf-^~2G-EDO`9YNTHMVP<<#nUEQe{nva
z|3%B4<{$1fdvl}g)s42f4Au)r%>&z0S5(Na0%{TCRme>sfPV)Rn1P)PH*3d#8fgWP
zyaurj71IVokjrqrbZ#F96hYN}&0@WP0tNPRvb-aC)p-MAy?`#*L4IG#S;QoF!QN4c
zPnpxm8y1uN28%AE1!u5{NuFZlF^!zM<`KK#XqdL3u6e{H-(rs|t!oys!v5ZrS#ydF
za5UX(38Bd*CV%-e#$9bKM)89T(&RE{F7eO}H!oVwEMkEp^+4yj$tEWG!S=?zGG|V4
z?x-Zxa%K_7GFYWr&Me{{u1xP`&P?JeXEBKS+UJu+JjZF3l;h?UcfproT2i|pG%F@~
zCMW3vGX1D*Tr9!K@smg&Inj)m<UaVu!7<V07t}8%`9m0d7K_cWgwQi5Y8C5OqYRwz
zaY-CC>x*G5tlo$UsKiYc5Q7y6fJeWX^e29P00HI&78U_z)Bpeg07*qoM6N<$g0ipH
A<p2Nx

delta 424
zcmcb~yq$T1WIZzj1H<u6y{15lu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU!KmfKP}k
zkOqTL1_pZuEiDFldj@emVPSP46*EC4V}3bZUMW)^6$5T1JuW#TP8oepX)_K5Lw0$6
zb~!UXStDKr6CODOZW$wPMMIzhkeYfK6HY~AP6Z=gc|#sqV;)5#9tBfwd7uhoE(Iel
zc~dTVW2jP~W(8v&d7u#{+zLkA^2T2#TgCvLqhAu_7tFxO%)-XO&CACxC@d-_DJ>(f
zps1{_rK@LTY-(n1X=7{W=<4p_<?Z9=9~2xGxnR%d*+8wmp7kz{Arg|U2fLXX4H#H2
z?A|s-t|KeOR@d~{|N43QFRa+>Ev#o*9TVGXKjrM{FfNySyOd{?WU6*Nu;UU~WS+1@
z_dtpsgK<d0CiNAjjEmPNd}5dQIWgfGPtVE&Q)FjUFg_KX@s4Mi!~qZarc9F=FJzl8
zDoYqjGAg}T&eF1DP4HaBcOu(5F6Wm0i*D|G!@uD>N3pQthb5pu_H^}gS?83{1OTRr
Bax(w`

diff --git a/browser/themes/linux/tabbrowser/tab-stroke-start.png b/browser/themes/linux/tabbrowser/tab-stroke-start.png
index 08941c8a783419fd8c0e743c3cafbfaaf6b43ea5..a741942ac8db0dc46bf22ccfe20b81c8df7456f5 100644
GIT binary patch
delta 468
zcmV;_0W1Eo1LFgb8Gi-<008i8eFp#l0jfzvK~#9!z1ICp!ay9y@pQM{?hKolxpNQJ
zBAgF%y45cg74}<H|NnnupTWTwoRBbYgEt7CdvSMr@M6E;pH#QoJ*AGWIxNJHt#fp|
zssa2j=s2Fbbk!mhVZM~{wv=)4ET_e*oR%MrVL}OX{n=PVn|~a@3z{Q^Jj4;J&esS&
zn5FIBJPbvYuW<4bjZo*<xthW>Q=lSP-2!^kv!mY{feF3S%i7c94Z*a;%vGtcXDVsD
zS=d4jE}{bHHH|d_(`@w;CqOeAXCAgJ=5U~&NVWjeY;mtDpj#Sa7^c0=H-J@}Fk|vc
z=w-Irf~$jJnSXttkMzA+n6Bn9O99^-hU@z)qs<fGQJXMB9Iv(=VBP{u`|Eg<KF}R~
zZx*KeSEUi)(llJZf5UYKIB5%}{f)QpfcpmF`eTw0;{oljd6<?tSfzj$CgIu(-(t1^
z`h$9=;A1a*E`n?cv}guWC;iKC{WJ#pg~S<Q0*|A!08QX8@|%McVTXHabFMF@Z!|e4
zN-#jXKko8T!d*2V;31Lfr7h^M&6#1Gm?4Qg6rwds2sD%a(0+gF1_c&q4yW<}0000<
KMNUMnLSTaUZsD&0

delta 418
zcmaFNypef=WIZzj1H<u6y{15lu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU!KyfKP}k
zkOqTL1_pZuEiDEW6$WuVVPSPaC1ZX$U0x|uE_qWfIU`OPeNJgJc6oh1StC9fLtX_F
z9(iLPIRkDPBcLoufub>|f)TI0A#c5$36HEXkAf+;yfL@D5x1Nnx10&LqA{0(5y&ig
zW2gq85emjU@<u#B^>W5Z{n@rahv=3B`2{mDGPAI;bMx{G3QI^z%P1(TsB38H8X23J
zTUy!JIXF7IxVn3IdHeYJ2L^|7TfdtD)Y$Lo;us<!Irm_8J(H7z1nY(0hMzbTeJfLf
zG!y^7&Sp0L-d?;RxMJVk`NnHPEcLD%b&KR|+G)upv*f2r!E0;&yjvW1E}d+j?IYRo
zh%wE_vBjP-Fx$YHFOA#5CEj4UT+g}#dxQk;sVNjOFVl5cVagD=RpE+I^9z$ZF8xf)
sZ}8ZyxuUr8Y!K%fJ?YnfuI+5M{TJ=bUf-r9Xa)*iPgg&ebxsLQ05Ujj{{R30

diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index e66331cc6028..2285787691da 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -93,6 +93,11 @@ toolbox[tabsontop=true] > toolbar:not(#TabsToolbar):not(#nav-bar):not(:-moz-lwth
               linear-gradient(hsl(0,0%,93%), hsl(0,0%,83%));
   background-clip: border-box;
   background-origin: border-box !important;
+  box-shadow: inset 0 1px 0 hsla(0,0%,100%,.4);
+  margin-top: -1px;
+  /* Position the toolbar above the bottom of background tabs */
+  position: relative;
+  z-index: 1;
 }
 
 #navigator-toolbox[tabsontop=true] > toolbar:not(#TabsToolbar):-moz-lwtheme {
@@ -2261,11 +2266,11 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 #TabsToolbar::after {
   content: '';
   position: absolute;
-  bottom: 0;
+  bottom: 1px;
   left: 0;
   right: 0;
   z-index: 0;
-  border-bottom: 1px solid hsla(0,0%,0%,.22);
+  border-bottom: 1px solid hsla(0,0%,0%,.3);
 }
 
 /* In tabs-on-bottom mode, fill the whole toolbar with the chrome
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-end.png b/browser/themes/osx/tabbrowser/tab-stroke-end.png
index b1b7cc0145523cc8141b939a10b34fe8dda1a445..72132496367b3a20f04e511bd53185df23796bfa 100755
GIT binary patch
delta 3067
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
JPDHLkV1nN@uL1x7

delta 413
zcmZpa*v>pbrJk`k$lZxy-8q?;3=9k`>5jgR3=A9lx&I`x0{OiGJ|V6^8Vo`i80;Ce
zv>4>=8N~I3h1G>r%mkH;`Q>zZrA&EL47io_xa5pDW%N0v%{UYc+2!@w<;?hGjd&GI
zc;pPYWsJBL4S@>4YD_p4jX4#Jc;yZ2d1Q@w6peTkOu6NODvY@ljJV`Yx#W$ZN`aac
zjCtgNMwoCb7;(!Rf0=9<19XmlNswPK10ypF8wWQpAHSfmsF<X*jJ$%PvbvV8o{_Ps
znYpEnt(~K*yN8#zkDq@~a9HGmJ)dU-wf1_tIEF|_wjS(eYBZ>4V7;(=+Z4HutQ1>a
z(_{bZ=jp$&Vz0Nbo@I4RY^(j0v!}zjT<+~so>7vi+VQ}SOJI?C!V=vBDS8aXAqkt*
zSC}#`UZ3!ZUE=4&gl9ZGD-TSOol(K~RCLBWo@EjTJmi})O=i51ZMvu|VJOL{^kO+n
r%Z@d{bKi+<>$sd-_Ak1*Q|t}@hVLB3!ipc3fCAam)z4*}Q$iB}kIHYd

diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
index 00a78c2999a1..c25792973054 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 %endif
 
-%define tabHeight 30px
+%define tabHeight 31px
 %define tabCurveWidth 30px
 %define tabCurveHalfWidth 15px
 
@@ -32,10 +32,10 @@
   -moz-box-align: stretch;
 }
 
-/* The selected tab should appear above adjacent tabs and .tabs-newtab-button */
+/* The selected tab should appear above adjacent tabs, .tabs-newtab-button and the highlight of #nav-bar */
 .tabbrowser-tab[selected=true] {
   position: relative;
-  z-index: 1;
+  z-index: 2;
 }
 
 .tab-background-middle {
@@ -128,7 +128,6 @@
 .tab-background-end[selected=true]::after {
   /* position ::after on top of its parent */
   -moz-margin-start: -@tabCurveWidth@;
-  margin-bottom: -1px;
   display: -moz-box;
 }
 
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 1557988eaa9d..9709ef012e45 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -99,6 +99,11 @@
 #nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + toolbar,
 #nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar {
   background-image: linear-gradient(@toolbarHighlight@, rgba(255,255,255,0));
+  box-shadow: 0 1px 0 @toolbarHighlight@ inset;
+  margin-top: -1px; /* Move up 1px into the TabsToolbar */
+  /* Position the toolbar above the bottom of background tabs */
+  position: relative;
+  z-index: 1;
 }
 
 #personal-bookmarks {
diff --git a/browser/themes/windows/tabbrowser/tab-stroke-end.png b/browser/themes/windows/tabbrowser/tab-stroke-end.png
index b1b7cc0145523cc8141b939a10b34fe8dda1a445..6d9e07ddfdb2012daaac0159b313dd4cc32fcc36 100644
GIT binary patch
delta 458
zcmV;*0X6=&1K9(R8Gi-<008i8eFp#l0ia1lK~#9!y_VZf!axv)fgZM743;3$g|=vo
zu^h^w)f+Kr;Et&8|2FtHnWkjD(2I7Oe7ztf-^~2G-EDO`9YNTHMVP<<#nUEQe{nva
z|3%B4<{$1fdvl}g)s42f4Au)r%>&z0S5(Na0%{TCRme>sfPV)Rn1P)PH*3d#8fgWP
zyaurj71IVokjrqrbZ#F96hYN}&0@WP0tNPRvb-aC)p-MAy?`#*L4IG#S;QoF!QN4c
zPnpxm8y1uN28%AE1!u5{NuFZlF^!zM<`KK#XqdL3u6e{H-(rs|t!oys!v5ZrS#ydF
za5UX(38Bd*CV%-e#$9bKM)89T(&RE{F7eO}H!oVwEMkEp^+4yj$tEWG!S=?zGG|V4
z?x-Zxa%K_7GFYWr&Me{{u1xP`&P?JeXEBKS+UJu+JjZF3l;h?UcfproT2i|pG%F@~
zCMW3vGX1D*Tr9!K@smg&Inj)m<UaVu!7<V07t}8%`9m0d7K_cWgwQi5Y8C5OqYRwz
zaY-CC>x*G5tlo$UsKiYc5Q7y6fJeWX^e29P00HI&78U_z)Bpeg07*qoM6N<$g0ipH
A<p2Nx

delta 424
zcmcb~yq$T1WIZzj1H<u6y{15lu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU!KmfKP}k
zkOqTL1_pZuEiDFldj@emVPSP46*EC4V}3bZUMW)^6$5T1JuW#TP8oepX)_K5Lw0$6
zb~!UXStDKr6CODOZW$wPMMIzhkeYfK6HY~AP6Z=gc|#sqV;)5#9tBfwd7uhoE(Iel
zc~dTVW2jP~W(8v&d7u#{+zLkA^2T2#TgCvLqhAu_7tFxO%)-XO&CACxC@d-_DJ>(f
zps1{_rK@LTY-(n1X=7{W=<4p_<?Z9=9~2xGxnR%d*+8wmp7kz{Arg|U2fLXX4H#H2
z?A|s-t|KeOR@d~{|N43QFRa+>Ev#o*9TVGXKjrM{FfNySyOd{?WU6*Nu;UU~WS+1@
z_dtpsgK<d0CiNAjjEmPNd}5dQIWgfGPtVE&Q)FjUFg_KX@s4Mi!~qZarc9F=FJzl8
zDoYqjGAg}T&eF1DP4HaBcOu(5F6Wm0i*D|G!@uD>N3pQthb5pu_H^}gS?83{1OTRr
Bax(w`

diff --git a/browser/themes/windows/tabbrowser/tab-stroke-start.png b/browser/themes/windows/tabbrowser/tab-stroke-start.png
index 08941c8a783419fd8c0e743c3cafbfaaf6b43ea5..a741942ac8db0dc46bf22ccfe20b81c8df7456f5 100644
GIT binary patch
delta 468
zcmV;_0W1Eo1LFgb8Gi-<008i8eFp#l0jfzvK~#9!z1ICp!ay9y@pQM{?hKolxpNQJ
zBAgF%y45cg74}<H|NnnupTWTwoRBbYgEt7CdvSMr@M6E;pH#QoJ*AGWIxNJHt#fp|
zssa2j=s2Fbbk!mhVZM~{wv=)4ET_e*oR%MrVL}OX{n=PVn|~a@3z{Q^Jj4;J&esS&
zn5FIBJPbvYuW<4bjZo*<xthW>Q=lSP-2!^kv!mY{feF3S%i7c94Z*a;%vGtcXDVsD
zS=d4jE}{bHHH|d_(`@w;CqOeAXCAgJ=5U~&NVWjeY;mtDpj#Sa7^c0=H-J@}Fk|vc
z=w-Irf~$jJnSXttkMzA+n6Bn9O99^-hU@z)qs<fGQJXMB9Iv(=VBP{u`|Eg<KF}R~
zZx*KeSEUi)(llJZf5UYKIB5%}{f)QpfcpmF`eTw0;{oljd6<?tSfzj$CgIu(-(t1^
z`h$9=;A1a*E`n?cv}guWC;iKC{WJ#pg~S<Q0*|A!08QX8@|%McVTXHabFMF@Z!|e4
zN-#jXKko8T!d*2V;31Lfr7h^M&6#1Gm?4Qg6rwds2sD%a(0+gF1_c&q4yW<}0000<
KMNUMnLSTaUZsD&0

delta 418
zcmaFNypef=WIZzj1H<u6y{15lu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU!KyfKP}k
zkOqTL1_pZuEiDEW6$WuVVPSPaC1ZX$U0x|uE_qWfIU`OPeNJgJc6oh1StC9fLtX_F
z9(iLPIRkDPBcLoufub>|f)TI0A#c5$36HEXkAf+;yfL@D5x1Nnx10&LqA{0(5y&ig
zW2gq85emjU@<u#B^>W5Z{n@rahv=3B`2{mDGPAI;bMx{G3QI^z%P1(TsB38H8X23J
zTUy!JIXF7IxVn3IdHeYJ2L^|7TfdtD)Y$Lo;us<!Irm_8J(H7z1nY(0hMzbTeJfLf
zG!y^7&Sp0L-d?;RxMJVk`NnHPEcLD%b&KR|+G)upv*f2r!E0;&yjvW1E}d+j?IYRo
zh%wE_vBjP-Fx$YHFOA#5CEj4UT+g}#dxQk;sVNjOFVl5cVagD=RpE+I^9z$ZF8xf)
sZ}8ZyxuUr8Y!K%fJ?YnfuI+5M{TJ=bUf-r9Xa)*iPgg&ebxsLQ05Ujj{{R30


From 5dada2df37179ebee20a08b2b51d0a3316c76041 Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Fri, 17 May 2013 10:41:12 +0200
Subject: [PATCH 113/230] Bug 868636: new Help subview panel. r=jaws

---
 .../customizableui/content/panelUI.inc.xul    |  9 ++-
 .../customizableui/content/panelUI.js         | 59 +++++++++++++++++++
 .../customizableui/panelUIOverlay.inc.css     |  2 +
 3 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index 5c7c8e6ee17a..588cb72f628d 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -44,8 +44,10 @@
       <vbox id="PanelUI-mainView-spring" flex="1"/>
 
       <footer class="PanelUI-footer" align="center">
+        <!-- The parentNode is used so that the footer is presented as the anchor
+             instead of just the button being the anchor. -->
         <toolbarbutton id="PanelUI-help-btn" label="&helpMenu.label;"
-                       command="openHelpLink('firefox-help');"/>
+                       onclick="PanelUI.showHelpView(this.parentNode);"/>
         <spacer flex="1"/>
         <toolbarbutton id="PanelUI-customize-btn" label="&appMenuCustomize.label;"
                        command="cmd_CustomizeToolbars"/>
@@ -60,5 +62,10 @@
              class="text-link"
              onclick="PlacesCommandHook.showPlacesOrganizer('History'); PanelUI.hide();"/>
     </panelsubview>
+
+    <panelsubview id="PanelUI-help" flex="1">
+      <label value="&helpMenu.label;"/>
+      <vbox id="PanelUI-helpItems"/>
+    </panelsubview>
   </panelmultiview>
 </panel>
diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
index 9e8a69eaad1a..2653cf9af1c9 100644
--- a/browser/components/customizableui/content/panelUI.js
+++ b/browser/components/customizableui/content/panelUI.js
@@ -20,6 +20,7 @@ const PanelUI = {
       contents: "PanelUI-contents",
       mainView: "PanelUI-mainView",
       multiView: "PanelUI-multiView",
+      helpView: "PanelUI-help",
       menuButton: "PanelUI-menu-button",
       panel: "PanelUI-popup",
       zoomResetButton: "PanelUI-zoomReset-btn"
@@ -46,12 +47,17 @@ const PanelUI = {
     Services.obs.addObserver(this, "browser-fullZoom:zoomReset", false);
 
     this._updateZoomResetButton();
+
+    this.helpView.addEventListener("ViewShowing", this._onHelpViewShow, false);
+    this.helpView.addEventListener("ViewHiding", this._onHelpViewHide, false);
   },
 
   uninit: function() {
     for (let event of this.kEvents) {
       this.panel.removeEventListener(event, this);
     }
+    this.helpView.removeEventListener("ViewShowing", this._onHelpViewShow);
+    this.helpView.removeEventListener("ViewHiding", this._onHelpViewHide);
     Services.obs.removeObserver(this, "browser-fullZoom:zoomChange");
     Services.obs.removeObserver(this, "browser-fullZoom:zoomReset");
   },
@@ -137,6 +143,14 @@ const PanelUI = {
     this.multiView.showMainView();
   },
 
+  /**
+   * Switch the panel to the help view if it's not already
+   * in that view.
+   */
+  showHelpView: function(aAnchor) {
+    this.multiView.showSubView("PanelUI-help", aAnchor);
+  },
+
   /**
    * Shows a subview in the panel with a given ID.
    *
@@ -192,5 +206,50 @@ const PanelUI = {
   _updateZoomResetButton: function() {
     this.zoomResetButton.setAttribute("label", gNavigatorBundle
       .getFormattedString("zoomReset.label", [Math.floor(ZoomManager.zoom * 100)]));
+  },
+
+  // Button onclick handler which hides the whole PanelUI
+  _onHelpViewClick: function(aEvent) {
+    if (aEvent.button == 0 && !aEvent.target.hasAttribute("disabled")) {
+      PanelUI.hide();
+    }
+  },
+
+  _onHelpViewShow: function(aEvent) {
+    // Call global menu setup function
+    buildHelpMenu();
+
+    let helpMenu = document.getElementById("menu_HelpPopup");
+    let items = this.getElementsByTagName("vbox")[0];
+    let attrs = ["oncommand", "onclick", "label", "key", "disabled"];
+    let NSXUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+
+    // Remove all buttons from the view
+    while (items.firstChild) {
+      items.removeChild(items.firstChild);
+    }
+
+    // Add the current set of menuitems of the Help menu to this view
+    let menuItems = Array.prototype.slice.call(helpMenu.getElementsByTagName("menuitem"));
+    let fragment = document.createDocumentFragment();
+    for (let node of menuItems) {
+      if (node.hidden)
+        continue;
+      let button = document.createElementNS(NSXUL, "toolbarbutton");
+      // Copy specific attributes from a menuitem of the Help menu
+      for (let attrName of attrs) {
+        if (!node.hasAttribute(attrName))
+          continue;
+        button.setAttribute(attrName, node.getAttribute(attrName));
+      }
+      fragment.appendChild(button);
+    }
+    items.appendChild(fragment);
+
+    this.addEventListener("click", PanelUI._onHelpViewClick, false);
+  },
+
+  _onHelpViewHide: function(aEvent) {
+    this.removeEventListener("click", PanelUI._onHelpViewClick);
   }
 };
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index 0723ca0dcdb6..3b7262dc11e0 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -220,6 +220,8 @@ panelsubview toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:acti
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
+.PanelUI-footer.panel-multiview-anchor,
+.PanelUI-footer.panel-multiview-anchor > #PanelUI-help-btn,
 toolbarbutton.panel-multiview-anchor {
   background-color: Highlight;
   background-image: linear-gradient(rgba(255,255,255,0.3), rgba(255,255,255,0));

From 4ad832e74bd80a35723c39b37ad718b94725f2c8 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 17 May 2013 11:56:35 -0400
Subject: [PATCH 114/230] Bug 860642 - Move the definitions of built-in widgets
 to their own file. r=Unfocused.

---
 .../customizableui/src/CustomizableUI.jsm     | 222 +-----------------
 .../src/CustomizableWidgets.jsm               | 222 ++++++++++++++++++
 .../components/customizableui/src/Makefile.in |   1 +
 3 files changed, 226 insertions(+), 219 deletions(-)
 create mode 100644 browser/components/customizableui/src/CustomizableWidgets.jsm

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index d6f32e9bcd67..98e9157b81c5 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -13,6 +13,8 @@ Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
   "resource://gre/modules/PlacesUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "CustomizableWidgets",
+  "resource:///modules/CustomizableWidgets.jsm");
 
 const kNSXUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
@@ -20,224 +22,6 @@ const kPrefCustomizationState        = "browser.uiCustomization.state";
 const kPrefCustomizationAutoAdd      = "browser.uiCustomization.autoAdd";
 const kPrefCustomizationDebug        = "browser.uiCustomization.debug";
 
-/**
- * Lazily returns the definitions for the set of built-in widgets. This might
- * not be the final resting place for this stuff, but it'll do for now.
- */
-XPCOMUtils.defineLazyGetter(this, "gBuiltInWidgets", function() {
-  return [{
-    id: "history-panelmenu",
-    type: "view",
-    viewId: "PanelUI-history",
-    name: "History...",
-    description: "History repeats itself!",
-    defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
-    icons: {
-      "16": "chrome://branding/content/icon16.png",
-      "32": "chrome://branding/content/icon48.png",
-      "48": "chrome://branding/content/icon48.png"
-    },
-    onViewShowing: function(aEvent) {
-      // Populate our list of history
-      const kMaxResults = 15;
-      let doc = aEvent.detail.ownerDocument;
-
-      let options = PlacesUtils.history.getNewQueryOptions();
-      options.excludeQueries = true;
-      options.includeHidden = false;
-      options.resultType = options.RESULTS_AS_URI;
-      options.queryType = options.QUERY_TYPE_HISTORY;
-      options.sortingMode = options.SORT_BY_DATE_DESCENDING;
-      options.maxResults = kMaxResults;
-      let query = PlacesUtils.history.getNewQuery();
-
-      let items = doc.getElementById("PanelUI-historyItems");
-      // Clear previous history items.
-      while (items.firstChild) {
-        items.removeChild(items.firstChild);
-      }
-
-      PlacesUtils.history.QueryInterface(Ci.nsPIPlacesDatabase)
-                         .asyncExecuteLegacyQueries([query], 1, options, {
-        handleResult: function (aResultSet) {
-          let fragment = doc.createDocumentFragment();
-          for (let row, i = 0; (row = aResultSet.getNextRow()); i++) {
-            try {
-              let uri = row.getResultByIndex(1);
-              let title = row.getResultByIndex(2);
-              let icon = row.getResultByIndex(6);
-
-              let item = doc.createElementNS(kNSXUL, "toolbarbutton");
-              item.setAttribute("label", title || uri);
-              item.addEventListener("click", function(aEvent) {
-                if (aEvent.button == 0) {
-                  doc.defaultView.openUILink(uri, aEvent);
-                  doc.defaultView.PanelUI.hide();
-                }
-              });
-              if (icon)
-                item.setAttribute("image", "moz-anno:favicon:" + icon);
-              fragment.appendChild(item);
-            } catch (e) {
-              Cu.reportError("Error while showing history subview: " + e);
-            }
-          }
-          items.appendChild(fragment);
-        },
-        handleError: function (aError) {
-          LOG("History view tried to show but had an error: " + aError);
-        },
-        handleCompletion: function (aReason) {
-          LOG("History view is being shown!");
-        },
-      });
-    },
-    onViewHiding: function(aEvent) {
-      LOG("History view is being hidden!");
-    }
-  }, {
-    id: "privatebrowsing-button",
-    name: "Private Browsing\u2026",
-    description: "Open a new Private Browsing window",
-    defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL],
-    icons: {
-      "16": "chrome://branding/content/icon16.png",
-      "32": "chrome://branding/content/icon48.png",
-      "48": "chrome://branding/content/icon48.png"
-    },
-    onCommand: function(e) {
-      if (e.target && e.target.ownerDocument && e.target.ownerDocument.defaultView) {
-        let win = e.target.ownerDocument.defaultView;
-        if (typeof win.OpenBrowserWindow == "function") {
-          win.OpenBrowserWindow({private: true});
-        }
-      }
-    }
-  }, {
-    id: "save-page-button",
-    name: "Save Page",
-    shortcut: "Ctrl+S",
-    description: "Save this page",
-    defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL],
-    icons: {
-      "16": "chrome://branding/content/icon16.png",
-      "32": "chrome://branding/content/icon48.png",
-      "48": "chrome://branding/content/icon48.png"
-    },
-    onCommand: function(aEvent) {
-      let win = aEvent.target &&
-                aEvent.target.ownerDocument &&
-                aEvent.target.ownerDocument.defaultView;
-      if (win && typeof win.saveDocument == "function") {
-        win.saveDocument(win.content.document);
-      }
-    }
-  }, {
-    id: "find-button",
-    name: "Find",
-    shortcut: "Ctrl+F",
-    description: "Find in this page",
-    defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL],
-    icons: {
-      "16": "chrome://branding/content/icon16.png",
-      "32": "chrome://branding/content/icon48.png",
-      "48": "chrome://branding/content/icon48.png"
-    },
-    onCommand: function(aEvent) {
-      let win = aEvent.target &&
-                aEvent.target.ownerDocument &&
-                aEvent.target.ownerDocument.defaultView;
-      if (win && win.gFindBar) {
-        win.gFindBar.onFindCommand();
-      }
-    }
-  }, {
-    id: "open-file-button",
-    name: "Open File",
-    shortcut: "Ctrl+O",
-    description: "Open file",
-    defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL],
-    icons: {
-      "16": "chrome://branding/content/icon16.png",
-      "32": "chrome://branding/content/icon48.png",
-      "48": "chrome://branding/content/icon48.png"
-    },
-    onCommand: function(aEvent) {
-      let win = aEvent.target
-                && aEvent.target.ownerDocument
-                && aEvent.target.ownerDocument.defaultView;
-      if (win && typeof win.BrowserOpenFileWindow == "function") {
-        win.BrowserOpenFileWindow();
-      }
-    }
-  }, {
-    id: "developer-button",
-    name: "Developer",
-    shortcut: "Shift+F11",
-    description: "Toggle Developer Tools",
-    defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL],
-    icons: {
-      "16": "chrome://branding/content/icon16.png",
-      "32": "chrome://branding/content/icon48.png",
-      "48": "chrome://branding/content/icon48.png"
-    },
-    onCommand: function(aEvent) {
-      let win = aEvent.target &&
-                aEvent.target.ownerDocument &&
-                aEvent.target.ownerDocument.defaultView;
-      if (win && win.gDevToolsBrowser) {
-        win.gDevToolsBrowser.toggleToolboxCommand(win.gBrowser);
-      }
-    }
-  }, {
-    id: "add-ons-button",
-    name: "Add-ons",
-    shortcut: "Ctrl+Shift+A",
-    description: "Add-ons Manager",
-    defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL],
-    icons: {
-      "16": "chrome://branding/content/icon16.png",
-      "32": "chrome://branding/content/icon48.png",
-      "48": "chrome://branding/content/icon48.png"
-    },
-    onCommand: function(aEvent) {
-      let win = aEvent.target &&
-                aEvent.target.ownerDocument &&
-                aEvent.target.ownerDocument.defaultView;
-      if (win && typeof win.BrowserOpenAddonsMgr == "function") {
-        win.BrowserOpenAddonsMgr();
-      }
-    }
-  }, {
-    id: "preferences-button",
-    name: "Preferences",
-    shortcut: "Ctrl+Shift+O",
-    description: "Preferences\u2026",
-    defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL],
-    icons: {
-      "16": "chrome://branding/content/icon16.png",
-      "32": "chrome://branding/content/icon48.png",
-      "48": "chrome://branding/content/icon48.png"
-    },
-    onCommand: function(aEvent) {
-      let win = aEvent.target &&
-                aEvent.target.ownerDocument &&
-                aEvent.target.ownerDocument.defaultView;
-      if (win && typeof win.openPreferences == "function") {
-        win.openPreferences();
-      }
-    }
-  }];
-});
-
 /**
  * The keys are the handlers that are fired when the event type (the value)
  * is fired on the subview. A widget that provides a subview has the option
@@ -372,7 +156,7 @@ let CustomizableUIInternal = {
   _defineBuiltInWidgets: function() {
     //XXXunf Need to figure out how to auto-add new builtin widgets in new
     //       app versions to already customized areas.
-    for (let widgetDefinition of gBuiltInWidgets) {
+    for (let widgetDefinition of CustomizableWidgets) {
       this.createBuiltinWidget(widgetDefinition);
     }
   },
diff --git a/browser/components/customizableui/src/CustomizableWidgets.jsm b/browser/components/customizableui/src/CustomizableWidgets.jsm
new file mode 100644
index 000000000000..cfcc54a935ae
--- /dev/null
+++ b/browser/components/customizableui/src/CustomizableWidgets.jsm
@@ -0,0 +1,222 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+
+this.EXPORTED_SYMBOLS = ["CustomizableWidgets"];
+
+Cu.import("resource:///modules/CustomizableUI.jsm");
+
+const CustomizableWidgets = [{
+    id: "history-panelmenu",
+    type: "view",
+    viewId: "PanelUI-history",
+    name: "History...",
+    description: "History repeats itself!",
+    defaultArea: CustomizableUI.AREA_PANEL,
+    allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
+    icons: {
+      "16": "chrome://branding/content/icon16.png",
+      "32": "chrome://branding/content/icon48.png",
+      "48": "chrome://branding/content/icon48.png"
+    },
+    onViewShowing: function(aEvent) {
+      // Populate our list of history
+      const kMaxResults = 15;
+      let doc = aEvent.detail.ownerDocument;
+
+      let options = PlacesUtils.history.getNewQueryOptions();
+      options.excludeQueries = true;
+      options.includeHidden = false;
+      options.resultType = options.RESULTS_AS_URI;
+      options.queryType = options.QUERY_TYPE_HISTORY;
+      options.sortingMode = options.SORT_BY_DATE_DESCENDING;
+      options.maxResults = kMaxResults;
+      let query = PlacesUtils.history.getNewQuery();
+
+      let items = doc.getElementById("PanelUI-historyItems");
+      // Clear previous history items.
+      while (items.firstChild) {
+        items.removeChild(items.firstChild);
+      }
+
+      PlacesUtils.history.QueryInterface(Ci.nsPIPlacesDatabase)
+                         .asyncExecuteLegacyQueries([query], 1, options, {
+        handleResult: function (aResultSet) {
+          let fragment = doc.createDocumentFragment();
+          for (let row, i = 0; (row = aResultSet.getNextRow()); i++) {
+            try {
+              let uri = row.getResultByIndex(1);
+              let title = row.getResultByIndex(2);
+              let icon = row.getResultByIndex(6);
+
+              let item = doc.createElementNS(kNSXUL, "toolbarbutton");
+              item.setAttribute("label", title || uri);
+              item.addEventListener("click", function(aEvent) {
+                if (aEvent.button == 0) {
+                  doc.defaultView.openUILink(uri, aEvent);
+                  doc.defaultView.PanelUI.hide();
+                }
+              });
+              if (icon)
+                item.setAttribute("image", "moz-anno:favicon:" + icon);
+              fragment.appendChild(item);
+            } catch (e) {
+              Cu.reportError("Error while showing history subview: " + e);
+            }
+          }
+          items.appendChild(fragment);
+        },
+        handleError: function (aError) {
+          LOG("History view tried to show but had an error: " + aError);
+        },
+        handleCompletion: function (aReason) {
+          LOG("History view is being shown!");
+        },
+      });
+    },
+    onViewHiding: function(aEvent) {
+      LOG("History view is being hidden!");
+    }
+  }, {
+    id: "privatebrowsing-button",
+    name: "Private Browsing\u2026",
+    description: "Open a new Private Browsing window",
+    defaultArea: CustomizableUI.AREA_PANEL,
+    allowedAreas: [CustomizableUI.AREA_PANEL],
+    icons: {
+      "16": "chrome://branding/content/icon16.png",
+      "32": "chrome://branding/content/icon48.png",
+      "48": "chrome://branding/content/icon48.png"
+    },
+    onCommand: function(e) {
+      if (e.target && e.target.ownerDocument && e.target.ownerDocument.defaultView) {
+        let win = e.target.ownerDocument.defaultView;
+        if (typeof win.OpenBrowserWindow == "function") {
+          win.OpenBrowserWindow({private: true});
+        }
+      }
+    }
+  }, {
+    id: "save-page-button",
+    name: "Save Page",
+    shortcut: "Ctrl+S",
+    description: "Save this page",
+    defaultArea: CustomizableUI.AREA_PANEL,
+    allowedAreas: [CustomizableUI.AREA_PANEL],
+    icons: {
+      "16": "chrome://branding/content/icon16.png",
+      "32": "chrome://branding/content/icon48.png",
+      "48": "chrome://branding/content/icon48.png"
+    },
+    onCommand: function(aEvent) {
+      let win = aEvent.target &&
+                aEvent.target.ownerDocument &&
+                aEvent.target.ownerDocument.defaultView;
+      if (win && typeof win.saveDocument == "function") {
+        win.saveDocument(win.content.document);
+      }
+    }
+  }, {
+    id: "find-button",
+    name: "Find",
+    shortcut: "Ctrl+F",
+    description: "Find in this page",
+    defaultArea: CustomizableUI.AREA_PANEL,
+    allowedAreas: [CustomizableUI.AREA_PANEL],
+    icons: {
+      "16": "chrome://branding/content/icon16.png",
+      "32": "chrome://branding/content/icon48.png",
+      "48": "chrome://branding/content/icon48.png"
+    },
+    onCommand: function(aEvent) {
+      let win = aEvent.target &&
+                aEvent.target.ownerDocument &&
+                aEvent.target.ownerDocument.defaultView;
+      if (win && win.gFindBar) {
+        win.gFindBar.onFindCommand();
+      }
+    }
+  }, {
+    id: "open-file-button",
+    name: "Open File",
+    shortcut: "Ctrl+O",
+    description: "Open file",
+    defaultArea: CustomizableUI.AREA_PANEL,
+    allowedAreas: [CustomizableUI.AREA_PANEL],
+    icons: {
+      "16": "chrome://branding/content/icon16.png",
+      "32": "chrome://branding/content/icon48.png",
+      "48": "chrome://branding/content/icon48.png"
+    },
+    onCommand: function(aEvent) {
+      let win = aEvent.target
+                && aEvent.target.ownerDocument
+                && aEvent.target.ownerDocument.defaultView;
+      if (win && typeof win.BrowserOpenFileWindow == "function") {
+        win.BrowserOpenFileWindow();
+      }
+    }
+  }, {
+    id: "developer-button",
+    name: "Developer",
+    shortcut: "Shift+F11",
+    description: "Toggle Developer Tools",
+    defaultArea: CustomizableUI.AREA_PANEL,
+    allowedAreas: [CustomizableUI.AREA_PANEL],
+    icons: {
+      "16": "chrome://branding/content/icon16.png",
+      "32": "chrome://branding/content/icon48.png",
+      "48": "chrome://branding/content/icon48.png"
+    },
+    onCommand: function(aEvent) {
+      let win = aEvent.target &&
+                aEvent.target.ownerDocument &&
+                aEvent.target.ownerDocument.defaultView;
+      if (win && win.gDevToolsBrowser) {
+        win.gDevToolsBrowser.toggleToolboxCommand(win.gBrowser);
+      }
+    }
+  }, {
+    id: "add-ons-button",
+    name: "Add-ons",
+    shortcut: "Ctrl+Shift+A",
+    description: "Add-ons Manager",
+    defaultArea: CustomizableUI.AREA_PANEL,
+    allowedAreas: [CustomizableUI.AREA_PANEL],
+    icons: {
+      "16": "chrome://branding/content/icon16.png",
+      "32": "chrome://branding/content/icon48.png",
+      "48": "chrome://branding/content/icon48.png"
+    },
+    onCommand: function(aEvent) {
+      let win = aEvent.target &&
+                aEvent.target.ownerDocument &&
+                aEvent.target.ownerDocument.defaultView;
+      if (win && typeof win.BrowserOpenAddonsMgr == "function") {
+        win.BrowserOpenAddonsMgr();
+      }
+    }
+  }, {
+    id: "preferences-button",
+    name: "Preferences",
+    shortcut: "Ctrl+Shift+O",
+    description: "Preferences\u2026",
+    defaultArea: CustomizableUI.AREA_PANEL,
+    allowedAreas: [CustomizableUI.AREA_PANEL],
+    icons: {
+      "16": "chrome://branding/content/icon16.png",
+      "32": "chrome://branding/content/icon48.png",
+      "48": "chrome://branding/content/icon48.png"
+    },
+    onCommand: function(aEvent) {
+      let win = aEvent.target &&
+                aEvent.target.ownerDocument &&
+                aEvent.target.ownerDocument.defaultView;
+      if (win && typeof win.openPreferences == "function") {
+        win.openPreferences();
+      }
+    }
+  }];
diff --git a/browser/components/customizableui/src/Makefile.in b/browser/components/customizableui/src/Makefile.in
index 1509df583485..e64f9890b563 100644
--- a/browser/components/customizableui/src/Makefile.in
+++ b/browser/components/customizableui/src/Makefile.in
@@ -11,6 +11,7 @@ include $(DEPTH)/config/autoconf.mk
 
 EXTRA_JS_MODULES = \
   CustomizableUI.jsm \
+  CustomizableWidgets.jsm \
   CustomizeMode.jsm \
   $(NULL)
 

From d3643b781790f6f5d1e86d53e6d7172a78d1e2c3 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Fri, 17 May 2013 18:09:41 +0200
Subject: [PATCH 115/230] Bug 873449 - Fix determination of drawing in titlebar
 to work for chromeless popups, r=dao

--HG--
extra : rebase_source : 7438861afa05c4b2661be1dcd5e2d15b26b12ae2
---
 browser/base/content/browser.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index a93090fa6a76..0470711ad3c1 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -4629,14 +4629,15 @@ var TabsInTitlebar = {
 
 #ifdef CAN_DRAW_IN_TITLEBAR
 function updateTitlebarDisplay() {
-  document.getElementById("titlebar").hidden = gInPrintPreviewMode;
+  let drawInTitlebar = !gInPrintPreviewMode && window.toolbar.visible;
+  document.getElementById("titlebar").hidden = !drawInTitlebar;
 
-  if (!gInPrintPreviewMode)
+  if (drawInTitlebar)
     document.documentElement.setAttribute("chromemargin", "0,2,2,2");
   else
     document.documentElement.removeAttribute("chromemargin");
 
-  TabsInTitlebar.allowedBy("drawing-in-titlebar", !gInPrintPreviewMode);
+  TabsInTitlebar.allowedBy("drawing-in-titlebar", drawInTitlebar);
 }
 #endif
 

From 247b8f5d7fc2b037f7d776d54a0d7b733a8b372e Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 17 May 2013 15:29:05 -0400
Subject: [PATCH 116/230] Bug 868612 - Fix mochitest test failures under
 browser/base/content/test. r=jaws,feedback=dao.

---
 browser/base/content/browser-customization.js | 14 ++---
 browser/base/content/browser.js               |  4 +-
 browser/base/content/test/Makefile.in         |  2 -
 .../base/content/test/browser_bug599325.js    | 21 -------
 .../base/content/test/browser_customize.js    | 24 --------
 browser/base/content/test/head.js             | 40 +++-----------
 .../customizableui/src/CustomizableUI.jsm     |  4 +-
 .../customizableui/src/CustomizeMode.jsm      | 55 +++++++++++++------
 browser/themes/linux/browser.css              |  3 +-
 9 files changed, 60 insertions(+), 107 deletions(-)
 delete mode 100644 browser/base/content/test/browser_bug599325.js
 delete mode 100644 browser/base/content/test/browser_customize.js

diff --git a/browser/base/content/browser-customization.js b/browser/base/content/browser-customization.js
index 59a3241c6f06..2d496b2e4fb0 100644
--- a/browser/base/content/browser-customization.js
+++ b/browser/base/content/browser-customization.js
@@ -5,22 +5,22 @@
 
 /**
  * Customization handler prepares this browser window for entering and exiting
- * customization mode by handling CustomizationStart and CustomizationEnd
+ * customization mode by handling customizationstarting and customizationending
  * events.
  */
 let CustomizationHandler = {
   handleEvent: function(aEvent) {
     switch(aEvent.type) {
-      case "CustomizationStart":
-        this._customizationStart();
+      case "customizationstarting":
+        this._customizationStarting();
         break;
-      case "CustomizationEnd":
-        this._customizationEnd(aEvent.detail);
+      case "customizationending":
+        this._customizationEnding(aEvent.detail);
         break;
     }
   },
 
-  _customizationStart: function() {
+  _customizationStarting: function() {
     // Disable the toolbar context menu items
     let menubar = document.getElementById("main-menubar");
     for (let childNode of menubar.childNodes)
@@ -41,7 +41,7 @@ let CustomizationHandler = {
     TabsInTitlebar.allowedBy("customizing-toolbars", false);
   },
 
-  _customizationEnd: function(aDetails) {
+  _customizationEnding: function(aDetails) {
     // Update global UI elements that may have been added or removed
     if (aDetails.changed) {
       gURLBar = document.getElementById("urlbar");
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 0470711ad3c1..1b0c8217856b 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1248,8 +1248,8 @@ var gBrowserInit = {
     window.addEventListener("mousemove", MousePosTracker, false);
     window.addEventListener("dragover", MousePosTracker, false);
 
-    window.addEventListener("CustomizationStart", CustomizationHandler, false);
-    window.addEventListener("CustomizationEnd", CustomizationHandler, false);
+    gNavToolbox.addEventListener("customizationstarting", CustomizationHandler);
+    gNavToolbox.addEventListener("customizationending", CustomizationHandler);
 
     gCustomizeMode.init();
 
diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index c2c42aee2e7a..e7bb1fd158de 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -138,7 +138,6 @@ _BROWSER_FILES = \
                  browser_bug596687.js \
                  browser_bug597218.js \
                  browser_bug598923.js \
-                 browser_bug599325.js \
                  browser_bug609700.js \
                  browser_bug623155.js \
                  browser_bug623893.js \
@@ -167,7 +166,6 @@ _BROWSER_FILES = \
                  browser_bug832435.js \
                  browser_bug839103.js \
                  browser_canonizeURL.js \
-                 browser_customize.js \
                  browser_findbarClose.js \
                  browser_homeDrop.js \
                  browser_keywordBookmarklets.js \
diff --git a/browser/base/content/test/browser_bug599325.js b/browser/base/content/test/browser_bug599325.js
deleted file mode 100644
index d721fc6632c7..000000000000
--- a/browser/base/content/test/browser_bug599325.js
+++ /dev/null
@@ -1,21 +0,0 @@
-function test() {
-  waitForExplicitFinish();
-
-  let addonBar = document.getElementById("addon-bar");
-  ok(addonBar, "got addon bar");
-  ok(!isElementVisible(addonBar), "addon bar initially hidden");
-
-  openToolbarCustomizationUI(function () {
-    ok(isElementVisible(addonBar),
-       "add-on bar is visible during toolbar customization");
-
-    closeToolbarCustomizationUI(onClose);
-  });
-
-  function onClose() {
-    ok(!isElementVisible(addonBar),
-       "addon bar is hidden after toolbar customization");
-
-    finish();
-  }
-}
diff --git a/browser/base/content/test/browser_customize.js b/browser/base/content/test/browser_customize.js
deleted file mode 100644
index 8cff36686ede..000000000000
--- a/browser/base/content/test/browser_customize.js
+++ /dev/null
@@ -1,24 +0,0 @@
-function test() {
-  waitForExplicitFinish();
-
-  openToolbarCustomizationUI(customizationWindowLoaded);
-}
-
-function customizationWindowLoaded(win) {
-  let x = win.screenX;
-  let iconModeList = win.document.getElementById("modelist");
-
-  iconModeList.addEventListener("popupshown", function popupshown() {
-    iconModeList.removeEventListener("popupshown", popupshown, false);
-
-    executeSoon(function () {
-      is(win.screenX, x,
-         "toolbar customization window shouldn't move when the iconmode menulist is opened");
-      iconModeList.open = false;
-    
-      closeToolbarCustomizationUI(finish);
-    });
-  }, false);
-
-  iconModeList.open = true;
-}
diff --git a/browser/base/content/test/head.js b/browser/base/content/test/head.js
index 9e82a92870e9..62fadf6803d7 100644
--- a/browser/base/content/test/head.js
+++ b/browser/base/content/test/head.js
@@ -37,49 +37,27 @@ function updateTabContextMenu(tab) {
   menu.hidePopup();
 }
 
-function findToolbarCustomizationWindow(aBrowserWin) {
-  if (!aBrowserWin)
-    aBrowserWin = window;
-
-  let iframe = aBrowserWin.document.getElementById("customizeToolbarSheetIFrame");
-  let win = iframe && iframe.contentWindow;
-  if (win)
-    return win;
-
-  win = findChromeWindowByURI("chrome://global/content/customizeToolbar.xul");
-  if (win && win.opener == aBrowserWin)
-    return win;
-
-  throw Error("Failed to find the customization window");
-}
-
 function openToolbarCustomizationUI(aCallback, aBrowserWin) {
   if (!aBrowserWin)
     aBrowserWin = window;
 
-  aBrowserWin.document.getElementById("cmd_CustomizeToolbars").doCommand();
+  aBrowserWin.gCustomizeMode.enter();
 
-  aBrowserWin.gNavToolbox.addEventListener("beforecustomization", function UI_loaded() {
-    aBrowserWin.gNavToolbox.removeEventListener("beforecustomization", UI_loaded);
-
-    let win = findToolbarCustomizationWindow(aBrowserWin);
-    waitForFocus(function () {
-      aCallback(win);
-    }, win);
+  aBrowserWin.gNavToolbox.addEventListener("customizationready", function UI_loaded() {
+    aBrowserWin.gNavToolbox.removeEventListener("customizationready", UI_loaded);
+    executeSoon(function() {
+      aCallback(aBrowserWin)
+    });
   });
 }
 
 function closeToolbarCustomizationUI(aCallback, aBrowserWin) {
-  let win = findToolbarCustomizationWindow(aBrowserWin);
-
-  win.addEventListener("unload", function unloaded() {
-    win.removeEventListener("unload", unloaded);
+  aBrowserWin.gNavToolbox.addEventListener("aftercustomization", function unloaded() {
+    aBrowserWin.gNavToolbox.removeEventListener("aftercustomization", unloaded);
     executeSoon(aCallback);
   });
 
-  let button = win.document.getElementById("donebutton");
-  button.focus();
-  button.doCommand();
+  aBrowserWin.gCustomizeMode.exit();
 }
 
 function waitForCondition(condition, nextTest, errorMsg) {
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 98e9157b81c5..4f865817a2e4 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -79,7 +79,7 @@ let gDefaultPlacements = new Map([
     "stop-button",
     "search-container",
     "webrtc-status-button",
-    "bookmarks-menu-button-container",
+    "bookmarks-menu-button",
     "downloads-button",
     "home-button",
     "social-toolbar-button",
@@ -493,7 +493,7 @@ let CustomizableUIInternal = {
   handleEvent: function(aEvent) {
     switch (aEvent.type) {
       case "unload": {
-        let window = aEvent.target;
+        let window = aEvent.currentTarget;
         window.removeEventListener("unload", this);
         this.unregisterBuildWindow(window);
         break;
diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index d045bb37b8e3..3ff64452d607 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -72,6 +72,8 @@ CustomizeMode.prototype = {
       return;
     }
 
+    this.dispatchToolboxEvent("beforecustomization");
+
     let window = this.window;
     let document = this.document;
 
@@ -104,9 +106,7 @@ CustomizeMode.prototype = {
     window.PanelUI.menuButton.disabled = true;
 
     // Let everybody in this window know that we're about to customize.
-    let evt = document.createEvent("CustomEvent");
-    evt.initCustomEvent("CustomizationStart", true, true, window);
-    window.dispatchEvent(evt);
+    this.dispatchToolboxEvent("customizationstarting");
 
     customizer.parentNode.selectedPanel = customizer;
 
@@ -116,7 +116,6 @@ CustomizeMode.prototype = {
     let panelHolder = document.getElementById("customization-panelHolder");
     panelHolder.appendChild(window.PanelUI.mainView);
 
-
     let self = this;
     deck.addEventListener("transitionend", function customizeTransitionEnd() {
       deck.removeEventListener("transitionend", customizeTransitionEnd);
@@ -138,6 +137,7 @@ CustomizeMode.prototype = {
       }
 
       self.populatePalette();
+      self.dispatchToolboxEvent("customizationready");
     });
 
     this.visiblePalette.addEventListener("dragstart", this);
@@ -181,7 +181,6 @@ CustomizeMode.prototype = {
       tabViewDeck.removeEventListener("transitionend", onTransitionEnd);
       documentElement.removeAttribute("customize-exiting");
     });
-    documentElement.removeAttribute("customizing");
 
     for (let target of this.areas) {
       for (let toolbarItem of target.children) {
@@ -206,11 +205,9 @@ CustomizeMode.prototype = {
     // And drop all area references.
     this.areas = [];
 
-    // Let everybody in this window know that we're finished customizing.
-    let evt = document.createEvent("CustomEvent");
-    evt.initCustomEvent("CustomizationEnd", true, true, {changed: this._changed});
-    window.dispatchEvent(evt);
-
+    // Let everybody in this window know that we're starting to
+    // exit customization mode.
+    this.dispatchToolboxEvent("customizationending");
     window.PanelUI.replaceMainView(window.PanelUI.mainView);
 
     let browser = document.getElementById("browser");
@@ -227,20 +224,39 @@ CustomizeMode.prototype = {
         // If there's history to this tab, just go back.
         custBrowser.goBack();
       } else {
-        let customizationTab = this.browser.selectedTab;
-        if (this.browser.browsers.length == 1) {
-          this.window.BrowserOpenTab();
+        // If we can't go back, we're removing the about:customization tab.
+        // We only do this if we're the top window for this window (so not
+        // a dialog window, for example).
+        if (this.window.getTopWin(true) == this.window) {
+          let customizationTab = this.browser.selectedTab;
+          if (this.browser.browsers.length == 1) {
+            this.window.BrowserOpenTab();
+          }
+          this.browser.removeTab(customizationTab);
         }
-        this.browser.removeTab(customizationTab);
       }
     }
 
+    let deck = document.getElementById("tab-view-deck");
+    let self = this;
+    deck.addEventListener("transitionend", function customizeTransitionEnd() {
+      deck.removeEventListener("transitionend", customizeTransitionEnd);
+      self.dispatchToolboxEvent("aftercustomization");
+    });
+    documentElement.removeAttribute("customizing");
+
     let customizer = document.getElementById("customization-container");
     customizer.hidden = true;
 
     this._changed = false;
   },
 
+  dispatchToolboxEvent: function(aEventType, aDetails={}) {
+    let evt = this.document.createEvent("CustomEvent");
+    evt.initCustomEvent(aEventType, true, true, {changed: this._changed});
+    let result = this.window.gNavToolbox.dispatchEvent(evt);
+  },
+
   populatePalette: function() {
     let toolboxPalette = this.window.gNavToolbox.palette;
 
@@ -429,15 +445,15 @@ CustomizeMode.prototype = {
   },
 
   onWidgetMoved: function(aWidgetId, aArea, aOldPosition, aNewPosition) {
-    this._changed = true;
+    this._onUIChange();
   },
 
   onWidgetAdded: function(aWidgetId, aArea, aPosition) {
-    this._changed = true;
+    this._onUIChange();
   },
 
   onWidgetRemoved: function(aWidgetId, aArea) {
-    this._changed = true;
+    this._onUIChange();
   },
 
   onWidgetCreated: function(aWidgetId) {
@@ -446,6 +462,11 @@ CustomizeMode.prototype = {
   onWidgetDestroyed: function(aWidgetId) {
   },
 
+  _onUIChange: function() {
+    this._changed = true;
+    this.dispatchToolboxEvent("customizationchange");
+  },
+
   handleEvent: function(aEvent) {
     switch(aEvent.type) {
       case "dragstart":
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 424daec63539..b8ffaecc5af5 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -1628,8 +1628,9 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   color: -moz-menubartext;
 }
 
+#toolbar-menubar:not([autohide="true"]):not(:-moz-lwtheme):-moz-system-metric(menubar-drag),
 #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme):-moz-system-metric(menubar-drag) {
-  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-drag");
+  -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-drag");
 }
 
 #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme) > #tabbrowser-tabs > .tabbrowser-tab:not([selected]) {

From 0e25d63962ca8bb07fde61f376799318e7f3bbf7 Mon Sep 17 00:00:00 2001
From: Blair McBride <bmcbride@mozilla.com>
Date: Wed, 15 May 2013 19:05:02 +1200
Subject: [PATCH 117/230] Bug 872403 - Add basic sanity check when restoring
 legacy state of toolbars. r=mconley.

---
 browser/components/customizableui/src/CustomizableUI.jsm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 4f865817a2e4..aa177de62991 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -216,7 +216,7 @@ let CustomizableUIInternal = {
     if (!gPlacements.has(area) && areaProperties.has("legacy")) {
       let legacyState = aToolbar.getAttribute("currentset");
       if (legacyState) {
-        legacyState = legacyState.split(",");
+        legacyState = legacyState.split(",").filter(s => s);
       }
 
       // Manually restore the state here, so the legacy state can be converted. 

From fd9c11fac1f7f3389c3c771dde3758b142712d9c Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Fri, 17 May 2013 00:25:40 -0400
Subject: [PATCH 118/230] Bug 858056 - Customization areas should only gain an
 affordance when an item is grabbed. r=Unfocused

--HG--
extra : rebase_source : ff7b1388bc36b81e1ed9a2ae65d245a44dfeddf5
---
 .../customizableui/src/CustomizeMode.jsm      | 31 +++++++++++++++++++
 .../customizableui/customizeMode.inc.css      | 10 ++++--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index 3ff64452d607..f3491506789e 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -128,6 +128,7 @@ CustomizeMode.prototype = {
         target.addEventListener("dragover", self);
         target.addEventListener("dragexit", self);
         target.addEventListener("drop", self);
+        target.addEventListener("dragend", self);
         for (let child of target.children) {
           if (self.isCustomizableItem(child)) {
             self.wrapToolbarItem(child, getPlaceForItem(child));
@@ -144,6 +145,7 @@ CustomizeMode.prototype = {
     this.visiblePalette.addEventListener("dragover", this);
     this.visiblePalette.addEventListener("dragexit", this);
     this.visiblePalette.addEventListener("drop", this);
+    this.visiblePalette.addEventListener("dragend", this);
 
     document.documentElement.setAttribute("customizing", true);
     this._customizing = true;
@@ -168,6 +170,7 @@ CustomizeMode.prototype = {
     this.visiblePalette.removeEventListener("dragover", this);
     this.visiblePalette.removeEventListener("dragexit", this);
     this.visiblePalette.removeEventListener("drop", this);
+    this.visiblePalette.removeEventListener("dragend", this);
 
     let window = this.window;
     let document = this.document;
@@ -192,6 +195,7 @@ CustomizeMode.prototype = {
       target.removeEventListener("dragover", this);
       target.removeEventListener("dragexit", this);
       target.removeEventListener("drop", this);
+      target.removeEventListener("dragend", this);
     }
 
     if (this._changed) {
@@ -481,6 +485,9 @@ CustomizeMode.prototype = {
       case "dragexit":
         this._onDragExit(aEvent);
         break;
+      case "dragend":
+        this._onDragEnd(aEvent);
+        break;
       case "mousedown":
         this._onMouseDown(aEvent);
         break;
@@ -658,11 +665,29 @@ CustomizeMode.prototype = {
   },
 
   _onDragExit: function(aEvent) {
+    __dumpDragData(aEvent);
     if (this._dragOverItem) {
       this._setDragActive(this._dragOverItem, false);
     }
   },
 
+  _onDragEnd: function(aEvent) {
+    __dumpDragData(aEvent);
+    let document = aEvent.target.ownerDocument;
+    document.documentElement.removeAttribute("customizing-movingItem");
+
+    let documentId = document.documentElement.id;
+    if (!aEvent.dataTransfer.types.contains("text/toolbarwrapper-id/"
+                                            + documentId.toLowerCase())) {
+      return;
+    }
+
+    let draggedItemId = aEvent.dataTransfer.getData("text/toolbarwrapper-id/" + documentId);
+    let draggedWrapper = document.getElementById("wrapper-" + draggedItemId);
+
+    draggedWrapper.removeAttribute("mousedown");
+  },
+
   // XXXjaws Show a ghost image or blank area where the item could be added, instead of black bar
   _setDragActive: function(aItem, aValue) {
     let node = aItem;
@@ -700,6 +725,9 @@ CustomizeMode.prototype = {
   },
 
   _onMouseDown: function(aEvent) {
+    LOG("_onMouseDown");
+    let doc = aEvent.target.ownerDocument;
+    doc.documentElement.setAttribute("customizing-movingItem", true);
     let item = this._getWrapper(aEvent.target);
     if (item) {
       item.setAttribute("mousedown", "true");
@@ -707,6 +735,9 @@ CustomizeMode.prototype = {
   },
 
   _onMouseUp: function(aEvent) {
+    LOG("_onMouseUp");
+    let doc = aEvent.target.ownerDocument;
+    doc.documentElement.removeAttribute("customizing-movingItem");
     let item = this._getWrapper(aEvent.target);
     if (item) {
       item.removeAttribute("mousedown");
diff --git a/browser/themes/shared/customizableui/customizeMode.inc.css b/browser/themes/shared/customizableui/customizeMode.inc.css
index 784d17062b2c..ed7359226608 100644
--- a/browser/themes/shared/customizableui/customizeMode.inc.css
+++ b/browser/themes/shared/customizableui/customizeMode.inc.css
@@ -10,11 +10,17 @@
   transition-timing-function: ease-out;
 }
 
-#main-window[customizing] .customization-target {
-  border: 1px dashed #bbb;
+#main-window[customizing] .customization-target,
+#main-window[customizing] #customization-panelHolder > #PanelUI-mainView {
+  border: 1px dashed transparent;
   margin: 3px;
 }
 
+#main-window[customizing-movingItem] .customization-target,
+#main-window[customizing-movingItem] #customization-panelHolder > #PanelUI-mainView {
+  border-color: #bbb;
+}
+
 #main-window[customizing] .customization-target {
   min-width: 100px;
   padding-left: 10px;

From aa5df27c5ae52ec1cd0f609961374b1624c053e0 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 17 May 2013 21:13:17 -0400
Subject: [PATCH 119/230] Bug 866245 - Let widgets know when they're in the
 toolbar or menu panel, and what the appropriate anchors are. r=Unfocused.

---
 .../customizableui/src/CustomizableUI.jsm     | 87 ++++++++++++++++---
 1 file changed, 76 insertions(+), 11 deletions(-)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index aa177de62991..3f4ee1d9b235 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -146,11 +146,26 @@ let CustomizableUIInternal = {
     this._defineBuiltInWidgets();
     this.loadSavedState();
 
-    this.registerArea(CustomizableUI.AREA_PANEL);
-    this.registerArea(CustomizableUI.AREA_NAVBAR, ["legacy"]);
-    this.registerArea(CustomizableUI.AREA_MENUBAR, ["legacy"]);
-    this.registerArea(CustomizableUI.AREA_TABSTRIP, ["legacy"]);
-    this.registerArea(CustomizableUI.AREA_BOOKMARKS, ["legacy"]);
+    this.registerArea(CustomizableUI.AREA_PANEL, {
+      anchor: "PanelUI-menu-button",
+      type: CustomizableUI.TYPE_MENU_PANEL
+    });
+    this.registerArea(CustomizableUI.AREA_NAVBAR, {
+      legacy: true,
+      type: CustomizableUI.TYPE_TOOLBAR
+    });
+    this.registerArea(CustomizableUI.AREA_MENUBAR, {
+      legacy: true,
+      type: CustomizableUI.TYPE_TOOLBAR
+    });
+    this.registerArea(CustomizableUI.AREA_TABSTRIP, {
+      legacy: true,
+      type: CustomizableUI.TYPE_TOOLBAR
+    });
+    this.registerArea(CustomizableUI.AREA_BOOKMARKS, {
+      legacy: true,
+      type: CustomizableUI.TYPE_TOOLBAR
+    });
   },
 
   _defineBuiltInWidgets: function() {
@@ -187,10 +202,13 @@ let CustomizableUIInternal = {
       throw new Error("Area already registered");
     }
 
-    let props = new Set(aProperties);
+    let props = new Map();
+    for (let key in aProperties) {
+      props.set(key, aProperties[key]);
+    }
     gAreas.set(aName, props);
 
-    if (props.has("legacy")) {
+    if (props.get("legacy")) {
       // Guarantee this area exists in gFuturePlacements, to avoid checking it in
       // various places elsewhere.
       gFuturePlacements.set(aName, new Set());
@@ -247,6 +265,7 @@ let CustomizableUIInternal = {
     for (let id of aPlacements) {
       if (currentNode && currentNode.id == id) {
         this._addParentFlex(currentNode);
+        this.setLocationAttributes(currentNode, container, aArea);
         currentNode = currentNode.nextSibling;
         continue;
       }
@@ -261,8 +280,7 @@ let CustomizableUIInternal = {
           aArea == CustomizableUI.AREA_PANEL) {
         this.ensureButtonClosesPanel(node);
       }
-
-      container.insertBefore(node, currentNode);
+      this.insertWidgetBefore(node, currentNode, container, aArea);
       this._addParentFlex(node);
     }
 
@@ -282,6 +300,8 @@ let CustomizableUIInternal = {
           } else {
             container.removeChild(node);
           }
+        } else {
+          this.setLocationAttributes(currentNode, container, aArea);
         }
         node = previousSibling;
       }
@@ -396,7 +416,7 @@ let CustomizableUIInternal = {
 
       let nextNode = nextNodeId ? container.querySelector(idToSelector(nextNodeId))
                                 : null;
-      container.insertBefore(widgetNode, nextNode);
+      this.insertWidgetBefore(aNode, aNextNode, container, aArea);
       this._addParentFlex(widgetNode);
     }
   },
@@ -420,6 +440,7 @@ let CustomizableUIInternal = {
       if (gPalette.has(aWidgetId) || this.isSpecialWidget(aWidgetId)) {
         container.removeChild(widgetNode);
       } else {
+        this.removeLocationAttributes(widgetNode);
         areaNode.toolbox.palette.appendChild(widgetNode);
       }
     }
@@ -452,7 +473,7 @@ let CustomizableUIInternal = {
 
       let nextNode = nextNodeId ? container.querySelector(idToSelector(nextNodeId))
                                 : null;
-      container.insertBefore(widgetNode, nextNode);
+      this.insertWidgetBefore(widgetNode, nextNode, container, aArea);
     }
   },
 
@@ -490,6 +511,27 @@ let CustomizableUIInternal = {
       widget.instances.delete(document);
   },
 
+  setLocationAttributes: function(aNode, aContainer, aArea) {
+    let props = gAreas.get(aArea);
+    if (!props) {
+      throw new Error("Expected area " + aArea + " to have a properties Map " +
+                      "associated with it.");
+    }
+
+    aNode.setAttribute("customizableui-areatype", props.get("type") || "");
+    aNode.setAttribute("customizableui-anchorid", props.get("anchor") || "");
+  },
+
+  removeLocationAttributes: function(aNode) {
+    aNode.removeAttribute("customizableui-areatype");
+    aNode.removeAttribute("customizableui-anchorid");
+  },
+
+  insertWidgetBefore: function(aNode, aNextNode, aContainer, aArea) {
+    this.setLocationAttributes(aNode, aContainer, aArea);
+    aContainer.insertBefore(aNode, aNextNode);
+  },
+
   handleEvent: function(aEvent) {
     switch (aEvent.type) {
       case "unload": {
@@ -1338,6 +1380,8 @@ this.CustomizableUI = {
   get SOURCE_EXTERNAL() "external",
 
   get TYPE_BUTTON() "button",
+  get TYPE_MENU_PANEL() "menu-panel",
+  get TYPE_TOOLBAR() "toolbar",
 
   addListener: function(aListener) {
     CustomizableUIInternal.addListener(aListener);
@@ -1494,6 +1538,17 @@ function WidgetSingleWrapper(aWidget, aNode) {
     aNode.disabled = !!aValue;
   });
 
+  this.__defineGetter__("anchor", function() {
+    let anchorId = aNode.getAttribute("customizableui-anchorid");
+    return anchorId ? aNode.ownerDocument.getElementById(anchorId)
+                    : aNode;
+  });
+
+  this.__defineGetter__("areaType", function() {
+    return aNode.getAttribute("customizableui-areatype") || "";
+  });
+
+
   Object.freeze(this);
 }
 
@@ -1553,6 +1608,16 @@ function XULWidgetSingleWrapper(aWidgetId, aNode) {
 
   this.node = aNode;
 
+  this.__defineGetter__("anchor", function() {
+    let anchorId = aNode.getAttribute("customizableui-anchorid");
+    return anchorId ? aNode.ownerDocument.getElementById(anchorId)
+                    : aNode;
+  });
+
+  this.__defineGetter__("areaType", function() {
+    return aNode.getAttribute("customizableui-areatype") || "";
+  });
+
   Object.freeze(this);
 }
 

From d3cd1affb4c58c79ee34369b64c9945fa0ff8ab1 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Sat, 18 May 2013 21:11:03 -0400
Subject: [PATCH 120/230] Bug 866245 Follow-up - a copypaste error resulted in
 some undefined variables being used when adding widgets. r=trivial.

---
 browser/components/customizableui/src/CustomizableUI.jsm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 3f4ee1d9b235..444c0f8f1f28 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -416,7 +416,7 @@ let CustomizableUIInternal = {
 
       let nextNode = nextNodeId ? container.querySelector(idToSelector(nextNodeId))
                                 : null;
-      this.insertWidgetBefore(aNode, aNextNode, container, aArea);
+      this.insertWidgetBefore(widgetNode, nextNode, container, aArea);
       this._addParentFlex(widgetNode);
     }
   },

From 0268579aaffe16bcfc4b0ed973852e78e6bcf186 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Mon, 20 May 2013 13:23:50 -0400
Subject: [PATCH 121/230] Bug 870869 - The "Restore Defaults" button in
 customization mode should get hidden if the toolbar is in the default state.
 r=Gijs.

---
 .../content/customizeMode.inc.xul             |  2 +-
 .../customizableui/src/CustomizableUI.jsm     | 21 +++++++++++++++++++
 .../customizableui/src/CustomizeMode.jsm      |  7 +++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/browser/components/customizableui/content/customizeMode.inc.xul b/browser/components/customizableui/content/customizeMode.inc.xul
index eb6d46749cb3..794427e6f560 100644
--- a/browser/components/customizableui/content/customizeMode.inc.xul
+++ b/browser/components/customizableui/content/customizeMode.inc.xul
@@ -7,7 +7,7 @@
     <label id="customization-header" value="&customizeMode.menuAndToolbars.header;"/>
     <vbox id="customization-palette" flex="1"/>
     <hbox pack="start">
-      <button oncommand="gCustomizeMode.reset();" label="&customizeMode.restoreDefaults;" class="customizationmode-button"/>
+      <button id="customization-reset-button" oncommand="gCustomizeMode.reset();" label="&customizeMode.restoreDefaults;" class="customizationmode-button"/>
     </hbox>
   </vbox>
   <vbox id="customization-panel-container">
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 444c0f8f1f28..52f66de5e493 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -1361,6 +1361,24 @@ let CustomizableUIInternal = {
       let elementFlex = parseInt(aElement.getAttribute("flex"), 10);
       parent.setAttribute("flex", Math.max(0, parentFlex - elementFlex));
     }
+  },
+
+  get inDefaultState() {
+    for (let [areaId, defaultPlacements] of gDefaultPlacements) {
+      let currentPlacements = gPlacements.get(areaId);
+
+      if (currentPlacements.length != defaultPlacements.length) {
+        return false;
+      }
+
+      for (let i = 0; i < currentPlacements.length; ++i) {
+        if (currentPlacements[i] != defaultPlacements[i]) {
+          return false;
+        }
+      }
+    }
+
+    return true;
   }
 };
 Object.freeze(CustomizableUIInternal);
@@ -1455,6 +1473,9 @@ this.CustomizableUI = {
   },
   getPlacementOfWidget: function(aWidgetId) {
     return CustomizableUIInternal.getPlacementOfWidget(aWidgetId);
+  },
+  get inDefaultState() {
+    return CustomizableUIInternal.inDefaultState;
   }
 };
 Object.freeze(this.CustomizableUI);
diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index f3491506789e..8f8320da4740 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -51,6 +51,10 @@ CustomizeMode.prototype = {
   _dragOverItem: null,
   _customizing: false,
 
+  get resetButton() {
+    return this.document.getElementById("customization-restore-button");
+  },
+
   init: function() {
     // There are two palettes - there's the palette that can be overlayed with
     // toolbar items in browser.xul. This is invisible, and never seen by the
@@ -147,6 +151,8 @@ CustomizeMode.prototype = {
     this.visiblePalette.addEventListener("drop", this);
     this.visiblePalette.addEventListener("dragend", this);
 
+    this.resetButton.hidden = CustomizableUI.inDefaultState;
+
     document.documentElement.setAttribute("customizing", true);
     this._customizing = true;
   },
@@ -468,6 +474,7 @@ CustomizeMode.prototype = {
 
   _onUIChange: function() {
     this._changed = true;
+    this.resetButton.hidden = CustomizableUI.inDefaultState;
     this.dispatchToolboxEvent("customizationchange");
   },
 

From 7b8288c87098afeca136b4aafeb57cc0e333ea67 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Mon, 20 May 2013 15:45:48 -0400
Subject: [PATCH 122/230] Bug 870879 - Follow-up that fixes the resetButton
 getter so that it uses the right element ID. r=trivial.

---
 browser/components/customizableui/src/CustomizeMode.jsm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index 8f8320da4740..0eb66d09214d 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -52,7 +52,7 @@ CustomizeMode.prototype = {
   _customizing: false,
 
   get resetButton() {
-    return this.document.getElementById("customization-restore-button");
+    return this.document.getElementById("customization-reset-button");
   },
 
   init: function() {

From 54968a1fd4746e706242fb716ac44a622938e043 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Tue, 21 May 2013 15:21:16 +0200
Subject: [PATCH 123/230] Bug 874371 - Failing panorama tests checking for
 toolbar item presence on UX builds, r=ttaubert, f=mconley

---
 browser/base/content/browser-tabview.js                  | 9 +++------
 .../components/tabview/test/browser_tabview_bug626791.js | 8 ++++----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/browser/base/content/browser-tabview.js b/browser/base/content/browser-tabview.js
index f6ad77999f25..7fa4cd4a70ca 100644
--- a/browser/base/content/browser-tabview.js
+++ b/browser/base/content/browser-tabview.js
@@ -420,16 +420,13 @@ let TabView = {
 
     let toolbar = document.getElementById("TabsToolbar");
     let currentSet = toolbar.currentSet.split(",");
-
     let alltabsPos = currentSet.indexOf("alltabs-button");
     if (-1 == alltabsPos)
       return;
 
-    currentSet[alltabsPos] += "," + buttonId;
-    currentSet = currentSet.join(",");
-    toolbar.currentSet = currentSet;
-    toolbar.setAttribute("currentset", currentSet);
-    document.persist(toolbar.id, "currentset");
+    let allTabsBtn = document.getElementById("alltabs-button");
+    let nextItem = allTabsBtn.nextSibling;
+    toolbar.insertItem(buttonId, nextItem);
   },
 
   // ----------
diff --git a/browser/components/tabview/test/browser_tabview_bug626791.js b/browser/components/tabview/test/browser_tabview_bug626791.js
index d9f885cd8fad..2a57d1a2642a 100644
--- a/browser/components/tabview/test/browser_tabview_bug626791.js
+++ b/browser/components/tabview/test/browser_tabview_bug626791.js
@@ -1,6 +1,9 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+Cu.import("resource:///modules/CustomizableUI.jsm");
+
+
 function test() {
   let cw;
   let win;
@@ -31,10 +34,7 @@ function test() {
     let pos = currentSet.indexOf(buttonId);
 
     if (-1 < pos) {
-      currentSet.splice(pos, 1);
-      toolbar.setAttribute("currentset", currentSet.join(","));
-      toolbar.currentSet = currentSet.join(",");
-      win.document.persist(toolbar.id, "currentset");
+      CustomizableUI.removeWidgetFromArea("tabview-button");
     }
   }
 

From 0f37dbe9a7cc8defbe75e3b9d3972212b54058e7 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Tue, 21 May 2013 10:27:08 -0400
Subject: [PATCH 124/230] Bug 874319 - Add missing references to PlacesUtils to
 CustomizableWidgets. r=gijs,mconley

--HG--
extra : rebase_source : a18d5370706bdb46afcee416ebb4a7fe0fdbcbc9
---
 .../customizableui/src/CustomizableUI.jsm     |  2 --
 .../src/CustomizableWidgets.jsm               | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 52f66de5e493..563b9e2244af 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -11,8 +11,6 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
-  "resource://gre/modules/PlacesUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "CustomizableWidgets",
   "resource:///modules/CustomizableWidgets.jsm");
 
diff --git a/browser/components/customizableui/src/CustomizableWidgets.jsm b/browser/components/customizableui/src/CustomizableWidgets.jsm
index cfcc54a935ae..a7b2acd45e3f 100644
--- a/browser/components/customizableui/src/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/src/CustomizableWidgets.jsm
@@ -8,6 +8,25 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 this.EXPORTED_SYMBOLS = ["CustomizableWidgets"];
 
 Cu.import("resource:///modules/CustomizableUI.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
+  "resource://gre/modules/PlacesUtils.jsm");
+
+const kNSXUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+const kPrefCustomizationDebug = "browser.uiCustomization.debug";
+
+let gDebug = false;
+try {
+  gDebug = Services.prefs.getBoolPref(kPrefCustomizationDebug);
+} catch (e) {}
+
+function LOG(aMsg) {
+  if (gDebug) {
+    Services.console.logStringMessage("[CustomizableWidgets] " + aMsg);
+  }
+}
+function ERROR(aMsg) Cu.reportError("[CustomizableWidgets] " + aMsg);
 
 const CustomizableWidgets = [{
     id: "history-panelmenu",

From 0c6b659e40c18f3ef5cbbda6161159e49f52f223 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Tue, 21 May 2013 10:27:16 -0400
Subject: [PATCH 125/230] Bug 870461 - Add 'Clear Recent History', 'Restore
 Previous Session', and tweak some of the text. r=gijs

--HG--
extra : rebase_source : bf880c3a7f75c43d32b63c190af8e79495ad2c9b
---
 browser/components/customizableui/content/panelUI.inc.xul | 8 +++++++-
 .../components/customizableui/src/CustomizableWidgets.jsm | 2 +-
 browser/locales/en-US/chrome/browser/browser.dtd          | 4 +++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index 588cb72f628d..c64b31eb033f 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -56,8 +56,14 @@
 
     <panelsubview id="PanelUI-history" flex="1">
       <label value="&appMenuHistory.label;"/>
+      <toolbarbutton id="appMenuClearRecentHistory"
+                     label="&appMenuHistory.clearRecentLabel;"
+                     command="Tools:Sanitize"/>
+      <toolbarbutton id="appMenuRestoreLastSession"
+                     label="&appMenuHistory.restoreSession;"
+                     command="Browser:RestoreLastSession"/>
       <vbox id="PanelUI-historyItems"/>
-      <label value="&appMenuHistoryMore.label;"
+      <label value="&appMenuHistory.moreLabel;"
              id="PanelUI-historyMore"
              class="text-link"
              onclick="PlacesCommandHook.showPlacesOrganizer('History'); PanelUI.hide();"/>
diff --git a/browser/components/customizableui/src/CustomizableWidgets.jsm b/browser/components/customizableui/src/CustomizableWidgets.jsm
index a7b2acd45e3f..3e69eb452fee 100644
--- a/browser/components/customizableui/src/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/src/CustomizableWidgets.jsm
@@ -33,7 +33,7 @@ const CustomizableWidgets = [{
     type: "view",
     viewId: "PanelUI-history",
     name: "History...",
-    description: "History repeats itself!",
+    description: "History",
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
     icons: {
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index a22ea46b9ec2..4a12c8971012 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -322,7 +322,9 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY appMenuCustomize.label "Customize">
 <!ENTITY appMenuBookmarks.label "Bookmarks">
 <!ENTITY appMenuHistory.label "History">
-<!ENTITY appMenuHistoryMore.label "More…">
+<!ENTITY appMenuHistory.moreLabel "Show All History">
+<!ENTITY appMenuHistory.clearRecentLabel "Clear Recent History…">
+<!ENTITY appMenuHistory.restoreSession "Restore Previous Session">
 
 <!ENTITY openCmd.commandkey           "l">
 <!ENTITY urlbar.placeholder2          "Search or enter address">

From d93b5adced08605d8693b71eac8c40c9f460d3f6 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Tue, 21 May 2013 10:27:17 -0400
Subject: [PATCH 126/230] Bug 872446 - Remove our uses of :not([customizing])
 for toolbars and customization mode. r=dao

--HG--
extra : rebase_source : 72d8aefafc3d0b6e2a6c6d3f808603cc0ef2f58d
---
 browser/themes/linux/browser.css        | 8 ++++----
 browser/themes/osx/browser.css          | 8 ++++----
 browser/themes/windows/browser-aero.css | 4 ++--
 browser/themes/windows/browser.css      | 4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index b8ffaecc5af5..c87863549e8c 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -53,14 +53,14 @@
 #nav-bar[collapsed=true] + toolbar:not(:-moz-lwtheme),
 #nav-bar[collapsed=true] + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme),
 #nav-bar[tabsontop=true],
-#nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + toolbar,
-#nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar {
+#nav-bar[tabsontop=true][collapsed=true] + toolbar,
+#nav-bar[tabsontop=true][collapsed=true] + #customToolbars + #PersonalToolbar {
   background-image: linear-gradient(@toolbarHighlight@, rgba(255,255,255,0));
 }
 
 #nav-bar[tabsontop=true],
-#nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + toolbar,
-#nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar {
+#nav-bar[tabsontop=true][collapsed=true] + toolbar,
+#nav-bar[tabsontop=true][collapsed=true] + #customToolbars + #PersonalToolbar {
   box-shadow: 0 1px 0 @toolbarHighlight@ inset;
   margin-top: -1px; /* Move up 1px into the TabsToolbar */
   /* Position the toolbar above the bottom of background tabs */
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 2285787691da..68a50159d587 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -85,8 +85,8 @@ toolbox[tabsontop=true] > toolbar:not(#TabsToolbar):not(#nav-bar):not(:-moz-lwth
 }
 
 #nav-bar[tabsontop=true],
-#nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + toolbar,
-#nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar {
+#nav-bar[tabsontop=true][collapsed=true] + toolbar,
+#nav-bar[tabsontop=true][collapsed=true] + #customToolbars + #PersonalToolbar {
   -moz-appearance: none;
   padding-top: 4px !important;
   background: url(chrome://browser/skin/Toolbar-background-noise.png),
@@ -107,8 +107,8 @@ toolbox[tabsontop=true] > toolbar:not(#TabsToolbar):not(#nav-bar):not(:-moz-lwth
 
 #PersonalToolbar:not(:-moz-lwtheme):-moz-window-inactive,
 #nav-bar[tabsontop=true]:not(:-moz-lwtheme):-moz-window-inactive,
-#nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + toolbar:not(:-moz-lwtheme):-moz-window-inactive,
-#nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme):-moz-window-inactive {
+#nav-bar[tabsontop=true][collapsed=true] + toolbar:not(:-moz-lwtheme):-moz-window-inactive,
+#nav-bar[tabsontop=true][collapsed=true] + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme):-moz-window-inactive {
   background-color: -moz-mac-chrome-inactive;
 }
 
diff --git a/browser/themes/windows/browser-aero.css b/browser/themes/windows/browser-aero.css
index 4d88d9920e5a..f71474a73866 100644
--- a/browser/themes/windows/browser-aero.css
+++ b/browser/themes/windows/browser-aero.css
@@ -175,8 +175,8 @@
   /* This code is only needed for restored windows (i.e. sizemode=normal)
      because of the border radius on the toolbar below the tab bar. */
   #main-window[sizemode=normal] #nav-bar[tabsontop=true],
-  #main-window[sizemode=normal] #nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + toolbar,
-  #main-window[sizemode=normal] #nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar {
+  #main-window[sizemode=normal] #nav-bar[tabsontop=true][collapsed=true] + toolbar,
+  #main-window[sizemode=normal] #nav-bar[tabsontop=true][collapsed=true] + #customToolbars + #PersonalToolbar {
     border-top: 1px solid @toolbarShadowColor@;
     border-top-left-radius: 2.5px;
     border-top-right-radius: 2.5px;
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 9709ef012e45..6e57626637c3 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -96,8 +96,8 @@
 %endif
 
 #nav-bar[tabsontop=true],
-#nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + toolbar,
-#nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar {
+#nav-bar[tabsontop=true][collapsed=true] + toolbar,
+#nav-bar[tabsontop=true][collapsed=true] + #customToolbars + #PersonalToolbar {
   background-image: linear-gradient(@toolbarHighlight@, rgba(255,255,255,0));
   box-shadow: 0 1px 0 @toolbarHighlight@ inset;
   margin-top: -1px; /* Move up 1px into the TabsToolbar */

From db54a17ec219026538cc22224562fe29c76fe0bd Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Tue, 21 May 2013 11:24:27 -0400
Subject: [PATCH 127/230] Bug 870989 - Menu panel sometimes has no right
 border. r=mconley

--HG--
extra : rebase_source : d783ada6546713881a3f96eda11340e51d31c6f8
---
 browser/themes/shared/customizableui/panelUIOverlay.inc.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index 3b7262dc11e0..79a03d7fef94 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -53,6 +53,7 @@ panelmultiview > panelsubview:not([current]) {
 }
 
 #PanelUI-popup > .panel-arrowcontainer > .panel-arrowcontent {
+  overflow: hidden;
   padding: 0;
 }
 

From 8ebddf09081bdf9c32866f08f697c18f99b968d1 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Tue, 21 May 2013 16:18:33 -0400
Subject: [PATCH 128/230] Bug 865926 - Allow the nav-bar to overflow
 toolbaritems into an overflow panel. r=mconley

---
 browser/base/content/browser.css              |   9 +
 browser/base/content/browser.xul              |  26 ++-
 .../customizableui/content/panelUI.inc.xul    |   9 +
 .../customizableui/src/CustomizableUI.jsm     | 188 +++++++++++++++++-
 .../customizableui/src/CustomizeMode.jsm      |   8 +
 .../locales/en-US/chrome/browser/browser.dtd  |   1 +
 browser/themes/linux/browser.css              |  16 ++
 browser/themes/osx/browser.css                |  16 ++
 .../customizableui/panelUIOverlay.inc.css     |   8 +-
 browser/themes/windows/browser.css            |  16 ++
 10 files changed, 286 insertions(+), 11 deletions(-)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index b429c6a52ec4..ba1b78dbee40 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -108,6 +108,15 @@ toolbar[printpreview="true"] {
   -moz-box-ordinal-group: 50;
 }
 
+toolbar[overflowable] > .customization-target {
+  overflow: hidden;
+}
+
+toolbar[customizing][overflowable] > .overflow-button,
+toolbar[overflowable]:not([overflowing]) > .overflow-button {
+  display: none;
+}
+
 #TabsToolbar {
   -moz-box-ordinal-group: 100;
 }
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index c8f94fd756a4..e63badb65dcb 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -502,15 +502,17 @@
              aria-label="&navbarCmd.label;"
              fullscreentoolbar="true" mode="icons" customizable="true"
              iconsize="large"
-             defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button,window-controls"
+             defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button"
              customizationtarget="nav-bar-customizationtarget"
+             overflowbutton="nav-bar-overflow-button"
              context="toolbar-context-menu">
 
-      <hbox id="nav-bar-customizationtarget" class="customization-target" flex="0">
+      <hbox id="nav-bar-customizationtarget" class="customization-target" flex="1">
         <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
                      context="backForwardMenu" removable="true"
                      forwarddisabled="true"
-                     title="&backForwardItem.title;">
+                     title="&backForwardItem.title;"
+                     nooverflow="true">
           <toolbarbutton id="back-button" class="toolbarbutton-1"
                          label="&backCmd.label;"
                          command="Browser:BackOrBackDuplicate"
@@ -531,7 +533,7 @@
         </toolbaritem>
 
         <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true"
-                     title="&locationItem.title;" class="chromeclass-location" removable="true">
+                     title="&locationItem.title;" class="chromeclass-location" removable="true" nooverflow="true">
           <textbox id="urlbar" flex="1"
                    placeholder="&urlbar.placeholder2;"
                    type="autocomplete"
@@ -623,12 +625,14 @@
                        label="&reloadCmd.label;" removable="true"
                        command="Browser:ReloadOrDuplicate"
                        onclick="checkForMiddleClick(this, event);"
-                       tooltiptext="&reloadButton.tooltip;"/>
+                       tooltiptext="&reloadButton.tooltip;"
+                       nooverflow="true"/>
 
         <toolbarbutton id="stop-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                        label="&stopCmd.label;" removable="true"
                        command="Browser:Stop"
-                       tooltiptext="&stopButton.tooltip;"/>
+                       tooltiptext="&stopButton.tooltip;"
+                       nooverflow="true"/>
 
         <toolbarbutton id="webrtc-status-button"
                        class="toolbarbutton-1 chromeclass-toolbar-additional"
@@ -636,7 +640,8 @@
                        hidden="true"
                        orient="horizontal"
                        label="&webrtcIndicatorButton.label;"
-                       tooltiptext="&webrtcIndicatorButton.tooltip;">
+                       tooltiptext="&webrtcIndicatorButton.tooltip;"
+                       nooverflow="true">
           <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);"
                      onpopuphiding="WebrtcIndicator.clearPopup(this);"
                      oncommand="WebrtcIndicator.menuCommand(event.target);"/>
@@ -703,6 +708,11 @@
         </toolbaritem>
       </hbox>
 
+      <toolbarbutton id="nav-bar-overflow-button"
+                     class="toolbarbutton-1 chromeclass-toolbar-additional chevron overflow-button"
+                     skipintoolbarset="true"
+                     tooltiptext="&navbarOverflow.label;"/>
+
       <toolbaritem id="PanelUI-button"
                    class="chromeclass-toolbar-additional"
                    removable="false"
@@ -859,7 +869,7 @@
 
       <toolbaritem id="search-container" title="&searchItem.title;"
                    align="center" class="chromeclass-toolbar-additional"
-                   flex="100" persist="width" removable="true">
+                   flex="100" persist="width" removable="true" noautoclose="true">
         <searchbar id="searchbar" flex="1"/>
       </toolbaritem>
 
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index c64b31eb033f..c0e695ac96ad 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -75,3 +75,12 @@
     </panelsubview>
   </panelmultiview>
 </panel>
+
+<panel id="widget-overflow"
+       role="group"
+       type="arrow"
+       level="top"
+       consumeoutsideclicks="true">
+  <vbox id="widget-overflow-list">
+  </vbox>
+</panel>
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 563b9e2244af..8b5710bfc21a 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -13,6 +13,8 @@ Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "CustomizableWidgets",
   "resource:///modules/CustomizableWidgets.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "DeferredTask",
+  "resource://gre/modules/DeferredTask.jsm");
 
 const kNSXUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
@@ -150,7 +152,8 @@ let CustomizableUIInternal = {
     });
     this.registerArea(CustomizableUI.AREA_NAVBAR, {
       legacy: true,
-      type: CustomizableUI.TYPE_TOOLBAR
+      type: CustomizableUI.TYPE_TOOLBAR,
+      overflowable: true
     });
     this.registerArea(CustomizableUI.AREA_MENUBAR, {
       legacy: true,
@@ -239,6 +242,10 @@ let CustomizableUIInternal = {
       this.restoreStateForArea(area, legacyState);
     }
 
+    if (areaProperties.has("overflowable")) {
+      aToolbar.overflowable = new OverflowableToolbar(aToolbar);
+    }
+
     this.registerBuildArea(area, aToolbar);
 
     let placements = gPlacements.get(area);
@@ -498,6 +505,12 @@ let CustomizableUIInternal = {
     let document = aWindow.document;
 
     for (let [, area] of gBuildAreas) {
+      let areaProperties = gAreas.get(area);
+      if (areaProperties.has("overflowable")) {
+        let toolbar = document.getElementById(area);
+        toolbar.overflowable.uninit();
+      }
+
       for (let node of area) {
         if (node.ownerDocument == document) {
           area.delete(node);
@@ -1640,6 +1653,179 @@ function XULWidgetSingleWrapper(aWidgetId, aNode) {
   Object.freeze(this);
 }
 
+const LAZY_RESIZE_INTERVAL_MS = 20;
+
+function OverflowableToolbar(aToolbarNode) {
+  this._toolbar = aToolbarNode;
+  this._target = aToolbarNode.customizationTarget;
+  let chevronId = this._toolbar.getAttribute("overflowbutton");
+  let doc = this._toolbar.ownerDocument;
+  this._chevron = doc.getElementById(chevronId);
+  this._panel = doc.getElementById("widget-overflow");
+  this._list = doc.getElementById("widget-overflow-list");
+  this._collapsed = [];
+  this._enabled = true;
+
+  this._toolbar.setAttribute("overflowable", "true");
+  this._toolbar.customizationTarget.addEventListener("overflow", this);
+  let window = doc.defaultView;
+  window.addEventListener("resize", this);
+  window.gNavToolbox.addEventListener("customizationstarting", this);
+  window.gNavToolbox.addEventListener("aftercustomization", this);
+  this._chevron.addEventListener("command", this);
+  this._panel.addEventListener("popuphiding", this);
+
+  // The toolbar could initialize in an overflowed state, in which case
+  // the 'overflow' event may have been fired before the handler was registered.
+  this._onOverflow();
+}
+
+OverflowableToolbar.prototype = {
+
+  uninit: function() {
+    this._disable();
+
+    this._toolbar.removeAttribute("overflowable");
+    this._toolbar.customizationTarget.removeEventListener("overflow", this);
+    let window = this._toolbar.ownerDocument.defaultView;
+    window.removeEventListener("resize", this);
+    window.gNavToolbox.removeEventListener("customizationstarting", this);
+    window.gNavToolbox.removeEventListener("aftercustomization", this);
+    this._chevron.removeEventListener("command", this);
+    this._panel.removeEventListener("popuphiding", this);
+  },
+
+  handleEvent: function(aEvent) {
+    switch(aEvent.type) {
+      case "overflow":
+        this._onOverflow();
+        break;
+      case "resize":
+        this._onResize(aEvent);
+        break;
+      case "command":
+        this._onClickChevron(aEvent);
+        break;
+      case "popuphiding":
+        this._onPanelHiding(aEvent);
+        break;
+      case "mouseup":
+      case "keypress":
+        this._maybeAutoHidePanel(aEvent);
+        break;
+      case "customizationstarting":
+        this._disable();
+        break;
+      case "aftercustomization":
+        this._enable();
+        break;
+    }
+  },
+
+  _onClickChevron: function(aEvent) {
+    if (this._chevron.open)
+      this._panel.hidePopup();
+    else {
+      let doc = aEvent.target.ownerDocument;
+      let anchor = doc.getAnonymousElementByAttribute(this._chevron, "class", "toolbarbutton-icon");
+      this._panel.openPopup(anchor || this._chevron, "bottomcenter topright");
+    }
+    this._chevron.open = !this._chevron.open;
+  },
+
+  _onPanelHiding: function(aEvent) {
+    this._chevron.open = false;
+  },
+
+  _onOverflow: function() {
+    if (!this._enabled)
+      return;
+
+    let child = this._target.lastChild;
+
+    while(child && this._target.clientWidth < this._target.scrollWidth) {
+      let prevChild = child.previousSibling;
+
+      if (!child.hasAttribute("nooverflow")) {
+        this._collapsed.push({child: child, minSize: this._target.clientWidth});
+        child.classList.add("overflowedItem");
+
+        child.addEventListener("mouseup", this);
+        child.addEventListener("keypress", this);
+
+        this._list.insertBefore(child, this._list.firstChild);
+        this._toolbar.setAttribute("overflowing", "true");
+      }
+      child = prevChild;
+    };
+  },
+
+  _maybeAutoHidePanel: function(aEvent) {
+    LOG("_maybeAutoHidePanel: " + aEvent.type);
+
+    if (aEvent.currentTarget.hasAttribute("noautoclose"))
+      return;
+
+    if (aEvent.type == "keypress" &&
+        !(aEvent.keyCode == aEvent.DOM_VK_ENTER ||
+          aEvent.keyCode == aEvent.DOM_VK_RETURN)) {
+      return;
+    }
+
+    if (aEvent.type == "mouseup" && aEvent.button != 0) {
+      return;
+    }
+
+    this._panel.hidePopup();
+  },
+
+  _onResize: function(aEvent) {
+    if (!this._lazyResizeHandler) {
+      this._lazyResizeHandler = new DeferredTask(this._onLazyResize.bind(this),
+                                                 LAZY_RESIZE_INTERVAL_MS);
+    }
+    this._lazyResizeHandler.start();
+  },
+
+  _moveItemsBackToTheirOrigin: function(shouldMoveAllItems) {
+    for (let i = this._collapsed.length - 1; i >= 0; i--) {
+      let {child, minSize} = this._collapsed[i];
+
+      if (!shouldMoveAllItems &&
+          this._target.clientWidth <= minSize) {
+        return;
+      }
+
+      this._collapsed.pop();
+      this._target.appendChild(child);
+      child.classList.remove("overflowedItem");
+      child.removeEventListener("mouseup", this);
+      child.removeEventListener("keypress", this);
+    }
+
+    if (!this._collapsed.length) {
+      this._toolbar.removeAttribute("overflowing");
+    }
+  },
+
+  _onLazyResize: function() {
+    if (!this._enabled)
+      return;
+
+    this._moveItemsBackToTheirOrigin();
+  },
+
+  _disable: function() {
+    this._enabled = false;
+    this._moveItemsBackToTheirOrigin(true);
+  },
+
+  _enable: function() {
+    this._enabled = true;
+    this._onOverflow();
+  }
+};
+
 // When IDs contain special characters, we need to escape them for use with querySelector:
 function idToSelector(aId) {
   return "#" + aId.replace(/[ !"'#$%&\(\)*+\-,.\/:;<=>?@\[\\\]^`{|}~]/g, '\\$&');
diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index 0eb66d09214d..1a88dc15ad58 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -153,6 +153,10 @@ CustomizeMode.prototype = {
 
     this.resetButton.hidden = CustomizableUI.inDefaultState;
 
+    let customizableToolbars = document.querySelectorAll("toolbar[customizable=true]:not([autohide=true])");
+    for (let toolbar of customizableToolbars)
+      toolbar.setAttribute("customizing", true);
+
     document.documentElement.setAttribute("customizing", true);
     this._customizing = true;
   },
@@ -255,6 +259,10 @@ CustomizeMode.prototype = {
     });
     documentElement.removeAttribute("customizing");
 
+    let customizableToolbars = document.querySelectorAll("toolbar[customizable=true]:not([autohide=true])");
+    for (let toolbar of customizableToolbars)
+      toolbar.removeAttribute("customizing");
+
     let customizer = document.getElementById("customization-container");
     customizer.hidden = true;
 
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 4a12c8971012..f1570d4ca661 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -16,6 +16,7 @@
 <!ENTITY mainWindow.titlePrivateBrowsingSuffix "(Private Browsing)">
 
 <!ENTITY appmenu.title                       "Customize and Control &brandFullName;">
+<!ENTITY navbarOverflow.label                "More tools…">
 
 <!-- Tab context menu -->
 <!ENTITY  reloadTab.label                    "Reload Tab">
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index c87863549e8c..e54b34dc2241 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -68,6 +68,22 @@
   z-index: 1;
 }
 
+#nav-bar-overflow-button {
+  -moz-image-region: rect(-5px, 12px, 11px, -4px);
+}
+
+#widget-overflow-list > .overflowedItem {
+  width: 100%;
+  min-height: 36px;
+  background-repeat: no-repeat;
+  background-position: 0 center;
+}
+
+#widget-overflow-list > .overflowedItem > .toolbarbutton-text {
+  -moz-padding-start: 10px;
+  text-align: start;
+}
+
 #personal-bookmarks {
   min-height: 29px;
 }
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 68a50159d587..2f35e07cbdcf 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -112,6 +112,22 @@ toolbox[tabsontop=true] > toolbar:not(#TabsToolbar):not(#nav-bar):not(:-moz-lwth
   background-color: -moz-mac-chrome-inactive;
 }
 
+#nav-bar-overflow-button {
+  -moz-image-region: rect(-5px, 12px, 11px, -4px);
+}
+
+#widget-overflow-list > .overflowedItem {
+  width: 100%;
+  min-height: 36px;
+  background-repeat: no-repeat;
+  background-position: 0 center;
+}
+
+#widget-overflow-list > .overflowedItem > .toolbarbutton-text {
+  -moz-padding-start: 10px;
+  text-align: start;
+}
+
 /* ----- BOOKMARK TOOLBAR ----- */
 
 #personal-bookmarks {
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index 79a03d7fef94..5de1a165af97 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -175,10 +175,12 @@ panelsubview toolbarbutton > .toolbarbutton-text,
 panelmainview toolbarbutton,
 panelsubview toolbarbutton,
 #customizationui-widget-panel toolbarbutton,
+#widget-overflow-list > toolbarbutton,
 .customizationmode-button {
   -moz-appearance: none;
   padding: 2px 6px;
-  background: hsla(210,32%,93%,0) padding-box;
+  background-color: hsla(210,32%,93%,0);
+  background-clip: padding-box;
   border-radius: 2px;
   border: 1px solid;
   border-color: hsla(210,54%,20%,0) hsla(210,54%,20%,0) hsla(210,54%,20%,0);
@@ -192,6 +194,7 @@ panelsubview toolbarbutton,
 panelmainview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 panelsubview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #customizationui-widget-panel toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
+#widget-overflow-list > toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #PanelUI-mainView .PanelUI-pageControls toolbarbutton,
 .customizationmode-button,
 #PanelUI-mainView #PanelUI-customize-btn {
@@ -205,7 +208,8 @@ panelsubview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:activ
 panelmainview toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
 panelsubview toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
 .customizationmode-button:hover:active,
-#customizationui-widget-panel toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active) {
+#customizationui-widget-panel toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
+#widget-overflow-list > toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active) {
   background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
   background-color: hsla(210,54%,20%,.15);
   border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 6e57626637c3..63179390126f 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -106,6 +106,22 @@
   z-index: 1;
 }
 
+#nav-bar-overflow-button {
+  -moz-image-region: rect(-5px, 12px, 11px, -4px);
+}
+
+#widget-overflow-list > .overflowedItem {
+  width: 100%;
+  min-height: 36px;
+  background-repeat: no-repeat;
+  background-position: 0 center;
+}
+
+#widget-overflow-list > .overflowedItem > .toolbarbutton-text {
+  -moz-padding-start: 10px;
+  text-align: start;
+}
+
 #personal-bookmarks {
   min-height: 24px;
 }

From 5e72b2f4e62f0917f56633222b768d779d25b6ab Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Tue, 21 May 2013 16:18:40 -0400
Subject: [PATCH 129/230] Bug 874491 - (Australis) Linux: The TabsToolbar in
 customization mode should not have a background and the shadow should not
 extend to the tabs box. r=mconley

---
 browser/themes/linux/browser.css | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index e54b34dc2241..b1615a847a60 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -2190,8 +2190,26 @@ chatbox {
   padding: 2em;
 }
 
-#main-window[customizing] #tab-view-deck > #browser-panel {
-  box-shadow: 0 0 3px #333;
+#main-window[customizing] #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar),
+#main-window[customizing] #customization-container {
+  border: 3px solid hsla(0,0%,0%,.1);
+  border-top-width: 0;
+  background-clip: padding-box;
+  background-origin: padding-box;
+  -moz-border-right-colors: hsla(0,0%,0%,.05) hsla(0,0%,0%,.1) hsla(0,0%,0%,.2);
+  -moz-border-bottom-colors: hsla(0,0%,0%,.05) hsla(0,0%,0%,.1) hsla(0,0%,0%,.2);
+  -moz-border-left-colors: hsla(0,0%,0%,.05) hsla(0,0%,0%,.1) hsla(0,0%,0%,.2);
+}
+
+#main-window[customizing] #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar) {
+  border-bottom-width: 0;
+}
+
+#main-window[customizing] #TabsToolbar {
+  -moz-appearance: none;
+  background-clip: padding-box;
+  border-right: 3px solid transparent;
+  border-left: 3px solid transparent;
 }
 
 /* End customization mode */

From f01a5287e6cf3606462aad3fe4253eeb0b2fc6ce Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Tue, 21 May 2013 18:12:35 -0400
Subject: [PATCH 130/230] Backed out changeset e8aa19ecf54d (bug 865926) for
 leaking

---
 browser/base/content/browser.css              |   9 -
 browser/base/content/browser.xul              |  26 +--
 .../customizableui/content/panelUI.inc.xul    |   9 -
 .../customizableui/src/CustomizableUI.jsm     | 188 +-----------------
 .../customizableui/src/CustomizeMode.jsm      |   8 -
 .../locales/en-US/chrome/browser/browser.dtd  |   1 -
 browser/themes/linux/browser.css              |  16 --
 browser/themes/osx/browser.css                |  16 --
 .../customizableui/panelUIOverlay.inc.css     |   8 +-
 browser/themes/windows/browser.css            |  16 --
 10 files changed, 11 insertions(+), 286 deletions(-)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index ba1b78dbee40..b429c6a52ec4 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -108,15 +108,6 @@ toolbar[printpreview="true"] {
   -moz-box-ordinal-group: 50;
 }
 
-toolbar[overflowable] > .customization-target {
-  overflow: hidden;
-}
-
-toolbar[customizing][overflowable] > .overflow-button,
-toolbar[overflowable]:not([overflowing]) > .overflow-button {
-  display: none;
-}
-
 #TabsToolbar {
   -moz-box-ordinal-group: 100;
 }
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index e63badb65dcb..c8f94fd756a4 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -502,17 +502,15 @@
              aria-label="&navbarCmd.label;"
              fullscreentoolbar="true" mode="icons" customizable="true"
              iconsize="large"
-             defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button"
+             defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button,window-controls"
              customizationtarget="nav-bar-customizationtarget"
-             overflowbutton="nav-bar-overflow-button"
              context="toolbar-context-menu">
 
-      <hbox id="nav-bar-customizationtarget" class="customization-target" flex="1">
+      <hbox id="nav-bar-customizationtarget" class="customization-target" flex="0">
         <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
                      context="backForwardMenu" removable="true"
                      forwarddisabled="true"
-                     title="&backForwardItem.title;"
-                     nooverflow="true">
+                     title="&backForwardItem.title;">
           <toolbarbutton id="back-button" class="toolbarbutton-1"
                          label="&backCmd.label;"
                          command="Browser:BackOrBackDuplicate"
@@ -533,7 +531,7 @@
         </toolbaritem>
 
         <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true"
-                     title="&locationItem.title;" class="chromeclass-location" removable="true" nooverflow="true">
+                     title="&locationItem.title;" class="chromeclass-location" removable="true">
           <textbox id="urlbar" flex="1"
                    placeholder="&urlbar.placeholder2;"
                    type="autocomplete"
@@ -625,14 +623,12 @@
                        label="&reloadCmd.label;" removable="true"
                        command="Browser:ReloadOrDuplicate"
                        onclick="checkForMiddleClick(this, event);"
-                       tooltiptext="&reloadButton.tooltip;"
-                       nooverflow="true"/>
+                       tooltiptext="&reloadButton.tooltip;"/>
 
         <toolbarbutton id="stop-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                        label="&stopCmd.label;" removable="true"
                        command="Browser:Stop"
-                       tooltiptext="&stopButton.tooltip;"
-                       nooverflow="true"/>
+                       tooltiptext="&stopButton.tooltip;"/>
 
         <toolbarbutton id="webrtc-status-button"
                        class="toolbarbutton-1 chromeclass-toolbar-additional"
@@ -640,8 +636,7 @@
                        hidden="true"
                        orient="horizontal"
                        label="&webrtcIndicatorButton.label;"
-                       tooltiptext="&webrtcIndicatorButton.tooltip;"
-                       nooverflow="true">
+                       tooltiptext="&webrtcIndicatorButton.tooltip;">
           <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);"
                      onpopuphiding="WebrtcIndicator.clearPopup(this);"
                      oncommand="WebrtcIndicator.menuCommand(event.target);"/>
@@ -708,11 +703,6 @@
         </toolbaritem>
       </hbox>
 
-      <toolbarbutton id="nav-bar-overflow-button"
-                     class="toolbarbutton-1 chromeclass-toolbar-additional chevron overflow-button"
-                     skipintoolbarset="true"
-                     tooltiptext="&navbarOverflow.label;"/>
-
       <toolbaritem id="PanelUI-button"
                    class="chromeclass-toolbar-additional"
                    removable="false"
@@ -869,7 +859,7 @@
 
       <toolbaritem id="search-container" title="&searchItem.title;"
                    align="center" class="chromeclass-toolbar-additional"
-                   flex="100" persist="width" removable="true" noautoclose="true">
+                   flex="100" persist="width" removable="true">
         <searchbar id="searchbar" flex="1"/>
       </toolbaritem>
 
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index c0e695ac96ad..c64b31eb033f 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -75,12 +75,3 @@
     </panelsubview>
   </panelmultiview>
 </panel>
-
-<panel id="widget-overflow"
-       role="group"
-       type="arrow"
-       level="top"
-       consumeoutsideclicks="true">
-  <vbox id="widget-overflow-list">
-  </vbox>
-</panel>
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 8b5710bfc21a..563b9e2244af 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -13,8 +13,6 @@ Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "CustomizableWidgets",
   "resource:///modules/CustomizableWidgets.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "DeferredTask",
-  "resource://gre/modules/DeferredTask.jsm");
 
 const kNSXUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
@@ -152,8 +150,7 @@ let CustomizableUIInternal = {
     });
     this.registerArea(CustomizableUI.AREA_NAVBAR, {
       legacy: true,
-      type: CustomizableUI.TYPE_TOOLBAR,
-      overflowable: true
+      type: CustomizableUI.TYPE_TOOLBAR
     });
     this.registerArea(CustomizableUI.AREA_MENUBAR, {
       legacy: true,
@@ -242,10 +239,6 @@ let CustomizableUIInternal = {
       this.restoreStateForArea(area, legacyState);
     }
 
-    if (areaProperties.has("overflowable")) {
-      aToolbar.overflowable = new OverflowableToolbar(aToolbar);
-    }
-
     this.registerBuildArea(area, aToolbar);
 
     let placements = gPlacements.get(area);
@@ -505,12 +498,6 @@ let CustomizableUIInternal = {
     let document = aWindow.document;
 
     for (let [, area] of gBuildAreas) {
-      let areaProperties = gAreas.get(area);
-      if (areaProperties.has("overflowable")) {
-        let toolbar = document.getElementById(area);
-        toolbar.overflowable.uninit();
-      }
-
       for (let node of area) {
         if (node.ownerDocument == document) {
           area.delete(node);
@@ -1653,179 +1640,6 @@ function XULWidgetSingleWrapper(aWidgetId, aNode) {
   Object.freeze(this);
 }
 
-const LAZY_RESIZE_INTERVAL_MS = 20;
-
-function OverflowableToolbar(aToolbarNode) {
-  this._toolbar = aToolbarNode;
-  this._target = aToolbarNode.customizationTarget;
-  let chevronId = this._toolbar.getAttribute("overflowbutton");
-  let doc = this._toolbar.ownerDocument;
-  this._chevron = doc.getElementById(chevronId);
-  this._panel = doc.getElementById("widget-overflow");
-  this._list = doc.getElementById("widget-overflow-list");
-  this._collapsed = [];
-  this._enabled = true;
-
-  this._toolbar.setAttribute("overflowable", "true");
-  this._toolbar.customizationTarget.addEventListener("overflow", this);
-  let window = doc.defaultView;
-  window.addEventListener("resize", this);
-  window.gNavToolbox.addEventListener("customizationstarting", this);
-  window.gNavToolbox.addEventListener("aftercustomization", this);
-  this._chevron.addEventListener("command", this);
-  this._panel.addEventListener("popuphiding", this);
-
-  // The toolbar could initialize in an overflowed state, in which case
-  // the 'overflow' event may have been fired before the handler was registered.
-  this._onOverflow();
-}
-
-OverflowableToolbar.prototype = {
-
-  uninit: function() {
-    this._disable();
-
-    this._toolbar.removeAttribute("overflowable");
-    this._toolbar.customizationTarget.removeEventListener("overflow", this);
-    let window = this._toolbar.ownerDocument.defaultView;
-    window.removeEventListener("resize", this);
-    window.gNavToolbox.removeEventListener("customizationstarting", this);
-    window.gNavToolbox.removeEventListener("aftercustomization", this);
-    this._chevron.removeEventListener("command", this);
-    this._panel.removeEventListener("popuphiding", this);
-  },
-
-  handleEvent: function(aEvent) {
-    switch(aEvent.type) {
-      case "overflow":
-        this._onOverflow();
-        break;
-      case "resize":
-        this._onResize(aEvent);
-        break;
-      case "command":
-        this._onClickChevron(aEvent);
-        break;
-      case "popuphiding":
-        this._onPanelHiding(aEvent);
-        break;
-      case "mouseup":
-      case "keypress":
-        this._maybeAutoHidePanel(aEvent);
-        break;
-      case "customizationstarting":
-        this._disable();
-        break;
-      case "aftercustomization":
-        this._enable();
-        break;
-    }
-  },
-
-  _onClickChevron: function(aEvent) {
-    if (this._chevron.open)
-      this._panel.hidePopup();
-    else {
-      let doc = aEvent.target.ownerDocument;
-      let anchor = doc.getAnonymousElementByAttribute(this._chevron, "class", "toolbarbutton-icon");
-      this._panel.openPopup(anchor || this._chevron, "bottomcenter topright");
-    }
-    this._chevron.open = !this._chevron.open;
-  },
-
-  _onPanelHiding: function(aEvent) {
-    this._chevron.open = false;
-  },
-
-  _onOverflow: function() {
-    if (!this._enabled)
-      return;
-
-    let child = this._target.lastChild;
-
-    while(child && this._target.clientWidth < this._target.scrollWidth) {
-      let prevChild = child.previousSibling;
-
-      if (!child.hasAttribute("nooverflow")) {
-        this._collapsed.push({child: child, minSize: this._target.clientWidth});
-        child.classList.add("overflowedItem");
-
-        child.addEventListener("mouseup", this);
-        child.addEventListener("keypress", this);
-
-        this._list.insertBefore(child, this._list.firstChild);
-        this._toolbar.setAttribute("overflowing", "true");
-      }
-      child = prevChild;
-    };
-  },
-
-  _maybeAutoHidePanel: function(aEvent) {
-    LOG("_maybeAutoHidePanel: " + aEvent.type);
-
-    if (aEvent.currentTarget.hasAttribute("noautoclose"))
-      return;
-
-    if (aEvent.type == "keypress" &&
-        !(aEvent.keyCode == aEvent.DOM_VK_ENTER ||
-          aEvent.keyCode == aEvent.DOM_VK_RETURN)) {
-      return;
-    }
-
-    if (aEvent.type == "mouseup" && aEvent.button != 0) {
-      return;
-    }
-
-    this._panel.hidePopup();
-  },
-
-  _onResize: function(aEvent) {
-    if (!this._lazyResizeHandler) {
-      this._lazyResizeHandler = new DeferredTask(this._onLazyResize.bind(this),
-                                                 LAZY_RESIZE_INTERVAL_MS);
-    }
-    this._lazyResizeHandler.start();
-  },
-
-  _moveItemsBackToTheirOrigin: function(shouldMoveAllItems) {
-    for (let i = this._collapsed.length - 1; i >= 0; i--) {
-      let {child, minSize} = this._collapsed[i];
-
-      if (!shouldMoveAllItems &&
-          this._target.clientWidth <= minSize) {
-        return;
-      }
-
-      this._collapsed.pop();
-      this._target.appendChild(child);
-      child.classList.remove("overflowedItem");
-      child.removeEventListener("mouseup", this);
-      child.removeEventListener("keypress", this);
-    }
-
-    if (!this._collapsed.length) {
-      this._toolbar.removeAttribute("overflowing");
-    }
-  },
-
-  _onLazyResize: function() {
-    if (!this._enabled)
-      return;
-
-    this._moveItemsBackToTheirOrigin();
-  },
-
-  _disable: function() {
-    this._enabled = false;
-    this._moveItemsBackToTheirOrigin(true);
-  },
-
-  _enable: function() {
-    this._enabled = true;
-    this._onOverflow();
-  }
-};
-
 // When IDs contain special characters, we need to escape them for use with querySelector:
 function idToSelector(aId) {
   return "#" + aId.replace(/[ !"'#$%&\(\)*+\-,.\/:;<=>?@\[\\\]^`{|}~]/g, '\\$&');
diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index 1a88dc15ad58..0eb66d09214d 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -153,10 +153,6 @@ CustomizeMode.prototype = {
 
     this.resetButton.hidden = CustomizableUI.inDefaultState;
 
-    let customizableToolbars = document.querySelectorAll("toolbar[customizable=true]:not([autohide=true])");
-    for (let toolbar of customizableToolbars)
-      toolbar.setAttribute("customizing", true);
-
     document.documentElement.setAttribute("customizing", true);
     this._customizing = true;
   },
@@ -259,10 +255,6 @@ CustomizeMode.prototype = {
     });
     documentElement.removeAttribute("customizing");
 
-    let customizableToolbars = document.querySelectorAll("toolbar[customizable=true]:not([autohide=true])");
-    for (let toolbar of customizableToolbars)
-      toolbar.removeAttribute("customizing");
-
     let customizer = document.getElementById("customization-container");
     customizer.hidden = true;
 
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index f1570d4ca661..4a12c8971012 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -16,7 +16,6 @@
 <!ENTITY mainWindow.titlePrivateBrowsingSuffix "(Private Browsing)">
 
 <!ENTITY appmenu.title                       "Customize and Control &brandFullName;">
-<!ENTITY navbarOverflow.label                "More tools…">
 
 <!-- Tab context menu -->
 <!ENTITY  reloadTab.label                    "Reload Tab">
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index b1615a847a60..bdbc7917a42b 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -68,22 +68,6 @@
   z-index: 1;
 }
 
-#nav-bar-overflow-button {
-  -moz-image-region: rect(-5px, 12px, 11px, -4px);
-}
-
-#widget-overflow-list > .overflowedItem {
-  width: 100%;
-  min-height: 36px;
-  background-repeat: no-repeat;
-  background-position: 0 center;
-}
-
-#widget-overflow-list > .overflowedItem > .toolbarbutton-text {
-  -moz-padding-start: 10px;
-  text-align: start;
-}
-
 #personal-bookmarks {
   min-height: 29px;
 }
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 2f35e07cbdcf..68a50159d587 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -112,22 +112,6 @@ toolbox[tabsontop=true] > toolbar:not(#TabsToolbar):not(#nav-bar):not(:-moz-lwth
   background-color: -moz-mac-chrome-inactive;
 }
 
-#nav-bar-overflow-button {
-  -moz-image-region: rect(-5px, 12px, 11px, -4px);
-}
-
-#widget-overflow-list > .overflowedItem {
-  width: 100%;
-  min-height: 36px;
-  background-repeat: no-repeat;
-  background-position: 0 center;
-}
-
-#widget-overflow-list > .overflowedItem > .toolbarbutton-text {
-  -moz-padding-start: 10px;
-  text-align: start;
-}
-
 /* ----- BOOKMARK TOOLBAR ----- */
 
 #personal-bookmarks {
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index 5de1a165af97..79a03d7fef94 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -175,12 +175,10 @@ panelsubview toolbarbutton > .toolbarbutton-text,
 panelmainview toolbarbutton,
 panelsubview toolbarbutton,
 #customizationui-widget-panel toolbarbutton,
-#widget-overflow-list > toolbarbutton,
 .customizationmode-button {
   -moz-appearance: none;
   padding: 2px 6px;
-  background-color: hsla(210,32%,93%,0);
-  background-clip: padding-box;
+  background: hsla(210,32%,93%,0) padding-box;
   border-radius: 2px;
   border: 1px solid;
   border-color: hsla(210,54%,20%,0) hsla(210,54%,20%,0) hsla(210,54%,20%,0);
@@ -194,7 +192,6 @@ panelsubview toolbarbutton,
 panelmainview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 panelsubview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #customizationui-widget-panel toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
-#widget-overflow-list > toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #PanelUI-mainView .PanelUI-pageControls toolbarbutton,
 .customizationmode-button,
 #PanelUI-mainView #PanelUI-customize-btn {
@@ -208,8 +205,7 @@ panelsubview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:activ
 panelmainview toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
 panelsubview toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
 .customizationmode-button:hover:active,
-#customizationui-widget-panel toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
-#widget-overflow-list > toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active) {
+#customizationui-widget-panel toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active) {
   background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
   background-color: hsla(210,54%,20%,.15);
   border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 63179390126f..6e57626637c3 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -106,22 +106,6 @@
   z-index: 1;
 }
 
-#nav-bar-overflow-button {
-  -moz-image-region: rect(-5px, 12px, 11px, -4px);
-}
-
-#widget-overflow-list > .overflowedItem {
-  width: 100%;
-  min-height: 36px;
-  background-repeat: no-repeat;
-  background-position: 0 center;
-}
-
-#widget-overflow-list > .overflowedItem > .toolbarbutton-text {
-  -moz-padding-start: 10px;
-  text-align: start;
-}
-
 #personal-bookmarks {
   min-height: 24px;
 }

From 84772808bec11423491e08c39819d34ee4ddcda6 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Tue, 21 May 2013 18:12:41 -0400
Subject: [PATCH 131/230] Bug 870577 - (Australis) The toolbar items in the
 palette are overflowing their container and cutting off the label. r=mconley

---
 browser/themes/shared/customizableui/panelUIOverlay.inc.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index 79a03d7fef94..3b02d4ecdb3e 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -124,7 +124,7 @@ panelsubview toolbarbutton > .toolbarbutton-text,
   -moz-box-orient: vertical;
   min-width: 7em;
   max-width: 7em;
-  min-height: 6em;
+  height: 6em;
   max-height: 6em;
 }
 

From a5520dcb76db56e6847a950272fbde673c145e2f Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Tue, 21 May 2013 18:54:39 -0400
Subject: [PATCH 132/230] Bug 866863 - Land new pretty icons for the panel
 menu. r=jaws.

---
 .../customizableui/content/panelUI.inc.xul    |   6 +
 .../customizableui/src/CustomizableUI.jsm     |  12 +-
 browser/themes/linux/browser.css              |  46 +++--
 browser/themes/linux/jar.mn                   |   2 +
 browser/themes/osx/browser.css                |   4 +-
 .../osx/customizableui/menuPanel-icons.png    | Bin 0 -> 18635 bytes
 .../osx/customizableui/menuPanel-icons@2x.png | Bin 0 -> 26942 bytes
 .../customizableui/menuPanel-small-icons.png  | Bin 0 -> 1586 bytes
 .../menuPanel-small-icons@2x.png              | Bin 0 -> 2315 bytes
 .../osx/customizableui/panelUIOverlay.css     | 145 ++++++++++++--
 browser/themes/osx/jar.mn                     |   4 +
 .../customizableui/panelUIOverlay.inc.css     | 189 +++++++++++++++++-
 browser/themes/windows/browser.css            |   4 +-
 .../customizableui/menuPanel-icons.png        | Bin 0 -> 18769 bytes
 .../customizableui/menuPanel-small-icons.png  | Bin 0 -> 1624 bytes
 browser/themes/windows/jar.mn                 |   4 +
 16 files changed, 369 insertions(+), 47 deletions(-)
 create mode 100644 browser/themes/osx/customizableui/menuPanel-icons.png
 create mode 100644 browser/themes/osx/customizableui/menuPanel-icons@2x.png
 create mode 100644 browser/themes/osx/customizableui/menuPanel-small-icons.png
 create mode 100644 browser/themes/osx/customizableui/menuPanel-small-icons@2x.png
 create mode 100644 browser/themes/windows/customizableui/menuPanel-icons.png
 create mode 100644 browser/themes/windows/customizableui/menuPanel-small-icons.png

diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index c64b31eb033f..dd4724ae38f5 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -14,27 +14,33 @@
           <toolbarbutton id="PanelUI-cut-btn" flex="1"
                          label="&cutCmd.label;"
                          tooltiptext="&cutButton.tooltip;"
+                         class="panel-combined-button"
                          command="cmd_cut"/>
           <toolbarbutton id="PanelUI-copy-btn" flex="1"
                          label="&copyCmd.label;"
                          tooltiptext="&copyButton.tooltip;"
+                         class="panel-combined-button"
                          command="cmd_copy"/>
           <toolbarbutton id="PanelUI-paste-btn" flex="1"
                          label="&pasteCmd.label;"
                          tooltiptext="&pasteButton.tooltip;"
+                         class="panel-combined-button"
                          command="cmd_paste"/>
         </hbox>
         <hbox class="PanelUI-zoomControls">
           <toolbarbutton id="PanelUI-zoomOut-btn" flex="1"
                          noautoclose="true" label="&fullZoomReduceCmd.label;"
                          command="cmd_fullZoomReduce"
+                         class="panel-combined-button"
                          tooltiptext="&zoomOutButton.tooltip;"/>
           <toolbarbutton id="PanelUI-zoomReset-btn" flex="1"
                          noautoclose="true" command="cmd_fullZoomReset"
+                         class="panel-combined-button"
                          tooltiptext="&zoomReset.tooltip;"/>
           <toolbarbutton id="PanelUI-zoomIn-btn" flex="1"
                          noautoclose="true" label="&fullZoomEnlargeCmd.label;"
                          command="cmd_fullZoomEnlarge"
+                         class="panel-combined-button"
                          tooltiptext="&zoomInButton.tooltip;"/>
         </hbox>
       </vbox>
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 563b9e2244af..30f38b9bfe5e 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -351,7 +351,7 @@ let CustomizableUIInternal = {
       }
 
       return [ CustomizableUI.PROVIDER_API,
-               this.buildWidget(aDocument, null, widget) ];
+               this.buildWidget(aDocument, widget) ];
     }
 
     LOG("Searching for " + aWidgetId + " in toolbox.");
@@ -589,8 +589,7 @@ let CustomizableUIInternal = {
     return null;
   },
 
-  // Depending on aMenu here is a hack that should be fixed.
-  buildWidget: function(aDocument, aMenu, aWidget) {
+  buildWidget: function(aDocument, aWidget) {
     if (typeof aWidget == "string") {
       aWidget = gPalette.get(aWidget);
     }
@@ -616,12 +615,6 @@ let CustomizableUIInternal = {
     }
     node.setAttribute("class", "toolbarbutton-1 chromeclass-toolbar-additional");
 
-    if (aMenu) {
-      node.setAttribute("image", aWidget.icons["32"]);
-    } else {
-      node.setAttribute("image", aWidget.icons["16"]);
-    }
-
     let handler = this.handleWidgetClick.bind(this, aWidget, node);
     node.addEventListener("command", handler, false);
 
@@ -1513,7 +1506,6 @@ function WidgetGroupWrapper(aWidget) {
     let instance = aWidget.instances.get(aWindow.document);
     if (!instance) {
       instance = CustomizableUIInternal.buildWidget(aWindow.document,
-                                                    null,
                                                     aWidget);
     }
 
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index bdbc7917a42b..ea214dc0d023 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -635,7 +635,9 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   -moz-image-region: rect(0px 24px 24px 0px);
 }
 
-#history-button {
+#history-button,
+toolbar > .customization-target > #history-panelmenu,
+toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   -moz-image-region: rect(0px 48px 24px 24px);
 }
 
@@ -667,39 +669,53 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   -moz-image-region: rect(0px 120px 24px 96px);
 }
 
+/* A lot of these buttons are going to be removed in later bugs, but until then
+ * we're overriding the menuPanel-icons sprites with these ones with
+ * !important.
+ *
+ * Here are the relevant removal bugs:
+ * #bookmarks-button - Bug 867368
+ * #cut-button, #copy-button, #paste-button - Bug 870901
+ * #zoom-out-button, #zoom-in-button - Bug 870897
+ */
+
+#bookmarks-button {
+  list-style-image: url("chrome://browser/skin/Toolbar.png") !important;
+}
+
 #cut-button {
-  list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar");
+  list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar") !important;
 }
 #cut-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar&state=disabled");
+  list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar&state=disabled") !important;
 }
 
 #copy-button {
-  list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar");
+  list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar") !important;
 }
 #copy-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar&state=disabled");
+  list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar&state=disabled") !important;
 }
 
 #paste-button {
-  list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar");
+  list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar") !important;
 }
 #paste-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar&state=disabled");
+  list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar&state=disabled") !important;
+}
+
+#zoom-out-button {
+  list-style-image: url("moz-icon://stock/gtk-zoom-out?size=toolbar") !important;
+}
+
+#zoom-in-button {
+  list-style-image: url("moz-icon://stock/gtk-zoom-in?size=toolbar") !important;
 }
 
 #fullscreen-button {
   list-style-image: url("moz-icon://stock/gtk-fullscreen?size=toolbar");
 }
 
-#zoom-out-button {
-  list-style-image: url("moz-icon://stock/gtk-zoom-out?size=toolbar");
-}
-
-#zoom-in-button {
-  list-style-image: url("moz-icon://stock/gtk-zoom-in?size=toolbar");
-}
-
 #sync-button {
   -moz-image-region: rect(0px 144px 24px 120px);
 }
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index 73fc3b875739..2f51b7b1bd41 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -26,6 +26,8 @@ browser.jar:
   skin/classic/browser/customizableui/customizeMode-gridTexture.png  (customizableui/customizeMode-gridTexture.png)
   skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png  (customizableui/customizeMode-separatorHorizontal.png)
   skin/classic/browser/customizableui/customizeMode-separatorVertical.png  (customizableui/customizeMode-separatorVertical.png)
+  skin/classic/browser/customizableui/menuPanel-icons.png (customizableui/menuPanel-icons.png)
+  skin/classic/browser/customizableui/menuPanel-small-icons.png (customizableui/menuPanel-small-icons.png)
 * skin/classic/browser/engineManager.css
   skin/classic/browser/Geolocation-16.png
   skin/classic/browser/Geolocation-64.png
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 68a50159d587..528538fb32cc 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -860,7 +860,9 @@ toolbarbutton.bookmark-item > menupopup {
 
 /* history sidebar button */
 
-#history-button {
+#history-button,
+toolbar > .customization-target > #history-panelmenu,
+toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   -moz-image-region: rect(0, 160px, 20px, 140px);
 }
 
diff --git a/browser/themes/osx/customizableui/menuPanel-icons.png b/browser/themes/osx/customizableui/menuPanel-icons.png
new file mode 100644
index 0000000000000000000000000000000000000000..01a251f2676fb00c60b26242b23ee8f078dd82ce
GIT binary patch
literal 18635
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
Z{uikSEPwIn7`Xrd002ovPDHLkV1jrpBgOy#

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/customizableui/menuPanel-icons@2x.png b/browser/themes/osx/customizableui/menuPanel-icons@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..87681fc92b1a54292c42f0f661090e1e0116dadd
GIT binary patch
literal 26942
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
M07*qoM6N<$f?6%-X8-^I

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/customizableui/menuPanel-small-icons.png b/browser/themes/osx/customizableui/menuPanel-small-icons.png
new file mode 100644
index 0000000000000000000000000000000000000000..2498e993baf8117fe6788cb98e4be8d039c47bdd
GIT binary patch
literal 1586
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

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/customizableui/menuPanel-small-icons@2x.png b/browser/themes/osx/customizableui/menuPanel-small-icons@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..102bc89641b8e5e6aa48463a3b389073e40c1a60
GIT binary patch
literal 2315
zcmV+m3H0`fP)<h;3K|Lk000e1NJLTq005u>001Be1ONa4KX$u*000QmNkl<ZcwX(;
zdvH|s`N#41x$Qky5^^DvU<3(hL)5k?6BTbLD9sf}B($|yQLMB$KmEz2kXU083Z->a
zyi^5S5h{de3<MBRkV{325-~=(Z5kk80_H+4yXSm6b}|Zkc4s$aCKIQ9?O&VCvwwW%
zdA{H0tW-entm40$Ot1WpiZ2^WcmRJSp61thFe%(YCjJz!D&e9Pj;4gsz%CZ7+C@L5
z3g46-kY^b0iZz%>zmV@Y_KW8+Q8N?q)c_^l;zBMq!om!Bn_`gx;}-q;!cnXCe=kN@
z!g^l}+A=8uA5yIL<UlO<Ntn5aCGLXPKq7gC5i7Lf!UbFurP$Ru{@Ep^OG?K->*`dB
zzb9v)GSE6C5nF=tdweKM?E~VlW+)C!tT=J_yfoN8=V;nRM`*k8wr$ysPT>^Ujbpdl
zZu*{_fwI>k>{2S9PuEw9J$y^LS(}oI6|3klFhiK$dtp1w8S})7nqo=_Nr8pM6cG&?
zPOkj4rgGC^7@K;Px_QD>;Q=_qt33RA7k#4pY~Q)+x{w20*}1s(<gj=mWbbpHtMLK=
zHg$QlWT&3g1GDr3d<g`;41O+j>}XgCm9$8i8H>g#)Gc?`fAMbVF%)?F*xc<C63P;l
zTL<EaIz3Zw=TZ7X_t}0tvnQ8`k-y>jRF9TKOS<<VV-Wx-bH5qvc9f2SO$b47ZftGm
zYCzx&iwYw|+SFuRG?I2`>}T-1x;6&@JX`nM<{8bKQX4Og!^yE<_Emr`Vt{6P5MWXJ
zU-$mtiv71Fk;IV&oomEVkcO*|B%{&5HSZ+sp5hfDbfCek<q56ykS#hAD^27zxi0q{
zU-m1$C535;c}*`|>O`d>nm%H|30Qh^26|y*{$*c|Y>W-Z?$Dp{jz?0Tb6H%RBC<aF
zeKzX^KLZ5@2@QNb_u;ccz(d;t4;Lt2Q-T>5EJ!H)@kecRVITki2^kAcB9O3PrSFKI
zULpo}oqcWVZG+d|9nB@wjPp*Cs;rksBGF|`s*pDqwi=ij7)X3a&;`qBsedjJFbL<n
zs?&%Py?7G-B9s7u1p~ILulu&Ob6Cei0+8q{0s)AgEz(}tJu3Z!jH6d362pmQjuE%M
zzI#SJ!}g}{<3k+*K}T4iLkp-lk$pbt;29oUQBypTzndZybkczJY;M)q8WQl;vgnKY
zp$Q23iooc3fP%^T>WYGtKMZSg#L|@DeR9&Fx`Rzg1zV|@EDZb;e&1PeAo+Zv!S?xM
z{6{D_-IcL3celgKQL0Tzh5sbx#Y+uY^sf%Y#Guf<YS%Txc4Q4=Fo*B?OHol}O?=pn
z!jlF-NF6AG?1$e(_?c-xOsOuaN^IpUReXjSX^BIxuDvG6-WF8gy)OTPdK(el0Tzjl
z3+msvE^r3|0uOA?N~_K|nKA&U{O+Sg3vY;Ln+E|s>Ok=K?Nfw-&F_8~bvm($o$SVg
ze^nDlEKC;;0+2Hk2<}8?;Jq&niEdblL;y*+=%gEhhD@IkHWN%bw`Nmr@{9KgIf2&n
z=_6lxVPcm7p?6@w1$z)Ky0GA&9$&jgx86VNa{~J+`n?~gZ@H5IEQBEi9m_@nu@ik>
zy^MkZD1_lWufEwl!e%-}150a%@A@=TVGu|EZ{il?5CI9(EiBA`@1_urj)a1YFOPNa
ze5Mc>PgHBMf<WTjr;-UOu8sf(xzG62CjrNO|En&90L9SG)sMaR^wuvAymM`BMugJ%
znz)L8^}Yi^#u9MDQW1rDPp#d9U%3_@ROh)OWdd3FGQIM+PyNgVI$-eUk|4LRNrbY_
z645c?Z+oVly1e}H@cL9+?78*&4Yc8xFhykwFr?>a6`SOFDrZ!gfl1Eo(h_Av3{f-?
zkeg(JbB9{5BLLl8A2>i<Xv8beTds(vy`_339_iYjg)hC|VLN$sM}=`OU(scbG1gt5
z+|x~7U?veq%MbObtl$FK!=z>M?P0`X$AUyaFVPF;dhY@Q@IrBDYfK(<r3@q)8-qDR
z&W1Z2d9`cHlf!P@P?a;7V`DmM4KTz$N~q*KrRLGOs1B6Sh~ebIoONX_bjyyE=E)CQ
zED1QUq9P&D2TUCpEI^s3<QYn<x>}B4TnbGL*?-4}95=`jW#w6k2h-fclW_~)GP=Cu
z^a^7Uvk|7&?`41jnP?j0y>plikS%kMRI0?p<HU}N0*L<kBqA+VXM`P?{n}+#q?y-s
zxEx<k+ek%js{!OTuiG$fz`|sYGrn=jKM~a*E&gfS|9iW{d{gW9IzYjHZv9!=FRnk7
zHAY%0Ul~m#b}Yz92vc1@c@~yNtFxlqi{6fsscv<3IdmqLNAAr#*xkb9fAYq@TPxn0
zEIW)ES-)cFqBmzpHqY_ADfVH~n=?=#kg#L3dY;Z|k@KD1r=E%g2<VRif`mH9Cgtyp
zI?U?)W^KGf9`TPc``Mr)zI*(t7?)g~Rx|Rhdhd=mqT(h`cz<o4c*HwNVA6{Y1OX@{
zapJa424KgEifnqe=_@hr<H-<H7c@Z27>$$~Ud`?>9P&bE<K0^*&+atnhC$A`vWjUj
z^HQ3h?7AuY%=(onDH{4{on8ePFjS2=3^X*K@cOy~7r#tUszAbK$oy&OiC8^NDOH9S
ztO(ngdsyduI=MCL_T(kLFh$y;&&xiNn5JTPbRY;u5IU{hYgYjoD<C16tMQ_>(?_~5
zM|Y48lu0?_PCql1sS28Y)9TS5^N!cwuP7UDzT{Kuj)|Uaa26YbYrhU<1OhUT#$}&;
zF=`+RAO#3t=M*D8qOZIZQU?mAuU~FElFB*T!Gia0Z)JT}mw_)qR!4dH%<z<@>#pw{
zuG$9I&UouyL@!3b?149z^W{j7jexX{w2!A((vPTMkZ_<x000J+*>wi~7~~u-+mtmn
ztCC6ps*R9FAoNEn+eg2#u#sRs=yw59iN+8-oM2nFJJ8i2@RGB;tbrSdN2P`;qjw`<
lwi$_Z>;%@%Cv2r3`8P);n@UG}<EsDw002ovPDHLkV1mnCQ4RnA

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/customizableui/panelUIOverlay.css b/browser/themes/osx/customizableui/panelUIOverlay.css
index c15671de2433..d4ed3e23ba5e 100644
--- a/browser/themes/osx/customizableui/panelUIOverlay.css
+++ b/browser/themes/osx/customizableui/panelUIOverlay.css
@@ -7,8 +7,132 @@
 
 %include ../../shared/customizableui/panelUIOverlay.inc.css
 
-.PanelUI-pageControls toolbarbutton {
-  list-style-image: url("chrome://browser/skin/Toolbar.png");
+@media (min-resolution: 2dppx) {
+  #PanelUI-contents[type="grid"] toolbarbutton,
+  #customization-palette toolbarbutton {
+    list-style-image: url(chrome://browser/skin/customizableui/menuPanel-icons@2x.png);
+  }
+
+  #PanelUI-popup .panel-combined-button {
+    list-style-image: url(chrome://browser/skin/customizableui/menuPanel-small-icons@2x.png);
+  }
+
+  #PanelUI-contents[type="grid"] #new-window-button,
+  #customization-palette #new-window-button {
+    -moz-image-region: rect(0 128px 64px 64px);
+  }
+
+  #PanelUI-contents[type="grid"] #privatebrowsing-button,
+  #customization-palette #privatebrowsing-button {
+    -moz-image-region: rect(0 192px 64px 128px);
+  }
+
+  #PanelUI-contents[type="grid"] #open-file-button,
+  #customization-palette #open-file-button {
+    -moz-image-region: rect(64px 64px 128px 0);
+  }
+
+  #PanelUI-contents[type="grid"] #save-page-button,
+  #customization-palette #save-page-button {
+    -moz-image-region: rect(64px 128px 128px 64px);
+  }
+
+  #PanelUI-contents[type="grid"] #bookmarks-menu-button,
+  #customization-palette #bookmarks-menu-button {
+    -moz-image-region: rect(64px 192px 128px 128px);
+  }
+
+  #PanelUI-contents[type="grid"] #history-button,
+  #customization-palette #history-button,
+  #PanelUI-contents[type="grid"] #history-panelmenu,
+  #customization-palette #history-panelmenu {
+    -moz-image-region: rect(128px 64px 192px 0);
+  }
+
+  #PanelUI-contents[type="grid"] #add-ons-button,
+  #customization-palette #add-ons-button {
+    -moz-image-region: rect(128px 128px 192px 64px);
+  }
+
+  #PanelUI-contents[type="grid"] #downloads-button,
+  #customization-palette #downloads-button {
+    -moz-image-region: rect(128px 192px 192px 128px);
+  }
+
+  #PanelUI-contents[type="grid"] #sync-button,
+  #customization-palette #sync-button {
+    -moz-image-region: rect(192px 64px 256px 0);
+  }
+
+  #PanelUI-contents[type="grid"] #print-button,
+  #customization-palette #print-button {
+    -moz-image-region: rect(192px 128px 256px 64px);
+  }
+
+  #PanelUI-contents[type="grid"] #fullscreen-button,
+  #customization-palette #fullscreen-button {
+    -moz-image-region: rect(192px 192px 256px 128px);
+  }
+
+  #PanelUI-contents[type="grid"] #feed-button,
+  #customization-palette #feed-button {
+    -moz-image-region: rect(256px 64px 320px 0);
+  }
+
+  #PanelUI-contents[type="grid"] #find-button,
+  #customization-palette #find-button {
+    -moz-image-region: rect(256px 128px 320px 64px);
+  }
+
+  #PanelUI-contents[type="grid"] #developer-button,
+  #customization-palette #developer-button {
+    -moz-image-region: rect(256px 192px 320px 128px);
+  }
+
+  #PanelUI-contents[type="grid"] #tabview-button,
+  #customization-palette #tabview-button {
+    -moz-image-region: rect(320px 64px 384px 0);
+  }
+
+  #PanelUI-contents[type="grid"] #preferences-button,
+  #customization-palette #preferences-button {
+    -moz-image-region: rect(320px 128px 384px 64px);
+  }
+
+  #PanelUI-contents[type="grid"] #home-button,
+  #customization-palette #home-button {
+    -moz-image-region: rect(320px 192px 384px 128px);
+  }
+
+  #PanelUI-contents[type="grid"] #reload-button,
+  #customization-palette #reload-button {
+    -moz-image-region: rect(384px 64px 448px 0);
+  }
+
+  #PanelUI-contents[type="grid"] #stop-button,
+  #customization-palette #stop-button {
+    -moz-image-region: rect(384px 128px 448px 64px);
+  }
+
+  #PanelUI-popup #PanelUI-cut-btn {
+    -moz-image-region: rect(0 32px 32px 0);
+  }
+
+  #PanelUI-popup #PanelUI-copy-btn {
+    -moz-image-region: rect(0 64px 32px 32px);
+  }
+
+  #PanelUI-popup #PanelUI-paste-btn {
+    -moz-image-region: rect(0 96px 32px 64px);
+  }
+
+  #PanelUI-popup #PanelUI-zoomOut-btn {
+    -moz-image-region: rect(0 128px 32px 96px);
+  }
+
+  #PanelUI-popup #PanelUI-zoomIn-btn {
+    -moz-image-region: rect(0 160px 32px 128px);
+  }
 }
 
 .PanelUI-pageControls toolbarbutton:not(:first-child) {
@@ -22,23 +146,8 @@
   margin-right: 0;
 }
 
-#PanelUI-cut-btn {
-  -moz-image-region: rect(0, 260px, 20px, 240px);
-}
-#PanelUI-copy-btn {
-  -moz-image-region: rect(0, 280px, 20px, 260px);
-}
-#PanelUI-paste-btn {
-  -moz-image-region: rect(0, 300px, 20px, 280px);
-}
-
+#PanelUI-zoomIn-btn,
 #PanelUI-zoomOut-btn {
-  -moz-image-region: rect(0, 400px, 20px, 380px);
-  padding-left: 12px;
-  padding-right: 12px;
-}
-#PanelUI-zoomIn-btn {
-  -moz-image-region: rect(0, 420px, 20px, 400px);
   padding-left: 12px;
   padding-right: 12px;
 }
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index 9d52e5dee1db..b3ddedcd6db7 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -26,6 +26,10 @@ browser.jar:
   skin/classic/browser/customizableui/customizeMode-gridTexture.png  (customizableui/customizeMode-gridTexture.png)
   skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png  (customizableui/customizeMode-separatorHorizontal.png)
   skin/classic/browser/customizableui/customizeMode-separatorVertical.png  (customizableui/customizeMode-separatorVertical.png)
+  skin/classic/browser/customizableui/menuPanel-icons.png           (customizableui/menuPanel-icons.png)
+  skin/classic/browser/customizableui/menuPanel-icons@2x.png        (customizableui/menuPanel-icons@2x.png)
+  skin/classic/browser/customizableui/menuPanel-small-icons.png     (customizableui/menuPanel-small-icons.png)
+  skin/classic/browser/customizableui/menuPanel-small-icons@2x.png  (customizableui/menuPanel-small-icons@2x.png)
 * skin/classic/browser/engineManager.css                    (engineManager.css)
   skin/classic/browser/Geolocation-16.png
   skin/classic/browser/Geolocation-16@2x.png
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index 3b02d4ecdb3e..45ce95031ee2 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -126,14 +126,19 @@ panelsubview toolbarbutton > .toolbarbutton-text,
   max-width: 7em;
   height: 6em;
   max-height: 6em;
+  list-style-image: url(chrome://browser/skin/customizableui/menuPanel-icons.png);
+}
+
+/* These smaller icons have different styling between the panel and the toolbar,
+   hence not referencing toolbar.png for these icons. */
+.panel-combined-button {
+  list-style-image: url(chrome://browser/skin/customizableui/menuPanel-small-icons.png);
 }
 
 #PanelUI-contents[type="grid"] toolbarbutton > .toolbarbutton-icon,
 #customization-palette toolbarbutton > .toolbarbutton-icon {
   min-width: calc(8em / 3);
-  max-width: calc(8em / 3);
   min-height: calc(8em / 3);
-  max-height: calc(8em / 3);
   margin: calc(5em / 12);
 }
 
@@ -229,3 +234,183 @@ toolbarbutton.panel-multiview-anchor {
   background-repeat: repeat-x;
   color: HighlightText;
 }
+
+#PanelUI-contents[type="grid"] #new-window-button,
+#customization-palette #new-window-button {
+  -moz-image-region: rect(0 64px 32px 32px);
+}
+
+#PanelUI-contents[type="grid"] #privatebrowsing-button,
+#customization-palette #privatebrowsing-button {
+  -moz-image-region: rect(0 96px 32px 64px);
+}
+
+#PanelUI-contents[type="grid"] #open-file-button,
+#customization-palette #open-file-button {
+  -moz-image-region: rect(32px 32px 64px 0);
+}
+
+#PanelUI-contents[type="grid"] #save-page-button,
+#customization-palette #save-page-button {
+  -moz-image-region: rect(32px 64px 64px 32px);
+}
+
+#PanelUI-contents[type="grid"] #bookmarks-menu-button,
+#customization-palette #bookmarks-menu-button {
+  -moz-image-region: rect(32px 96px 64px 64px);
+}
+
+#PanelUI-contents[type="grid"] #bookmarks-menu-button > .toolbarbutton-menu-dropmarker,
+#customization-palette #bookmarks-menu-button > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
+#PanelUI-contents[type="grid"] #history-button,
+#customization-palette #history-button,
+#PanelUI-contents[type="grid"] #history-panelmenu,
+#customization-palette #history-panelmenu {
+  -moz-image-region: rect(64px 32px 96px 0);
+}
+
+#PanelUI-contents[type="grid"] #add-ons-button,
+#customization-palette #add-ons-button {
+  -moz-image-region: rect(64px 64px 96px 32px);
+}
+
+#PanelUI-contents[type="grid"] #downloads-button,
+#customization-palette #downloads-button {
+  -moz-image-region: rect(64px 96px 96px 64px);
+}
+
+#PanelUI-contents[type="grid"] #sync-button,
+#customization-palette #sync-button {
+  -moz-image-region: rect(96px 32px 128px 0);
+}
+
+#PanelUI-contents[type="grid"] #print-button,
+#customization-palette #print-button {
+  -moz-image-region: rect(96px 64px 128px 32px);
+}
+
+#PanelUI-contents[type="grid"] #fullscreen-button,
+#customization-palette #fullscreen-button {
+  -moz-image-region: rect(96px 96px 128px 64px);
+}
+
+#PanelUI-contents[type="grid"] #feed-button,
+#customization-palette #feed-button {
+  -moz-image-region: rect(128px 32px 160px 0);
+}
+
+#PanelUI-contents[type="grid"] #find-button,
+#customization-palette #find-button {
+  -moz-image-region: rect(128px 64px 160px 32px);
+}
+
+#PanelUI-contents[type="grid"] #developer-button,
+#customization-palette #developer-button {
+  -moz-image-region: rect(128px 96px 160px 64px);
+}
+
+#PanelUI-contents[type="grid"] #tabview-button,
+#customization-palette #tabview-button {
+  -moz-image-region: rect(160px 32px 192px 0);
+}
+
+#PanelUI-contents[type="grid"] #preferences-button,
+#customization-palette #preferences-button {
+  -moz-image-region: rect(160px 64px 192px 32px);
+}
+
+#PanelUI-contents[type="grid"] #home-button,
+#customization-palette #home-button {
+  -moz-image-region: rect(160px 96px 192px 64px);
+}
+
+#PanelUI-contents[type="grid"] #reload-button,
+#customization-palette #reload-button {
+  -moz-image-region: rect(192px 32px 224px 0);
+}
+
+#PanelUI-contents[type="grid"] #stop-button,
+#customization-palette #stop-button {
+  -moz-image-region: rect(192px 64px 224px 32px);
+}
+
+#PanelUI-cut-btn {
+  -moz-image-region: rect(0 16px 16px 0);
+}
+
+#PanelUI-copy-btn {
+  -moz-image-region: rect(0 32px 16px 16px);
+}
+
+#PanelUI-paste-btn {
+  -moz-image-region: rect(0 48px 16px 32px);
+}
+
+#PanelUI-zoomOut-btn {
+  -moz-image-region: rect(0 64px 16px 48px);
+}
+
+#PanelUI-zoomReset-btn {
+  list-style-image: none;
+}
+
+#PanelUI-zoomIn-btn {
+  -moz-image-region: rect(0 80px 16px 64px);
+}
+
+/* These icons are missing from Toolbar.png, so this is a temporary
+   hack until they are added. */
+toolbar > .customization-target > #find-button,
+toolbar > .customization-target > #open-file-button,
+toolbar > .customization-target > #developer-button,
+toolbar > .customization-target > #privatebrowsing-button,
+toolbar > .customization-target > #save-page-button,
+toolbar > .customization-target > #add-ons-button,
+toolbar > .customization-target > #preferences-button,
+toolbar > .customization-target > toolbarpaletteitem > #find-button,
+toolbar > .customization-target > toolbarpaletteitem > #open-file-button,
+toolbar > .customization-target > toolbarpaletteitem > #developer-button,
+toolbar > .customization-target > toolbarpaletteitem > #privatebrowsing-button,
+toolbar > .customization-target > toolbarpaletteitem > #save-page-button,
+toolbar > .customization-target > toolbarpaletteitem > #add-ons-button,
+toolbar > .customization-target > toolbarpaletteitem > #preferences-button {
+  list-style-image: url(chrome://browser/skin/customizableui/menuPanel-icons.png);
+}
+
+toolbar > .customization-target > #find-button,
+toolbar > .customization-target > toolbarpaletteitem > #find-button {
+  -moz-image-region: rect(128px 64px 160px 32px);
+}
+
+toolbar > .customization-target > #open-file-button,
+toolbar > .customization-target > toolbarpaletteitem > #open-file-button {
+  -moz-image-region: rect(32px 32px 64px 0);
+}
+
+toolbar > .customization-target > #developer-button,
+toolbar > .customization-target > toolbarpaletteitem > #developer-button {
+  -moz-image-region: rect(128px 96px 160px 64px);
+}
+
+toolbar > .customization-target > #privatebrowsing-button,
+toolbar > .customization-target > toolbarpaletteitem > #privatebrowsing-button {
+  -moz-image-region: rect(0 96px 32px 64px);
+}
+
+toolbar > .customization-target > #save-page-button,
+toolbar > .customization-target > toolbarpaletteitem > #save-page-button {
+  -moz-image-region: rect(32px 64px 64px 32px);
+}
+
+toolbar > .customization-target > #add-ons-button,
+toolbar > .customization-target > toolbarpaletteitem > #add-ons-button {
+  -moz-image-region: rect(64px 64px 96px 32px);
+}
+
+toolbar > .customization-target > #preferences-button,
+toolbar > .customization-target > toolbarpaletteitem > #preferences-button {
+  -moz-image-region: rect(160px 64px 192px 32px);
+}
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 6e57626637c3..4f255c6a5269 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -672,7 +672,9 @@ menuitem.bookmark-item {
   -moz-image-region: rect(0, 108px, 18px, 90px);
 }
 
-#history-button {
+#history-button,
+toolbar > .customization-target > #history-panelmenu,
+toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   -moz-image-region: rect(0, 126px, 18px, 108px);
 }
 
diff --git a/browser/themes/windows/customizableui/menuPanel-icons.png b/browser/themes/windows/customizableui/menuPanel-icons.png
new file mode 100644
index 0000000000000000000000000000000000000000..30ec391309780ab8b730d8d63b37c22faa2b3175
GIT binary patch
literal 18769
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

literal 0
HcmV?d00001

diff --git a/browser/themes/windows/customizableui/menuPanel-small-icons.png b/browser/themes/windows/customizableui/menuPanel-small-icons.png
new file mode 100644
index 0000000000000000000000000000000000000000..758a27b8afd3e49d07bbdd6c3614240c05cf9e89
GIT binary patch
literal 1624
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
W%O(jjwcVWn0000<MNUMnLSTY|RTVb?

literal 0
HcmV?d00001

diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index cf449c091c0c..7d30a6a00172 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -28,6 +28,8 @@ browser.jar:
         skin/classic/browser/customizableui/customizeMode-gridTexture.png  (customizableui/customizeMode-gridTexture.png)
         skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png  (customizableui/customizeMode-separatorHorizontal.png)
         skin/classic/browser/customizableui/customizeMode-separatorVertical.png  (customizableui/customizeMode-separatorVertical.png)
+        skin/classic/browser/customizableui/menuPanel-icons.png        (customizableui/menuPanel-icons.png)
+        skin/classic/browser/customizableui/menuPanel-small-icons.png  (customizableui/menuPanel-small-icons.png)
 *       skin/classic/browser/engineManager.css
         skin/classic/browser/Geolocation-16.png
         skin/classic/browser/Geolocation-64.png
@@ -295,6 +297,8 @@ browser.jar:
         skin/classic/aero/browser/customizableui/customizeMode-gridTexture.png  (customizableui/customizeMode-gridTexture.png)
         skin/classic/aero/browser/customizableui/customizeMode-separatorHorizontal.png  (customizableui/customizeMode-separatorHorizontal.png)
         skin/classic/aero/browser/customizableui/customizeMode-separatorVertical.png  (customizableui/customizeMode-separatorVertical.png)
+        skin/classic/aero/browser/customizableui/menuPanel-icons.png        (customizableui/menuPanel-icons.png)
+        skin/classic/aero/browser/customizableui/menuPanel-small-icons.png  (customizableui/menuPanel-small-icons.png)
 *       skin/classic/aero/browser/engineManager.css
         skin/classic/aero/browser/Geolocation-16.png
         skin/classic/aero/browser/Geolocation-64.png

From f7abd2306967cb88cc2f7c745f1c87bd847af76b Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Tue, 21 May 2013 20:06:28 -0400
Subject: [PATCH 133/230] Bug 866863 - Follow-up to actually include the
 menuPanel icons for Linux. r=trivial.

---
 .../linux/customizableui/menuPanel-icons.png    | Bin 0 -> 18635 bytes
 .../customizableui/menuPanel-small-icons.png    | Bin 0 -> 1586 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 browser/themes/linux/customizableui/menuPanel-icons.png
 create mode 100644 browser/themes/linux/customizableui/menuPanel-small-icons.png

diff --git a/browser/themes/linux/customizableui/menuPanel-icons.png b/browser/themes/linux/customizableui/menuPanel-icons.png
new file mode 100644
index 0000000000000000000000000000000000000000..01a251f2676fb00c60b26242b23ee8f078dd82ce
GIT binary patch
literal 18635
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
Z{uikSEPwIn7`Xrd002ovPDHLkV1jrpBgOy#

literal 0
HcmV?d00001

diff --git a/browser/themes/linux/customizableui/menuPanel-small-icons.png b/browser/themes/linux/customizableui/menuPanel-small-icons.png
new file mode 100644
index 0000000000000000000000000000000000000000..2498e993baf8117fe6788cb98e4be8d039c47bdd
GIT binary patch
literal 1586
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

literal 0
HcmV?d00001


From ed0372d0d28764535fab493f07e7e43ce1891e87 Mon Sep 17 00:00:00 2001
From: Blair McBride <bmcbride@mozilla.com>
Date: Wed, 22 May 2013 16:49:37 +1200
Subject: [PATCH 134/230] Bug 866978 - Enforce absence of removable="true"
 attribute. r=jaws

---
 browser/base/content/browser.xul              |   4 +-
 .../customizableui/src/CustomizableUI.jsm     | 186 ++++++++++++++----
 .../customizableui/src/CustomizeMode.jsm      |  21 +-
 3 files changed, 172 insertions(+), 39 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index c8f94fd756a4..44b710dd350d 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -508,7 +508,7 @@
 
       <hbox id="nav-bar-customizationtarget" class="customization-target" flex="0">
         <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
-                     context="backForwardMenu" removable="true"
+                     context="backForwardMenu" removable="false"
                      forwarddisabled="true"
                      title="&backForwardItem.title;">
           <toolbarbutton id="back-button" class="toolbarbutton-1"
@@ -531,7 +531,7 @@
         </toolbaritem>
 
         <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true"
-                     title="&locationItem.title;" class="chromeclass-location" removable="true">
+                     title="&locationItem.title;" class="chromeclass-location" removable="false">
           <textbox id="urlbar" flex="1"
                    placeholder="&urlbar.placeholder2;"
                    type="autocomplete"
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 30f38b9bfe5e..30833ee293cc 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -119,6 +119,13 @@ let gInBatch = false;
  * gBuildAreas maps area IDs to actual area nodes within browser windows.
  */
 let gBuildAreas = new Map();
+
+/**
+ * gBuildWindows is a map of windows that have registered build areas, mapped
+ * to a Set of known toolboxes in that window.
+ */
+let gBuildWindows = new Map();
+
 let gNewElementCount = 0;
 let gWrapperCache = new WeakMap();
 let gListeners = new Set();
@@ -244,14 +251,11 @@ let CustomizableUIInternal = {
     let placements = gPlacements.get(area);
     this.buildArea(area, placements, aToolbar);
     aToolbar.setAttribute("currentset", placements.join(","));
-
-    // We ensure that the window is registered to have its customization data
-    // cleaned up when unloading.
-    this.registerBuildWindow(document.defaultView);
   },
 
   buildArea: function(aArea, aPlacements, aAreaNode) {
     let document = aAreaNode.ownerDocument;
+    let window = document.defaultView;
     let container = aAreaNode.customizationTarget;
 
     if (!container) {
@@ -259,16 +263,25 @@ let CustomizableUIInternal = {
                       + " to have a customizationTarget attribute.");
     }
 
+    this.beginBatchUpdate();
+
     let currentNode = container.firstChild;
     for (let id of aPlacements) {
       if (currentNode && currentNode.id == id) {
         this._addParentFlex(currentNode);
         this.setLocationAttributes(currentNode, container, aArea);
+
+        // Normalize removable attribute. It defaults to false if the widget is
+        // originally defined as a child of a build area.
+        if (!currentNode.hasAttribute("removable")) {
+          currentNode.setAttribute("removable", false);
+        }
+
         currentNode = currentNode.nextSibling;
         continue;
       }
 
-      let [provider, node] = this.getWidgetNode(id, document, aAreaNode.toolbox);
+      let [provider, node] = this.getWidgetNode(id, window);
       if (!node) {
         LOG("Unknown widget: " + id);
         continue;
@@ -291,19 +304,31 @@ let CustomizableUIInternal = {
         // Nodes opt-in to removability. If they're removable, and we haven't
         // seen them in the placements array, then we toss them into the palette
         // if one exists. If no palette exists, we just remove the node. If the
-        // node is not removable, we leave it where it is.
-        if (node.getAttribute("removable") == "true") {
-          if (palette) {
-            palette.appendChild(node);
+        // node is not removable, we leave it where it is. However, we can only
+        // safely touch elements that have an ID - both because we depend on
+        // IDs, and because such elements are not intended to be widgets
+        // (eg, titlebar-placeholder elements).
+        if (node.id) {
+          if (node.getAttribute("removable") == "true") {
+            if (palette) {
+              palette.appendChild(node);
+            } else {
+              container.removeChild(node);
+            }
           } else {
-            container.removeChild(node);
+            this.setLocationAttributes(currentNode, container, aArea);
+            node.setAttribute("removable", false);
+            LOG("Adding non-removable widget to placements of " + aArea + ": " +
+                node.id);
+            gPlacements.get(aArea).push(node.id);
+            gDirty = true;
           }
-        } else {
-          this.setLocationAttributes(currentNode, container, aArea);
         }
         node = previousSibling;
       }
     }
+
+    this.endBatchUpdate();
   },
 
   ensureButtonClosesPanel: function(aNode) {
@@ -334,32 +359,35 @@ let CustomizableUIInternal = {
     return CustomizableUI.PROVIDER_XUL;
   },
 
-  getWidgetNode: function(aWidgetId, aDocument, aToolbox) {
+  getWidgetNode: function(aWidgetId, aWindow) {
+    let document = aWindow.document;
+
     if (this.isSpecialWidget(aWidgetId)) {
       return [ CustomizableUI.PROVIDER_SPECIAL,
-               this.createSpecialWidget(aWidgetId, aDocument) ];
+               this.createSpecialWidget(aWidgetId, document) ];
     }
 
     let widget = gPalette.get(aWidgetId);
     if (widget) {
       // If we have an instance of this widget already, just use that.
-      if (widget.instances.has(aDocument)) {
+      if (widget.instances.has(document)) {
         LOG("An instance of widget " + aWidgetId + " already exists in this "
             + "document. Reusing.");
         return [ CustomizableUI.PROVIDER_API,
-                 widget.instances.get(aDocument) ];
+                 widget.instances.get(document) ];
       }
 
       return [ CustomizableUI.PROVIDER_API,
-               this.buildWidget(aDocument, widget) ];
+               this.buildWidget(document, widget) ];
     }
 
     LOG("Searching for " + aWidgetId + " in toolbox.");
-    let node = this.findWidgetInToolbox(aWidgetId, aToolbox, aDocument);
+    let node = this.findWidgetInWindow(aWidgetId, aWindow);
     if (node) {
       return [ CustomizableUI.PROVIDER_XUL, node ];
     }
 
+    LOG("No node for " + aWidgetId + " found.");
     return [];
   },
 
@@ -402,10 +430,9 @@ let CustomizableUIInternal = {
     // Go through each of the nodes associated with this area and move the
     // widget to the requested location.
     for (let areaNode of areaNodes) {
+      let window = areaNode.ownerDocument.defaultView;
       let container = areaNode.customizationTarget;
-      let [provider, widgetNode] = this.getWidgetNode(aWidgetId,
-                                                      container.ownerDocument,
-                                                      areaNode.toolbox);
+      let [provider, widgetNode] = this.getWidgetNode(aWidgetId, window);
 
       if (provider == CustomizableUI.PROVIDER_XUL &&
           aArea == CustomizableUI.AREA_PANEL) {
@@ -460,10 +487,9 @@ let CustomizableUIInternal = {
     let nextNodeId = placements[aNewPosition + 1];
 
     for (let areaNode of areaNodes) {
+      let window = areaNode.ownerDocument.defaultView;
       let container = areaNode.customizationTarget;
-      let [provider, widgetNode] = this.getWidgetNode(aWidgetId,
-                                                      container.ownerDocument,
-                                                      areaNode.toolbox);
+      let [provider, widgetNode] = this.getWidgetNode(aWidgetId, window);
       if (!widgetNode) {
         ERROR("Widget not found, unable to move");
         continue;
@@ -483,6 +509,16 @@ let CustomizableUIInternal = {
   },
 
   registerBuildArea: function(aArea, aNode) {
+    // We ensure that the window is registered to have its customization data
+    // cleaned up when unloading.
+    let window = aNode.ownerDocument.defaultView;
+    this.registerBuildWindow(window);
+
+    // Also register this build area's toolbox.
+    if (aNode.toolbox) {
+      gBuildWindows.get(window).add(aNode.toolbox);
+    }
+
     if (!gBuildAreas.has(aArea)) {
       gBuildAreas.set(aArea, new Set());
     }
@@ -491,10 +527,15 @@ let CustomizableUIInternal = {
   },
 
   registerBuildWindow: function(aWindow) {
+    if (!gBuildWindows.has(aWindow)) {
+      gBuildWindows.set(aWindow, new Set());
+    }
+
     aWindow.addEventListener("unload", this, false);
   },
 
   unregisterBuildWindow: function(aWindow) {
+    gBuildWindows.delete(aWindow);
     let document = aWindow.document;
 
     for (let [, area] of gBuildAreas) {
@@ -561,30 +602,55 @@ let CustomizableUIInternal = {
     return node;
   },
 
-  findWidgetInToolbox: function(aId, aToolbox, aDocument) {
-    if (!aToolbox) {
-      return null;
+  findWidgetInWindow: function(aId, aWindow) {
+    if (!gBuildWindows.has(aWindow)) {
+      throw new Error("Build window not registered");
     }
 
+    let document = aWindow.document;
+
     // look for a node with the same id, as the node may be
     // in a different toolbar.
-    let node = aDocument.getElementById(aId);
+    let node = document.getElementById(aId);
     if (node) {
       let parent = node.parentNode;
-      while (parent && parent.localName != "toolbar")
+      while (parent && !(parent.customizationTarget ||
+                         parent.localName == "toolbarpaletteitem")) {
         parent = parent.parentNode;
+      }
+
+      if ((parent && parent.customizationTarget == node.parentNode &&
+           gBuildWindows.get(aWindow).has(parent.toolbox)) ||
+          (parent && parent.localName == "toolbarpaletteitem")) {
+        // Normalize the removable attribute. For backwards compat, if
+        // the widget is not defined in a toolbox palette then absence
+        // of the "removable" attribute means it is not removable.
+        if (!node.hasAttribute("removable")) {
+          // If we first see this in customization mode, it may be in the
+          // customization palette instead of the toolbox palette.
+          node.setAttribute("removable", !parent.customizationTarget);
+        }
 
-      if (parent &&
-          parent.toolbox == aToolbox &&
-          parent.customizationTarget == node.parentNode) {
         return node;
       }
     }
 
-    if (aToolbox.palette) {
-      // Attempt to locate a node with a matching ID within
-      // the palette.
-      return aToolbox.palette.querySelector(idToSelector(aId));
+   let toolboxes = gBuildWindows.get(aWindow);
+    for (let toolbox of toolboxes) {
+      if (toolbox.palette) {
+        // Attempt to locate a node with a matching ID within
+        // the palette.
+        let node = toolbox.palette.querySelector(idToSelector(aId));
+        if (node) {
+          // Normalize the removable attribute. For backwards compat, this
+          // is optional if the widget is defined in the toolbox palette,
+          // and defaults to *true*, unlike if it was defined elsewhere.
+          if (!node.hasAttribute("removable")) {
+            node.setAttribute("removable", true);
+          }
+          return node;
+        }
+      }
     }
     return null;
   },
@@ -750,6 +816,11 @@ let CustomizableUIInternal = {
       return;
     }
 
+    // Do nothing if the widget is not allowed to move to the target area.
+    if (!this.canWidgetMoveToArea(aWidgetId, aArea)) {
+      return;
+    }
+
     if (oldPlacement) {
       this.removeWidgetFromArea(aWidgetId);
     }
@@ -786,6 +857,10 @@ let CustomizableUIInternal = {
       return;
     }
 
+    if (!this.isWidgetRemovable(aWidgetId)) {
+      return;
+    }
+
     let placements = gPlacements.get(oldPlacement.area);
     let position = placements.indexOf(aWidgetId);
     if (position != -1) {
@@ -1354,6 +1429,39 @@ let CustomizableUIInternal = {
     }
   },
 
+  isWidgetRemovable: function(aWidgetId) {
+    let provider = this.getWidgetProvider(aWidgetId);
+    if (provider == CustomizableUI.PROVIDER_API) {
+      //XXXunf Not suppported yet.
+      return true;
+    }
+
+    if (provider == CustomizableUI.PROVIDER_XUL) {
+      if (gBuildWindows.size == 0) {
+        // We don't have any build windows to look at, so just assume for now
+        // that its removable.
+        return true;
+      }
+
+      // Pick any of the build windows to look at.
+      let [window,] = [...gBuildWindows][0];
+      let [, node] = this.getWidgetNode(aWidgetId, window);
+      return node.getAttribute("removable") == "true";
+    }
+
+    // Otherwise this is a special widget, which are always removable.
+    return true;
+  },
+
+  canWidgetMoveToArea: function(aWidgetId, aArea) {
+    let placement = this.getPlacementOfWidget(aWidgetId);
+    if (placement && placement.area != aArea &&
+        !this.isWidgetRemovable(aWidgetId)) {
+      return false;
+    }
+    return true;
+  },
+
   get inDefaultState() {
     for (let [areaId, defaultPlacements] of gDefaultPlacements) {
       let currentPlacements = gPlacements.get(areaId);
@@ -1465,6 +1573,12 @@ this.CustomizableUI = {
   getPlacementOfWidget: function(aWidgetId) {
     return CustomizableUIInternal.getPlacementOfWidget(aWidgetId);
   },
+  isWidgetRemovable: function(aWidgetId) {
+    return CustomizableUIInternal.isWidgetRemovable(aWidgetId);
+  },
+  canWidgetMoveToArea: function(aWidgetId, aArea) {
+    return CustomizableUIInternal.canWidgetMoveToArea(aWidgetId, aArea);
+  },
   get inDefaultState() {
     return CustomizableUIInternal.inDefaultState;
   }
diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index 0eb66d09214d..d0597476bef3 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -555,7 +555,18 @@ CustomizeMode.prototype = {
 
     // Do nothing if the target or origin are not customizable.
     if (!targetArea || !originArea) {
-      gCurrentDragOverItem = null;
+      return;
+    }
+
+    // Do nothing if thw widget is not allowed to be removed.
+    if (targetArea.id == kPaletteId &&
+       !CustomizableUI.isWidgetRemovable(draggedItemId)) {
+      return;
+    }
+
+    // Do nothing if the widget is not allowed to move to the target area.
+    if (targetArea.id != kPaletteId &&
+        !CustomizableUI.canWidgetMoveToArea(draggedItemId, targetArea.id)) {
       return;
     }
 
@@ -610,6 +621,10 @@ CustomizeMode.prototype = {
     // either the originArea was the palette, or a customizable area.
     if (targetArea.id == kPaletteId) {
       if (originArea.id !== kPaletteId) {
+        if (!CustomizableUI.isWidgetRemovable(draggedItemId)) {
+          return;
+        }
+
         let widget = this.unwrapToolbarItem(draggedWrapper);
         CustomizableUI.removeWidgetFromArea(draggedItemId);
         draggedWrapper = this.wrapToolbarItem(widget, "palette");
@@ -624,6 +639,10 @@ CustomizeMode.prototype = {
       return;
     }
 
+    if (!CustomizableUI.canWidgetMoveToArea(draggedItemId, targetArea.id)) {
+      return;
+    }
+
     // Is the target the customization area itself? If so, we just add the
     // widget to the end of the area.
     if (targetNode == targetArea.customizationTarget) {

From 1d70eca3042cd7aa738db92125d472c7b6632b30 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Wed, 22 May 2013 11:37:06 +0200
Subject: [PATCH 135/230] Bug 874448 - OS X customization mode doesn't have
 dragover border indicators on toolbarpaletteitems, r=dao

---
 toolkit/themes/linux/global/toolbar.css   | 14 +++++++-------
 toolkit/themes/osx/global/toolbar.css     |  7 +++++++
 toolkit/themes/windows/global/toolbar.css | 14 +++++++-------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/toolkit/themes/linux/global/toolbar.css b/toolkit/themes/linux/global/toolbar.css
index c7574b78e889..036558959175 100644
--- a/toolkit/themes/linux/global/toolbar.css
+++ b/toolkit/themes/linux/global/toolbar.css
@@ -65,13 +65,6 @@ toolbarpaletteitem {
   background-color: #FFF !important;
 }
 
-toolbarpaletteitem[place="toolbar"] {
-  margin-left: -2px;
-  margin-right: -2px;
-  border-left: 2px solid transparent;
-  border-right: 2px solid transparent;
-}
-
 toolbarpaletteitem[place="toolbar"] > toolbarspacer {
   width: 11px;
 }
@@ -102,6 +95,13 @@ toolbarpaletteitem[place="toolbar"] > toolbarspacer {
 
 /* ..... drag and drop feedback ..... */
 
+toolbarpaletteitem[place="toolbar"] {
+  margin-left: -2px;
+  margin-right: -2px;
+  border-left: 2px solid transparent;
+  border-right: 2px solid transparent;
+}
+
 toolbarpaletteitem[dragover="left"] {
   border-left-color: #000000;
 }
diff --git a/toolkit/themes/osx/global/toolbar.css b/toolkit/themes/osx/global/toolbar.css
index 02470e9aaeb8..6298dbd0ee6f 100644
--- a/toolkit/themes/osx/global/toolbar.css
+++ b/toolkit/themes/osx/global/toolbar.css
@@ -95,6 +95,13 @@ toolbarpaletteitem[type="spacer"] {
 
 /* ..... drag and drop feedback ..... */
 
+toolbarpaletteitem[place="toolbar"] {
+  margin-left: -2px;
+  margin-right: -2px;
+  border-left: 2px solid transparent;
+  border-right: 2px solid transparent;
+}
+
 toolbarpaletteitem[dragover="left"] {
   border-left-color: #000000;
 }
diff --git a/toolkit/themes/windows/global/toolbar.css b/toolkit/themes/windows/global/toolbar.css
index 32bc14d32627..40f6aedd6065 100644
--- a/toolkit/themes/windows/global/toolbar.css
+++ b/toolkit/themes/windows/global/toolbar.css
@@ -74,13 +74,6 @@ toolbarpaletteitem {
   background-color: #FFF !important;
 }
 
-toolbarpaletteitem[place="toolbar"] {
-  margin-left: -2px;
-  margin-right: -2px;
-  border-left: 2px solid transparent;
-  border-right: 2px solid transparent;
-}
-
 toolbarpaletteitem[place="toolbar"] > toolbarspacer {
   width: 11px;
 }
@@ -111,6 +104,13 @@ toolbarpaletteitem[place="toolbar"] > toolbarspacer {
 
 /* ..... drag and drop feedback ..... */
 
+toolbarpaletteitem[place="toolbar"] {
+  margin-left: -2px;
+  margin-right: -2px;
+  border-left: 2px solid transparent;
+  border-right: 2px solid transparent;
+}
+
 toolbarpaletteitem[dragover="left"] {
   border-left-color: #000000;
 }

From da83bcf4cfedb0431607f4b76b0ba5e90e4b68b2 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Wed, 22 May 2013 11:42:39 +0200
Subject: [PATCH 136/230] Bug 874584 - Fix JS errors in mochitest-bc on Windows
 XP, r=gijs

---
 browser/themes/windows/browser-aero.css | 2 +-
 browser/themes/windows/browser.css      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/themes/windows/browser-aero.css b/browser/themes/windows/browser-aero.css
index f71474a73866..5c7f8b453610 100644
--- a/browser/themes/windows/browser-aero.css
+++ b/browser/themes/windows/browser-aero.css
@@ -322,7 +322,7 @@
     #toolbar-menubar:not([autohide=true]):not(:-moz-lwtheme),
     #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme),
     #navigator-toolbox[tabsontop=false] > toolbar:not(#toolbar-menubar):not(:-moz-lwtheme) {
-      -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-drag");
+      -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-drag");
       background-color: transparent;
     }
     #toolbar-menubar[autohide=true] {
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 4f255c6a5269..d81660c09877 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -38,7 +38,7 @@
 }
 
 #toolbar-menubar:not([autohide="true"]) {
-  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-drag");
+  -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-drag");
 }
 
 #navigator-toolbox {

From fd9a6f3b578fa753db21cff04e2bf16aeb4488c8 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Wed, 22 May 2013 09:50:26 +0200
Subject: [PATCH 137/230] Bug 874051 - Fix failing a11y tree tests, r=surkov

---
 .../tests/mochitest/tree/test_tabbrowser.xul      | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/accessible/tests/mochitest/tree/test_tabbrowser.xul b/accessible/tests/mochitest/tree/test_tabbrowser.xul
index d4755c120fc5..cb2c3a343a3c 100644
--- a/accessible/tests/mochitest/tree/test_tabbrowser.xul
+++ b/accessible/tests/mochitest/tree/test_tabbrowser.xul
@@ -98,6 +98,16 @@
               // xul:tab ("about:")
               role: ROLE_PAGETAB,
               children: [
+                {
+                  // :before and :after image
+                  // (selected tab border on left/right)
+                  role: ROLE_GRAPHIC,
+                  children: []
+                },
+                {
+                  role: ROLE_GRAPHIC,
+                  children: []
+                },
                 {
                   // xul:toolbarbutton ("Close Tab")
                   role: ROLE_PUSHBUTTON,
@@ -113,6 +123,11 @@
                   // xul:toolbarbutton ("Close Tab")
                   role: ROLE_PUSHBUTTON,
                   children: []
+                },
+                {
+                  // :after image (separator)
+                  role: ROLE_GRAPHIC,
+                  children: []
                 }
               ]
             },

From ee1c3f7dae015140ae126c80245a4795ab806457 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Wed, 22 May 2013 12:07:54 +0200
Subject: [PATCH 138/230] Bug 870461 - Improve l10n identifiers for new history
 subview buttons, r=dao

---
 browser/components/customizableui/content/panelUI.inc.xul | 6 +++---
 browser/locales/en-US/chrome/browser/browser.dtd          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index dd4724ae38f5..cb3c992c9750 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -63,13 +63,13 @@
     <panelsubview id="PanelUI-history" flex="1">
       <label value="&appMenuHistory.label;"/>
       <toolbarbutton id="appMenuClearRecentHistory"
-                     label="&appMenuHistory.clearRecentLabel;"
+                     label="&appMenuHistory.clearRecent.label;"
                      command="Tools:Sanitize"/>
       <toolbarbutton id="appMenuRestoreLastSession"
-                     label="&appMenuHistory.restoreSession;"
+                     label="&appMenuHistory.restoreSession.label;"
                      command="Browser:RestoreLastSession"/>
       <vbox id="PanelUI-historyItems"/>
-      <label value="&appMenuHistory.moreLabel;"
+      <label value="&appMenuHistory.showAll.label;"
              id="PanelUI-historyMore"
              class="text-link"
              onclick="PlacesCommandHook.showPlacesOrganizer('History'); PanelUI.hide();"/>
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 4a12c8971012..9e5bca9123ef 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -322,9 +322,9 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY appMenuCustomize.label "Customize">
 <!ENTITY appMenuBookmarks.label "Bookmarks">
 <!ENTITY appMenuHistory.label "History">
-<!ENTITY appMenuHistory.moreLabel "Show All History">
-<!ENTITY appMenuHistory.clearRecentLabel "Clear Recent History…">
-<!ENTITY appMenuHistory.restoreSession "Restore Previous Session">
+<!ENTITY appMenuHistory.showAll.label "Show All History">
+<!ENTITY appMenuHistory.clearRecent.label "Clear Recent History…">
+<!ENTITY appMenuHistory.restoreSession.label "Restore Previous Session">
 
 <!ENTITY openCmd.commandkey           "l">
 <!ENTITY urlbar.placeholder2          "Search or enter address">

From 7f2fcce6344502ffbe3d7b5439dfaca12e480439 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Thu, 16 May 2013 15:59:01 -0400
Subject: [PATCH 139/230] Bug 857886 - Use HiDPI images for Australis
 background tabs on OS X. r=fryn

---
 browser/themes/osx/browser.css                   |  15 +++++++++++++++
 browser/themes/osx/jar.mn                        |   3 +++
 .../osx/tabbrowser/tab-background-end@2x.png     | Bin 0 -> 2819 bytes
 .../osx/tabbrowser/tab-background-middle@2x.png  | Bin 0 -> 727 bytes
 .../osx/tabbrowser/tab-background-start@2x.png   | Bin 0 -> 2820 bytes
 5 files changed, 18 insertions(+)
 create mode 100644 browser/themes/osx/tabbrowser/tab-background-end@2x.png
 create mode 100644 browser/themes/osx/tabbrowser/tab-background-middle@2x.png
 create mode 100644 browser/themes/osx/tabbrowser/tab-background-start@2x.png

diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 528538fb32cc..e5dd603db2d8 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -2175,6 +2175,21 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 }
 
 @media (min-resolution: 2dppx) {
+  /* image preloading hack from shared/tabs.inc.css */
+  #TabsToolbar::before {
+    background-image:
+      url(chrome://browser/skin/tabbrowser/tab-background-end@2x.png),
+      url(chrome://browser/skin/tabbrowser/tab-background-middle@2x.png),
+      url(chrome://browser/skin/tabbrowser/tab-background-start@2x.png);
+  }
+
+  .tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected=true]),
+  .tabs-newtab-button:hover {
+    background-image: url(chrome://browser/skin/tabbrowser/tab-background-start@2x.png),
+                      url(chrome://browser/skin/tabbrowser/tab-background-middle@2x.png),
+                      url(chrome://browser/skin/tabbrowser/tab-background-end@2x.png);
+  }
+
   .tab-icon-image {
     list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
     image-rendering: -moz-crisp-edges;
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index b3ddedcd6db7..3064f20f3fd4 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -200,8 +200,11 @@ browser.jar:
   skin/classic/browser/tabbrowser/tab-arrow-right.png                    (tabbrowser/tab-arrow-right.png)
   skin/classic/browser/tabbrowser/tab-arrow-right@2x.png                 (tabbrowser/tab-arrow-right@2x.png)
   skin/classic/browser/tabbrowser/tab-background-end.png                 (tabbrowser/tab-background-end.png)
+  skin/classic/browser/tabbrowser/tab-background-end@2x.png              (tabbrowser/tab-background-end@2x.png)
   skin/classic/browser/tabbrowser/tab-background-middle.png              (tabbrowser/tab-background-middle.png)
+  skin/classic/browser/tabbrowser/tab-background-middle@2x.png           (tabbrowser/tab-background-middle@2x.png)
   skin/classic/browser/tabbrowser/tab-background-start.png               (tabbrowser/tab-background-start.png)
+  skin/classic/browser/tabbrowser/tab-background-start@2x.png            (tabbrowser/tab-background-start@2x.png)
   skin/classic/browser/tabbrowser/tab-stroke-end.png                     (tabbrowser/tab-stroke-end.png)
   skin/classic/browser/tabbrowser/tab-stroke-start.png                   (tabbrowser/tab-stroke-start.png)
   skin/classic/browser/tabbrowser/tabbar-bottom-bg-active.png            (tabbrowser/tabbar-bottom-bg-active.png)
diff --git a/browser/themes/osx/tabbrowser/tab-background-end@2x.png b/browser/themes/osx/tabbrowser/tab-background-end@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..18dba96930805a30ca1af7dd5a30dea29b9e1063
GIT binary patch
literal 2819
zcmV+e3;gtnP)<h;3K|Lk000e1NJLTq002Ay002G+1^@s6cQkl;0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU+rAb6VRA}DSTT5@2#}zigt&>7Ya1<aF
zNfpV2(2IZ)48%5I@CDoWh7CAr2!`Tj!2%%`ERonC76?ITyCEBbSioOk$4x?_QiQ|`
z2`aIm!5}C!5_ry;J~MM>-gz(IXM^}YTuYDU%$YN1p6ATG?{|A$Q&Us()=OYU3H)FE
z%>-&E!ORF#EyA=d#0tT3U>Wd7U<uFwd<=X5%mM0vUkZL9hznAx2-8;ZWLOF;0zL$0
zXT%o?pPsu-MBg&gxBvb5=RJ=fKOVb(|NgGqw{P#bdiCnag$ox34jnqw(bCe=R8WA=
zM0{OF_{=iGr-5Lmoy@$Gm`7oc!Zz4Nnszhs9u#DZi2wTN(W5=ru3h``@ZrOo=FgwM
z3R6E9{2utIV8^GYXhqbk6hISwq^M6RHGp;yLWf~*L;Dr51ENQP-8c<n&!0aZyL9Q&
z$jJ7Q^^tIM-On$x+tWidDYY4bHY)>T1Ey6Ze&xo9lqtv-_(quM8*>6sfU%o5Z+_j=
z-O~~Y{}h-tZADu#R-h9{%8HZLK}~qu7sQ+hH3Z++*zw&jUQCQ#ym)cz!i5X{QU3$*
zZiyrQW<^^eik%=4PJXwEQo?;-`4izz!Jre)e|h-u;qG0dqZ^QRr3kN|cA_D&2O@eD
zqb0O}@j;A*9Va(tTI_bPLu-9%2%^84n3&je;>3v_5xp`JUFt?w^&NJ^V__-{r6}?H
zLd3;Ev6L+m_1c>pZfs}Ip6!oBzc+0}tFTjvC?mv+RJK16{G`&cu22&1V$3n$ZbY9t
zb*dLjG|HQn*=3G)RRwp0V7F@%8^o>ceJNW}<U_p5`jqi)otStrws-H|b`iZ~lIyu@
zN7{;0u^5#WW(E0Tcwbxu6&EOl?a!V)+uhjM*dn4E3XXPlZ(tDB1;Sk**JW&FT2|Kf
zKHGX5u}XZV#r5mvkjtScig)<x)~#EA7Qv13LFCQtaw13t5iwy^*s4?^l+5+xDip{1
z%r(CA=+UFyBKWiDXlHL=RTQjpJCp2ILS71@a<NGq7wz=GlP6Dh&zm=I4VE--PTqfG
zy9_d$KyDLxC~vF8M+H7b1><G$<(V^Q21M|Zf?ckbVD+-Z%L`VffQ31`pFVv$8tw9X
zZ)BH2q!S+kI$c|Ya${w{s>r|n`0?YLvFz$e?%0(T%tDCE2~a$FA-JfYitD~}=gtlh
zyi~qC@Vi`{n-@rRfQSWCVq1hUPW5wfC4C&(x<d*&(%ai>K47egK0jA)m(wI2L3{|v
z3E>ij;Z$L=;9TJl-*^7}`7I)Nan)~LAkq#J?UX^GPv?F3YAA{2%$PQLbT(h-y?gh}
z8<8*MBV_hiS6VPfBthN?;8-|2e;~~wjN6mBoG%hPu#e$TNVD79nwpwgMfBVf$GT!W
z+{OmXZN>(92Tjrk!dUD}Y%>={O7d`=&*fx+^m~sTJJu_LKd$O^?1|&(Igyqyrv(v5
zHl>85V`LtSNGU>`&lQ3@uUxsZRRsSoI@XmJ45AxB#DRGuNTOBf!}k6d?11Yzv~e7V
z7*6Lf@xBl74<3wf!}3k?{<?ZEPYGF1#))Q%gqQ*tpY?OFgLqDIkQ9*F=i-gNs3E5<
z25nifVnwTno>R5!7=$($fcOTGu^`)rpU{%Cu|qb-!OdZrL(v=)@8*%4OKuKxE~e+e
zfdgHj&<y;hYS*z5!k$PVBP1yi&XLg2>R1R#9BdU8Fcik;BA>J4+_`guB6v~NUXMYj
z)qreEtq>gg)+Xl%QP<ira`7bdbnJJw&xIXsMFAvF3T@Y~UmpU6mJ)9>E40Hzt%+!|
z1X+kCLZfk3S>jTx0#PLSQa+i3(=k5&zzbfT5nQ?J7-ZLjz<S?Wo5%u!!<ZXKpL`5E
zo6MNRl8d)(82A2YuH=QUZ}H;A=6&^A;MY~TabeMQSUd&F^m8C`2z@_Bxw%A13~_AR
z*iL+_*)4)UtjcvvL?y&hp@5=-P{|@uVJxnB-)}p8`t+a(Zm7x|5G=YDB-U~cl<H?=
zuyg5nDjl26mH4O?KfG@d!Aq-h9S1U{1W-BBB2aOOvHTpIsJI~Oo;-OxSX*1WPDH;`
z@#`3iw!B_Yx=)kN>27at?*Nr`@&HX`uj4EMU51=~?ZvU!c=F`Q0TH~Y;;+Y8u$fsm
z+g5XPai5F(aqN`+xjbuc+_+(0kJrn?GIbR_)@D(y6LPwUxK0G<(C5q?Jr!{_R;T+d
z_)WPV56Wy1(Q_;Mz8V6Wv}OP;a}#HwO{=Y~bAHbGb!ah%beQX)^YdK4<KV%A<_m$=
z%*#`41q3@HTBpV66j33lQzT0kM3c4!WUUjSvFJ=rbGN>H`SP#`E_bYFypALNg#iS*
zmRt)VXf^z9oc*}Kj%$u$)3Eu%c#_kv<6~TY-DHmSC!c&`eoHn-dqKtS*6D>KK~WnB
zXGCZn7bGf-j*4eQ#&Ke6?em75?cbgHZcqd-tJp4M@ikb~0>sd=18gmR3o?DS0KqkW
z9*DcvkHvn8b1~6)+z&Cjd3=0)c-E|08%6X7Wxo1(b<u&0)`5@{9+8$pI8joF)R>M0
z=}@qwFp+Q_kGVB;C@^;&IdY_51e>RO-+t{+3}E5aSj>SPKmw4yv6-#Uj#<Da86)Yl
zpTo|tB~QqqB~KF1HYOEkc6n=keZ9Gs%}#$b$<dziDmyH~bR@`uMQ9MoNlXw%326?(
zr9fJz3gL6;D6cE9jta_~&i?Sjpa@<gpOcF|RJ@vSEV{}7<W^}5j^O&t(rOcD`n<}|
zGcnk0na^%K%42O#{49CBU#Ie!mYdXs8p025T_Spg9PPTA$sbXk$`0#@m=;nZgcE{Z
zTtqAqAhs_+$R&mI1tXmll69&eNrCPB4d!S!G&FRAVw>Ex->xZsHoNFw5+)NIiL}H;
z5NE_jyA{alXqQtbB`FZIP71{F8tK@W1ID_4y!oTQp4;Rm_NxNXMLS-4*Ren&Td-{*
z#Dc}IiJZ;GuVqYZ<71sb$B?)%&*Y=Xj$*@nj{Np6-h1PpH-_<;g!%Z`E?@R7DA?^H
z@x`y*TF7&>80&<94&pL>T`UqevBo54kvObF(OlN~e2K3a`Fj6#_wF!$ZR`@!?egtN
zy@<{VkHy#KjyaO9!~!dAYr!j7Y|}D3pYLbm?Kqp3Q#le_=J`A(HZz{h<vF<Z?7Ola
z{7=RZp7k22tE+2|g#QUxnA!2{uKS&i1PhTM*e>jav$a#Cd;vJ!&x13$qk?g9aa=)i
z@#f{K6aN0YckT}D-@m^f@5syzts{be9O}37D8=09nx7eVxtM5{OqLWE@1l;2!HEDa
zh~u=l&`NI3^D#%f73cx_fBN@N!{2{@da$RbXBoZ|TOcCq<w^W^<>}pbqL;HE_;U}A
z>>N1mvmoyK`J9`}<@y}^$hFL+dAK{d5#9~-V*bE?o<7}z-<ya2{*S*6?%TJo4}YI7
zU%vc(-0Wr>i0HS1V9t@}0+FQ)!STGQ%qbLGgtEfTj^mq8-6rB)0krPJyaBX>$h*b7
zyvYff1A9hIDlwN{kh4{1J@ulzEO=6}nNwxOn~$Mu-R|>7oRSXMoxplvDKHzD@jsP)
VtyzmKlnnp?002ovPDHLkV1kO`bo~GT

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/tabbrowser/tab-background-middle@2x.png b/browser/themes/osx/tabbrowser/tab-background-middle@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..41eba94af8863a032df6dd6a170a511fe06c1cf0
GIT binary patch
literal 727
zcmV;|0x127P)<h;3K|Lk000e1NJLTq000aC002G+1^@s6AIJJZ0007>Nkl<Zc-obX
z+fr3A5JXezAE_vK0leS^{RSTS|7SBjuFOo5+JGfcwdkHs_dbokXHTR(hZm2by6xpt
zc=|xnt(o20(DJGqg^^WGHU>95+!#m+Wx!i`8|2-3@4wCZ?`{?tkO6+EO`qB*{F)F#
zYX4*DZ9;~&Ud7G6=Nn&Mc}rvK5lxmSFBmegeoc67>eqO%Mep1lC66AyS%g)9D1gEG
z*n&Y8>k%F*^_le?{2cJ}Xn8PoGPJyv&q0(Yg2)(Tu}5A5jvts}`+Xm?HiC|U75088
z?K}te@Go@RUX|D2`~T>FO09qY|DYf47<_vQ{~k!?bsWh23Ih`@uhfm~s)aeAV_Bh<
z<>2c;OF{Z-%6q?iXbkq_-I4&`m&V{rAO*r}Wu?G4v_&}adUQY!<2fMsJTQR?6*r)j
zL1pyXG?wfFWqI6t+!cdQ1InnOg~%sy^A0UTo1-F2mF1}8r5IdNxKv=5>sDf!CFCuF
zp25aqWauF`zid2SaDZKyl=MV#TcCmIf`QI4VCROn;Z>C1*m;|VGUQMWt6aH8mV=KI
z15IpZhC=0gaId^E(_!#oV4z3Pj)C7V`TfEB18(m<^lqLy2U&W!xZj|;{2eCnVBeJY
zTitDko`Y4`Il5?Wc1Czc0iF2r?x;DMcZ;G^DD_qLx)rGMCh3#|l(<fP>SVsVpEh^T
zg3y7*4Kr72jhdvlJOb)^t57dLw5Y6&P`jLdWDe^?U>-D<ZzzD?xP$gB;2rQqTO}R@
z>DLFK-pV(r4nZnZacOz9@$ZDe$xt3arJ%yK?lz59vHT(i)ro;#yZLJu>K-Vx(DaJD
zWf3%rwu&3=A>H=SmyX%?LdW2hfFk%E4C-B}F?bY$JrMY#_zNBv%!)+~WK947002ov
JPDHLkV1kSsVpaeE

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/tabbrowser/tab-background-start@2x.png b/browser/themes/osx/tabbrowser/tab-background-start@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..86403921de9c7a9543879e3a4a2963e3d472e26b
GIT binary patch
literal 2820
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
WU9DMAevSG70000<MNUMnLSTXy@P!fp

literal 0
HcmV?d00001


From 96e7c00998020f59e0e80311f11ddc1f32a1bbe4 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Thu, 23 May 2013 05:51:25 -0700
Subject: [PATCH 140/230] Bug 823237 - Make the new tab button clip-path
 rectangular on top to prevent pointer-event gaps. r=Gijs

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

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 44b710dd350d..a2b8d6249775 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1182,8 +1182,8 @@
     <svg:clipPath id="tab-curve-clip-path-end" clipPathUnits="objectBoundingBox">
       <svg:path d="M -0.0333,0.0645 C 0.4317,0.0679,0.4831,0.3764,0.5163,0.5484 c 0.0522,0.2702,+0.1425,0.4194,0.4333,0.4194 L 1,1 H -0.033 V 0.0645 z"/>
     </svg:clipPath>
-    <svg:clipPath id="tab-clip-path-outer" clipPathUnits="userSpaceOnUse">
-      <svg:path d="M 30,0 C 24,0 17.78,2.58 15.10,8.09 12.05,13.46 13.14,20.37 9.18,25.3 7.1,27.7 3.8,28 0.8,28 c -0.4,0.6 -2.09,1.11 -1.46,1.80 l 2.45,2.72 61.60,0 2.59,-3.06 C 65.15,28.96 64.57,27.80 63.5,28 60.13,28.13 56.33,27.03 54.74,23.78 51.85,18.44 52.65,11.81 49.09,6.73 45.88,1.65 39.54,-0.26 33.8,0 32.5,0 31.7,0 30,0 z"/>
+    <svg:clipPath id="tab-clip-path-outer" clipPathUnits="objectBoundingBox">
+      <svg:path d="m 0.2197,0 0,0.4264 c -0.0156,0.1238 -0.0201,0.2548 -0.0492,0.3730 C 0.1464,0.9030 0.0889,0.9397 0.0379,0.9355 L 0,1 1,1 0.9621,0.9355 c -0.0511,0.0042 -0.1085,-0.0322 -0.1326,-0.1361 -0.0292,-0.1152 -0.0334,-0.2486 -0.0492,-0.3730 L 0.7803,0 z"/>
     </svg:clipPath>
 
 #ifndef XP_UNIX

From b84e035950bfc95d4ab4dcfca48db9bfe9287161 Mon Sep 17 00:00:00 2001
From: Jared Wein <jaws@mozilla.com>
Date: Thu, 23 May 2013 09:40:55 -0400
Subject: [PATCH 141/230] Bug 865926 - Allow the nav-bar to overflow
 toolbaritems into an overflow panel. r=mconley.

---
 browser/base/content/browser.css              |   9 +
 browser/base/content/browser.xul              |  28 ++-
 .../customizableui/content/panelUI.inc.xul    |   9 +
 .../customizableui/src/CustomizableUI.jsm     | 196 +++++++++++++++++-
 .../customizableui/src/CustomizeMode.jsm      |   8 +
 .../locales/en-US/chrome/browser/browser.dtd  |   1 +
 browser/themes/linux/browser.css              |  16 ++
 browser/themes/osx/browser.css                |  16 ++
 .../customizableui/panelUIOverlay.inc.css     |   8 +-
 browser/themes/windows/browser.css            |  16 ++
 10 files changed, 293 insertions(+), 14 deletions(-)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index b429c6a52ec4..ba1b78dbee40 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -108,6 +108,15 @@ toolbar[printpreview="true"] {
   -moz-box-ordinal-group: 50;
 }
 
+toolbar[overflowable] > .customization-target {
+  overflow: hidden;
+}
+
+toolbar[customizing][overflowable] > .overflow-button,
+toolbar[overflowable]:not([overflowing]) > .overflow-button {
+  display: none;
+}
+
 #TabsToolbar {
   -moz-box-ordinal-group: 100;
 }
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index a2b8d6249775..4bfbd36ffd83 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -502,15 +502,17 @@
              aria-label="&navbarCmd.label;"
              fullscreentoolbar="true" mode="icons" customizable="true"
              iconsize="large"
-             defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button,window-controls"
+             defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button"
              customizationtarget="nav-bar-customizationtarget"
+             overflowbutton="nav-bar-overflow-button"
              context="toolbar-context-menu">
 
-      <hbox id="nav-bar-customizationtarget" class="customization-target" flex="0">
+      <hbox id="nav-bar-customizationtarget" class="customization-target" flex="1">
         <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
                      context="backForwardMenu" removable="false"
                      forwarddisabled="true"
-                     title="&backForwardItem.title;">
+                     title="&backForwardItem.title;"
+                     nooverflow="true">
           <toolbarbutton id="back-button" class="toolbarbutton-1"
                          label="&backCmd.label;"
                          command="Browser:BackOrBackDuplicate"
@@ -531,7 +533,7 @@
         </toolbaritem>
 
         <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true"
-                     title="&locationItem.title;" class="chromeclass-location" removable="false">
+                     title="&locationItem.title;" class="chromeclass-location" removable="false" nooverflow="true">
           <textbox id="urlbar" flex="1"
                    placeholder="&urlbar.placeholder2;"
                    type="autocomplete"
@@ -623,12 +625,14 @@
                        label="&reloadCmd.label;" removable="true"
                        command="Browser:ReloadOrDuplicate"
                        onclick="checkForMiddleClick(this, event);"
-                       tooltiptext="&reloadButton.tooltip;"/>
+                       tooltiptext="&reloadButton.tooltip;"
+                       nooverflow="true"/>
 
         <toolbarbutton id="stop-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                        label="&stopCmd.label;" removable="true"
                        command="Browser:Stop"
-                       tooltiptext="&stopButton.tooltip;"/>
+                       tooltiptext="&stopButton.tooltip;"
+                       nooverflow="true"/>
 
         <toolbarbutton id="webrtc-status-button"
                        class="toolbarbutton-1 chromeclass-toolbar-additional"
@@ -636,7 +640,8 @@
                        hidden="true"
                        orient="horizontal"
                        label="&webrtcIndicatorButton.label;"
-                       tooltiptext="&webrtcIndicatorButton.tooltip;">
+                       tooltiptext="&webrtcIndicatorButton.tooltip;"
+                       nooverflow="true">
           <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);"
                      onpopuphiding="WebrtcIndicator.clearPopup(this);"
                      oncommand="WebrtcIndicator.menuCommand(event.target);"/>
@@ -645,6 +650,7 @@
         <toolbarbutton id="social-share-button"
                        class="toolbarbutton-1 chromeclass-toolbar-additional"
                        hidden="true"
+                       nooverflow="true"
                        label="&sharePageCmd.label;"
                        tooltiptext="&sharePageCmd.label;"
                        command="Social:SharePage"/>
@@ -654,6 +660,7 @@
                      removable="false"
                      title="&socialToolbar.title;"
                      hidden="true"
+                     nooverflow="true"
                      skipintoolbarset="true"
                      observes="socialActiveBroadcaster">
           <toolbarbutton id="social-provider-button"
@@ -703,6 +710,11 @@
         </toolbaritem>
       </hbox>
 
+      <toolbarbutton id="nav-bar-overflow-button"
+                     class="toolbarbutton-1 chromeclass-toolbar-additional chevron overflow-button"
+                     skipintoolbarset="true"
+                     tooltiptext="&navbarOverflow.label;"/>
+
       <toolbaritem id="PanelUI-button"
                    class="chromeclass-toolbar-additional"
                    removable="false"
@@ -859,7 +871,7 @@
 
       <toolbaritem id="search-container" title="&searchItem.title;"
                    align="center" class="chromeclass-toolbar-additional"
-                   flex="100" persist="width" removable="true">
+                   flex="100" persist="width" removable="true" noautoclose="true">
         <searchbar id="searchbar" flex="1"/>
       </toolbaritem>
 
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index cb3c992c9750..02358b48345e 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -81,3 +81,12 @@
     </panelsubview>
   </panelmultiview>
 </panel>
+
+<panel id="widget-overflow"
+       role="group"
+       type="arrow"
+       level="top"
+       consumeoutsideclicks="true">
+  <vbox id="widget-overflow-list">
+  </vbox>
+</panel>
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 30833ee293cc..c5f9f65d0b19 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -13,6 +13,8 @@ Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "CustomizableWidgets",
   "resource:///modules/CustomizableWidgets.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "DeferredTask",
+  "resource://gre/modules/DeferredTask.jsm");
 
 const kNSXUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
@@ -157,7 +159,8 @@ let CustomizableUIInternal = {
     });
     this.registerArea(CustomizableUI.AREA_NAVBAR, {
       legacy: true,
-      type: CustomizableUI.TYPE_TOOLBAR
+      type: CustomizableUI.TYPE_TOOLBAR,
+      overflowable: true
     });
     this.registerArea(CustomizableUI.AREA_MENUBAR, {
       legacy: true,
@@ -246,6 +249,10 @@ let CustomizableUIInternal = {
       this.restoreStateForArea(area, legacyState);
     }
 
+    if (areaProperties.has("overflowable")) {
+      aToolbar.overflowable = new OverflowableToolbar(aToolbar);
+    }
+
     this.registerBuildArea(area, aToolbar);
 
     let placements = gPlacements.get(area);
@@ -538,10 +545,15 @@ let CustomizableUIInternal = {
     gBuildWindows.delete(aWindow);
     let document = aWindow.document;
 
-    for (let [, area] of gBuildAreas) {
-      for (let node of area) {
+    for (let [areaId, areaNodes] of gBuildAreas) {
+      let areaProperties = gAreas.get(areaId);
+      for (let node of areaNodes) {
         if (node.ownerDocument == document) {
-          area.delete(node);
+          if (areaProperties.has("overflowable")) {
+            node.overflowable.uninit();
+            node.overflowable = null;
+          }
+          areaNodes.delete(node);
         }
       }
     }
@@ -1746,6 +1758,182 @@ function XULWidgetSingleWrapper(aWidgetId, aNode) {
   Object.freeze(this);
 }
 
+const LAZY_RESIZE_INTERVAL_MS = 20;
+
+function OverflowableToolbar(aToolbarNode) {
+  this._toolbar = aToolbarNode;
+  this._target = aToolbarNode.customizationTarget;
+  let chevronId = this._toolbar.getAttribute("overflowbutton");
+  let doc = this._toolbar.ownerDocument;
+  this._chevron = doc.getElementById(chevronId);
+  this._panel = doc.getElementById("widget-overflow");
+  this._list = doc.getElementById("widget-overflow-list");
+  this._collapsed = [];
+  this._enabled = true;
+
+  this._toolbar.setAttribute("overflowable", "true");
+  this._toolbar.customizationTarget.addEventListener("overflow", this);
+  let window = doc.defaultView;
+  window.addEventListener("resize", this);
+  window.gNavToolbox.addEventListener("customizationstarting", this);
+  window.gNavToolbox.addEventListener("aftercustomization", this);
+  this._chevron.addEventListener("command", this);
+  this._panel.addEventListener("popuphiding", this);
+
+  // The toolbar could initialize in an overflowed state, in which case
+  // the 'overflow' event may have been fired before the handler was registered.
+  this._onOverflow();
+}
+
+OverflowableToolbar.prototype = {
+
+  uninit: function() {
+    this._disable();
+
+    this._toolbar.removeAttribute("overflowable");
+    this._toolbar.customizationTarget.removeEventListener("overflow", this);
+    let window = this._toolbar.ownerDocument.defaultView;
+    window.removeEventListener("resize", this);
+    window.gNavToolbox.removeEventListener("customizationstarting", this);
+    window.gNavToolbox.removeEventListener("aftercustomization", this);
+    this._chevron.removeEventListener("command", this);
+    this._panel.removeEventListener("popuphiding", this);
+  },
+
+  handleEvent: function(aEvent) {
+    switch(aEvent.type) {
+      case "overflow":
+        this._onOverflow();
+        break;
+      case "resize":
+        this._onResize(aEvent);
+        break;
+      case "command":
+        this._onClickChevron(aEvent);
+        break;
+      case "popuphiding":
+        this._onPanelHiding(aEvent);
+        break;
+      case "mouseup":
+      case "keypress":
+        this._maybeAutoHidePanel(aEvent);
+        break;
+      case "customizationstarting":
+        this._disable();
+        break;
+      case "aftercustomization":
+        this._enable();
+        break;
+    }
+  },
+
+  _onClickChevron: function(aEvent) {
+    if (this._chevron.open)
+      this._panel.hidePopup();
+    else {
+      let doc = aEvent.target.ownerDocument;
+      let anchor = doc.getAnonymousElementByAttribute(this._chevron, "class", "toolbarbutton-icon");
+      this._panel.openPopup(anchor || this._chevron, "bottomcenter topright");
+    }
+    this._chevron.open = !this._chevron.open;
+  },
+
+  _onPanelHiding: function(aEvent) {
+    this._chevron.open = false;
+  },
+
+  _onOverflow: function() {
+    if (!this._enabled)
+      return;
+
+    let child = this._target.lastChild;
+
+    while(child && this._target.clientWidth < this._target.scrollWidth) {
+      let prevChild = child.previousSibling;
+
+      if (!child.hasAttribute("nooverflow")) {
+        this._collapsed.push({child: child, minSize: this._target.clientWidth});
+        child.classList.add("overflowedItem");
+
+        child.addEventListener("mouseup", this);
+        child.addEventListener("keypress", this);
+
+        this._list.insertBefore(child, this._list.firstChild);
+        this._toolbar.setAttribute("overflowing", "true");
+      }
+      child = prevChild;
+    };
+  },
+
+  _maybeAutoHidePanel: function(aEvent) {
+    LOG("_maybeAutoHidePanel: " + aEvent.type);
+
+    if (aEvent.currentTarget.hasAttribute("noautoclose"))
+      return;
+
+    if (aEvent.type == "keypress" &&
+        !(aEvent.keyCode == aEvent.DOM_VK_ENTER ||
+          aEvent.keyCode == aEvent.DOM_VK_RETURN)) {
+      return;
+    }
+
+    if (aEvent.type == "mouseup" && aEvent.button != 0) {
+      return;
+    }
+
+    this._panel.hidePopup();
+  },
+
+  _onResize: function(aEvent) {
+    if (!this._lazyResizeHandler) {
+      this._lazyResizeHandler = new DeferredTask(this._onLazyResize.bind(this),
+                                                 LAZY_RESIZE_INTERVAL_MS);
+    }
+    this._lazyResizeHandler.start();
+  },
+
+  _moveItemsBackToTheirOrigin: function(shouldMoveAllItems) {
+    for (let i = this._collapsed.length - 1; i >= 0; i--) {
+      let {child, minSize} = this._collapsed[i];
+
+      if (!shouldMoveAllItems &&
+          this._target.clientWidth <= minSize) {
+        return;
+      }
+
+      this._collapsed.pop();
+      this._target.appendChild(child);
+      child.classList.remove("overflowedItem");
+      child.removeEventListener("mouseup", this);
+      child.removeEventListener("keypress", this);
+    }
+
+    if (!this._collapsed.length) {
+      this._toolbar.removeAttribute("overflowing");
+    }
+  },
+
+  _onLazyResize: function() {
+    if (!this._enabled)
+      return;
+
+    this._moveItemsBackToTheirOrigin();
+  },
+
+  _disable: function() {
+    this._enabled = false;
+    this._moveItemsBackToTheirOrigin(true);
+    if (this._lazyResizeHandler) {
+      this._lazyResizeHandler.cancel();
+    }
+  },
+
+  _enable: function() {
+    this._enabled = true;
+    this._onOverflow();
+  }
+};
+
 // When IDs contain special characters, we need to escape them for use with querySelector:
 function idToSelector(aId) {
   return "#" + aId.replace(/[ !"'#$%&\(\)*+\-,.\/:;<=>?@\[\\\]^`{|}~]/g, '\\$&');
diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index d0597476bef3..5320ca485649 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -153,6 +153,10 @@ CustomizeMode.prototype = {
 
     this.resetButton.hidden = CustomizableUI.inDefaultState;
 
+    let customizableToolbars = document.querySelectorAll("toolbar[customizable=true]:not([autohide=true])");
+    for (let toolbar of customizableToolbars)
+      toolbar.setAttribute("customizing", true);
+
     document.documentElement.setAttribute("customizing", true);
     this._customizing = true;
   },
@@ -255,6 +259,10 @@ CustomizeMode.prototype = {
     });
     documentElement.removeAttribute("customizing");
 
+    let customizableToolbars = document.querySelectorAll("toolbar[customizable=true]:not([autohide=true])");
+    for (let toolbar of customizableToolbars)
+      toolbar.removeAttribute("customizing");
+
     let customizer = document.getElementById("customization-container");
     customizer.hidden = true;
 
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 9e5bca9123ef..e9831b901fcf 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -16,6 +16,7 @@
 <!ENTITY mainWindow.titlePrivateBrowsingSuffix "(Private Browsing)">
 
 <!ENTITY appmenu.title                       "Customize and Control &brandFullName;">
+<!ENTITY navbarOverflow.label                "More tools…">
 
 <!-- Tab context menu -->
 <!ENTITY  reloadTab.label                    "Reload Tab">
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index ea214dc0d023..a1ec57f611b6 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -68,6 +68,22 @@
   z-index: 1;
 }
 
+#nav-bar-overflow-button {
+  -moz-image-region: rect(-5px, 12px, 11px, -4px);
+}
+
+#widget-overflow-list > .overflowedItem {
+  width: 100%;
+  min-height: 36px;
+  background-repeat: no-repeat;
+  background-position: 0 center;
+}
+
+#widget-overflow-list > .overflowedItem > .toolbarbutton-text {
+  -moz-padding-start: 10px;
+  text-align: start;
+}
+
 #personal-bookmarks {
   min-height: 29px;
 }
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 49d1311f3f62..fbe90668c8eb 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -112,6 +112,22 @@ toolbox[tabsontop=true] > toolbar:not(#TabsToolbar):not(#nav-bar):not(:-moz-lwth
   background-color: -moz-mac-chrome-inactive;
 }
 
+#nav-bar-overflow-button {
+  -moz-image-region: rect(-5px, 12px, 11px, -4px);
+}
+
+#widget-overflow-list > .overflowedItem {
+  width: 100%;
+  min-height: 36px;
+  background-repeat: no-repeat;
+  background-position: 0 center;
+}
+
+#widget-overflow-list > .overflowedItem > .toolbarbutton-text {
+  -moz-padding-start: 10px;
+  text-align: start;
+}
+
 /* ----- BOOKMARK TOOLBAR ----- */
 
 #personal-bookmarks {
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index 45ce95031ee2..e7d7e00f57de 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -180,10 +180,12 @@ panelsubview toolbarbutton > .toolbarbutton-text,
 panelmainview toolbarbutton,
 panelsubview toolbarbutton,
 #customizationui-widget-panel toolbarbutton,
+#widget-overflow-list > toolbarbutton,
 .customizationmode-button {
   -moz-appearance: none;
   padding: 2px 6px;
-  background: hsla(210,32%,93%,0) padding-box;
+  background-color: hsla(210,32%,93%,0);
+  background-clip: padding-box;
   border-radius: 2px;
   border: 1px solid;
   border-color: hsla(210,54%,20%,0) hsla(210,54%,20%,0) hsla(210,54%,20%,0);
@@ -197,6 +199,7 @@ panelsubview toolbarbutton,
 panelmainview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 panelsubview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #customizationui-widget-panel toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
+#widget-overflow-list > toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #PanelUI-mainView .PanelUI-pageControls toolbarbutton,
 .customizationmode-button,
 #PanelUI-mainView #PanelUI-customize-btn {
@@ -210,7 +213,8 @@ panelsubview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:activ
 panelmainview toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
 panelsubview toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
 .customizationmode-button:hover:active,
-#customizationui-widget-panel toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active) {
+#customizationui-widget-panel toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
+#widget-overflow-list > toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active) {
   background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
   background-color: hsla(210,54%,20%,.15);
   border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index d81660c09877..f58795cc2328 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -106,6 +106,22 @@
   z-index: 1;
 }
 
+#nav-bar-overflow-button {
+  -moz-image-region: rect(-5px, 12px, 11px, -4px);
+}
+
+#widget-overflow-list > .overflowedItem {
+  width: 100%;
+  min-height: 36px;
+  background-repeat: no-repeat;
+  background-position: 0 center;
+}
+
+#widget-overflow-list > .overflowedItem > .toolbarbutton-text {
+  -moz-padding-start: 10px;
+  text-align: start;
+}
+
 #personal-bookmarks {
   min-height: 24px;
 }

From cf696e0d390643e25e5ea1e226693c345ccf669d Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Wed, 22 May 2013 11:50:57 +0200
Subject: [PATCH 142/230] Bug 871590 - Make unified titlebar / toolbar handling
 more robust. r=roc

---
 layout/base/nsDisplayList.cpp      |  3 +-
 layout/base/nsDisplayList.h        | 10 ++---
 widget/cocoa/nsChildView.mm        | 60 +++++++++++++++++++++---------
 widget/cocoa/nsCocoaWindow.h       |  8 ++--
 widget/cocoa/nsCocoaWindow.mm      | 10 ++---
 widget/cocoa/nsNativeThemeCocoa.h  |  2 +-
 widget/cocoa/nsNativeThemeCocoa.mm |  9 +----
 7 files changed, 62 insertions(+), 40 deletions(-)

diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 3f916c54b8ac..3291f954d290 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -1567,7 +1567,8 @@ nsDisplayBackgroundImage::nsDisplayBackgroundImage(nsDisplayListBuilder* aBuilde
     mFrame->IsThemed(disp, &mThemeTransparency);
     // Perform necessary RegisterThemeGeometry
     if (disp->mAppearance == NS_THEME_MOZ_MAC_UNIFIED_TOOLBAR ||
-        disp->mAppearance == NS_THEME_TOOLBAR) {
+        disp->mAppearance == NS_THEME_TOOLBAR ||
+        disp->mAppearance == NS_THEME_WINDOW_TITLEBAR) {
       RegisterThemeGeometry(aBuilder, aFrame);
     } else if (disp->mAppearance == NS_THEME_WIN_BORDERLESS_GLASS ||
                disp->mAppearance == NS_THEME_WIN_GLASS) {
diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h
index 85558ffaf80a..07d1e59e13fa 100644
--- a/layout/base/nsDisplayList.h
+++ b/layout/base/nsDisplayList.h
@@ -454,11 +454,11 @@ public:
    * Notifies the builder that a particular themed widget exists
    * at the given rectangle within the currently built display list.
    * For certain appearance values (currently only
-   * NS_THEME_MOZ_MAC_UNIFIED_TOOLBAR and NS_THEME_TOOLBAR) this gets
-   * called during every display list construction, for every themed widget of
-   * the right type within the display list, except for themed widgets which
-   * are transformed or have effects applied to them (e.g. CSS opacity or
-   * filters).
+   * NS_THEME_MOZ_MAC_UNIFIED_TOOLBAR, NS_THEME_TOOLBAR and
+   * NS_THEME_WINDOW_TITLEBAR) this gets called during every display list
+   * construction, for every themed widget of the right type within the
+   * display list, except for themed widgets which are transformed or have
+   * effects applied to them (e.g. CSS opacity or filters).
    *
    * @param aWidgetType the -moz-appearance value for the themed widget
    * @param aRect the device-pixel rect relative to the widget's displayRoot
diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
index 0831f178cfec..19057c1c0741 100644
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -2072,32 +2072,58 @@ nsChildView::MaybeDrawRoundedBottomCorners(GLManager* aManager, nsIntRect aRect)
                                      LOCAL_GL_ONE, LOCAL_GL_ONE);
 }
 
+static int32_t
+FindTitlebarBottom(const nsTArray<nsIWidget::ThemeGeometry>& aThemeGeometries,
+                   int32_t aWindowWidth)
+{
+  int32_t titlebarBottom = 0;
+  for (uint32_t i = 0; i < aThemeGeometries.Length(); ++i) {
+    const nsIWidget::ThemeGeometry& g = aThemeGeometries[i];
+    if ((g.mWidgetType == NS_THEME_WINDOW_TITLEBAR) &&
+        g.mRect.X() <= 0 &&
+        g.mRect.XMost() >= aWindowWidth &&
+        g.mRect.Y() <= 0) {
+      titlebarBottom = std::max(titlebarBottom, g.mRect.YMost());
+    }
+  }
+  return titlebarBottom;
+}
+
+static int32_t
+FindUnifiedToolbarBottom(const nsTArray<nsIWidget::ThemeGeometry>& aThemeGeometries,
+                         int32_t aWindowWidth, int32_t aTitlebarBottom)
+{
+  int32_t unifiedToolbarBottom = aTitlebarBottom;
+  for (uint32_t i = 0; i < aThemeGeometries.Length(); ++i) {
+    const nsIWidget::ThemeGeometry& g = aThemeGeometries[i];
+    if ((g.mWidgetType == NS_THEME_MOZ_MAC_UNIFIED_TOOLBAR ||
+         g.mWidgetType == NS_THEME_TOOLBAR) &&
+        g.mRect.X() <= 0 &&
+        g.mRect.XMost() >= aWindowWidth &&
+        g.mRect.Y() <= aTitlebarBottom) {
+      unifiedToolbarBottom = std::max(unifiedToolbarBottom, g.mRect.YMost());
+    }
+  }
+  return unifiedToolbarBottom;
+}
+
 void
 nsChildView::UpdateThemeGeometries(const nsTArray<ThemeGeometry>& aThemeGeometries)
 {
   if (![mView window] || ![[mView window] isKindOfClass:[ToolbarWindow class]])
     return;
 
+  int32_t windowWidth = mBounds.width;
+  int32_t titlebarBottom = FindTitlebarBottom(aThemeGeometries, windowWidth);
+  int32_t unifiedToolbarBottom =
+    FindUnifiedToolbarBottom(aThemeGeometries, windowWidth, titlebarBottom);
+
   ToolbarWindow* win = (ToolbarWindow*)[mView window];
   bool drawsContentsIntoWindowFrame = [win drawsContentsIntoWindowFrame];
-  int32_t windowWidth = mBounds.width;
   int32_t titlebarHeight = CocoaPointsToDevPixels([win titlebarHeight]);
-  int32_t underTitlebarPos = drawsContentsIntoWindowFrame ? titlebarHeight : 0;
-  int32_t unifiedToolbarBottom = 0;
-
-  for (uint32_t i = 0; i < aThemeGeometries.Length(); ++i) {
-    const ThemeGeometry& g = aThemeGeometries[i];
-    if ((g.mWidgetType == NS_THEME_MOZ_MAC_UNIFIED_TOOLBAR ||
-         g.mWidgetType == NS_THEME_TOOLBAR) &&
-        g.mRect.X() <= 0 &&
-        g.mRect.XMost() >= windowWidth &&
-        g.mRect.Y() <= underTitlebarPos) {
-      unifiedToolbarBottom = g.mRect.YMost();
-    }
-  }
-
-  CGFloat unifiedHeight = DevPixelsToCocoaPoints(titlebarHeight + unifiedToolbarBottom - underTitlebarPos);
-  [win setUnifiedToolbarHeight:unifiedHeight];
+  int32_t contentOffset = drawsContentsIntoWindowFrame ? titlebarHeight : 0;
+  int32_t devUnifiedHeight = titlebarHeight + unifiedToolbarBottom - contentOffset;
+  [win setUnifiedToolbarHeight:DevPixelsToCocoaPoints(devUnifiedHeight)];
 }
 
 NS_IMETHODIMP
diff --git a/widget/cocoa/nsCocoaWindow.h b/widget/cocoa/nsCocoaWindow.h
index c6ffbc4202f7..45161fa4c65d 100644
--- a/widget/cocoa/nsCocoaWindow.h
+++ b/widget/cocoa/nsCocoaWindow.h
@@ -184,15 +184,15 @@ typedef struct _nsCocoaWindowList {
 @interface ToolbarWindow : BaseWindow
 {
   TitlebarAndBackgroundColor *mColor;
-  float mUnifiedToolbarHeight;
+  CGFloat mUnifiedToolbarHeight;
   NSColor *mBackgroundColor;
   NSView *mTitlebarView; // strong
 }
 // Pass nil here to get the default appearance.
 - (void)setTitlebarColor:(NSColor*)aColor forActiveWindow:(BOOL)aActive;
-- (void)setUnifiedToolbarHeight:(float)aHeight;
-- (float)unifiedToolbarHeight;
-- (float)titlebarHeight;
+- (void)setUnifiedToolbarHeight:(CGFloat)aHeight;
+- (CGFloat)unifiedToolbarHeight;
+- (CGFloat)titlebarHeight;
 - (NSRect)titlebarRect;
 - (void)setTitlebarNeedsDisplayInRect:(NSRect)aRect sync:(BOOL)aSync;
 - (void)setTitlebarNeedsDisplayInRect:(NSRect)aRect;
diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm
index 56d8d2aa29b4..374486c0e586 100644
--- a/widget/cocoa/nsCocoaWindow.mm
+++ b/widget/cocoa/nsCocoaWindow.mm
@@ -3003,19 +3003,19 @@ static const NSString* kStateShowsToolbarButton = @"showsToolbarButton";
 }
 
 // Returns the unified height of titlebar + toolbar.
-- (float)unifiedToolbarHeight
+- (CGFloat)unifiedToolbarHeight
 {
   return mUnifiedToolbarHeight;
 }
 
-- (float)titlebarHeight
+- (CGFloat)titlebarHeight
 {
   NSRect frameRect = [self frame];
   return frameRect.size.height - [self contentRectForFrameRect:frameRect].size.height;
 }
 
 // Stores the complete height of titlebar + toolbar.
-- (void)setUnifiedToolbarHeight:(float)aHeight
+- (void)setUnifiedToolbarHeight:(CGFloat)aHeight
 {
   if (aHeight == mUnifiedToolbarHeight)
     return;
@@ -3210,7 +3210,7 @@ static const NSString* kStateShowsToolbarButton = @"showsToolbarButton";
 
 static void
 DrawNativeTitlebar(CGContextRef aContext, CGRect aTitlebarRect,
-                   float aUnifiedToolbarHeight, BOOL aIsMain)
+                   CGFloat aUnifiedToolbarHeight, BOOL aIsMain)
 {
   if (aTitlebarRect.size.width * aTitlebarRect.size.height > CUIDRAW_MAX_AREA) {
     return;
@@ -3221,7 +3221,7 @@ DrawNativeTitlebar(CGContextRef aContext, CGRect aTitlebarRect,
             @"kCUIWidgetWindowFrame", @"widget",
             @"regularwin", @"windowtype",
             (aIsMain ? @"normal" : @"inactive"), @"state",
-            [NSNumber numberWithInt:aUnifiedToolbarHeight], @"kCUIWindowFrameUnifiedTitleBarHeightKey",
+            [NSNumber numberWithDouble:aUnifiedToolbarHeight], @"kCUIWindowFrameUnifiedTitleBarHeightKey",
             [NSNumber numberWithBool:YES], @"kCUIWindowFrameDrawTitleSeparatorKey",
             nil],
           nil);
diff --git a/widget/cocoa/nsNativeThemeCocoa.h b/widget/cocoa/nsNativeThemeCocoa.h
index a0c5379e07f3..5b55ae57ad4f 100644
--- a/widget/cocoa/nsNativeThemeCocoa.h
+++ b/widget/cocoa/nsNativeThemeCocoa.h
@@ -109,7 +109,7 @@ protected:
   void DrawStatusBar(CGContextRef cgContext, const HIRect& inBoxRect,
                      nsIFrame *aFrame);
   void DrawNativeTitlebar(CGContextRef aContext, CGRect aTitlebarRect,
-                          float aUnifiedHeight, BOOL aIsMain);
+                          CGFloat aUnifiedHeight, BOOL aIsMain);
   void DrawResizer(CGContextRef cgContext, const HIRect& aRect, nsIFrame *aFrame);
 
   // Scrollbars
diff --git a/widget/cocoa/nsNativeThemeCocoa.mm b/widget/cocoa/nsNativeThemeCocoa.mm
index 6daba190c0e7..315744fa7376 100644
--- a/widget/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/cocoa/nsNativeThemeCocoa.mm
@@ -1818,14 +1818,9 @@ ToolbarCanBeUnified(CGContextRef cgContext, const HIRect& inBoxRect, NSWindow* a
 
   ToolbarWindow* win = (ToolbarWindow*)aWindow;
   float unifiedToolbarHeight = [win unifiedToolbarHeight];
-  float titlebarHeight = [win titlebarHeight];
-  bool drawsContentsIntoWindowFrame = [win drawsContentsIntoWindowFrame];
-  float underTitlebarPos = drawsContentsIntoWindowFrame ? titlebarHeight : 0;
-
   return inBoxRect.origin.x == 0 &&
          inBoxRect.size.width >= [win frame].size.width &&
-         inBoxRect.origin.y <= underTitlebarPos &&
-         floor(inBoxRect.origin.y + inBoxRect.size.height) <= unifiedToolbarHeight;
+         CGRectGetMaxY(inBoxRect) <= unifiedToolbarHeight;
 }
 
 void
@@ -1899,7 +1894,7 @@ nsNativeThemeCocoa::DrawStatusBar(CGContextRef cgContext, const HIRect& inBoxRec
 
 void
 nsNativeThemeCocoa::DrawNativeTitlebar(CGContextRef aContext, CGRect aTitlebarRect,
-                                       float aUnifiedHeight, BOOL aIsMain)
+                                       CGFloat aUnifiedHeight, BOOL aIsMain)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 

From e0ffb2e9d73c212ad7e74b7ba1664baf76a15c92 Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Thu, 23 May 2013 16:49:16 +0200
Subject: [PATCH 143/230] Bug 676241 part 1: Don't draw rounded corners in
 -moz-appearance titlebar / toolbar rendering. r=josh

---
 widget/cocoa/nsNativeThemeCocoa.mm | 81 ++++++++++++++++--------------
 1 file changed, 42 insertions(+), 39 deletions(-)

diff --git a/widget/cocoa/nsNativeThemeCocoa.mm b/widget/cocoa/nsNativeThemeCocoa.mm
index 315744fa7376..eb7062eb3b07 100644
--- a/widget/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/cocoa/nsNativeThemeCocoa.mm
@@ -1823,32 +1823,55 @@ ToolbarCanBeUnified(CGContextRef cgContext, const HIRect& inBoxRect, NSWindow* a
          CGRectGetMaxY(inBoxRect) <= unifiedToolbarHeight;
 }
 
+// By default, kCUIWidgetWindowFrame drawing draws rounded corners in the
+// upper corners. Depending on the context type, it fills the background in
+// the corners with black or leaves it transparent. Unfortunately, this corner
+// rounding interacts poorly with the window corner masking we apply during
+// titlebar drawing and results in small remnants of the corner background
+// appearing at the rounded edge.
+// So we draw square corners.
+static void
+DrawNativeTitlebarToolbarWithSquareCorners(CGContextRef aContext, const CGRect& aRect,
+                                           CGFloat aUnifiedHeight, BOOL aIsMain)
+{
+  // We extend the draw rect horizontally and clip away the rounded corners.
+  const CGFloat extendHorizontal = 10;
+  CGRect drawRect = CGRectInset(aRect, -extendHorizontal, 0);
+  if (drawRect.size.width * drawRect.size.height <= CUIDRAW_MAX_AREA) {
+    CGContextSaveGState(aContext);
+    CGContextClipToRect(aContext, aRect);
+
+    CUIDraw([NSWindow coreUIRenderer], drawRect, aContext,
+            (CFDictionaryRef)[NSDictionary dictionaryWithObjectsAndKeys:
+              @"kCUIWidgetWindowFrame", @"widget",
+              @"regularwin", @"windowtype",
+              (aIsMain ? @"normal" : @"inactive"), @"state",
+              [NSNumber numberWithDouble:aUnifiedHeight], @"kCUIWindowFrameUnifiedTitleBarHeightKey",
+              [NSNumber numberWithBool:YES], @"kCUIWindowFrameDrawTitleSeparatorKey",
+              [NSNumber numberWithBool:YES], @"is.flipped",
+              nil],
+            nil);
+
+    CGContextRestoreGState(aContext);
+  }
+}
+
 void
 nsNativeThemeCocoa::DrawUnifiedToolbar(CGContextRef cgContext, const HIRect& inBoxRect,
                                        NSWindow* aWindow)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  float unifiedHeight = [(ToolbarWindow*)aWindow unifiedToolbarHeight];
-
-  BOOL isMain = [aWindow isMainWindow];
-
   CGContextSaveGState(cgContext);
   CGContextClipToRect(cgContext, inBoxRect);
 
-  CGRect drawRect = CGRectOffset(inBoxRect, 0, inBoxRect.size.height - unifiedHeight);
-  if (drawRect.size.width * drawRect.size.height <= CUIDRAW_MAX_AREA) {
-    CUIDraw([NSWindow coreUIRenderer], drawRect, cgContext,
-            (CFDictionaryRef)[NSDictionary dictionaryWithObjectsAndKeys:
-              @"kCUIWidgetWindowFrame", @"widget",
-              @"regularwin", @"windowtype",
-              (isMain ? @"normal" : @"inactive"), @"state",
-              [NSNumber numberWithInt:unifiedHeight], @"kCUIWindowFrameUnifiedTitleBarHeightKey",
-              [NSNumber numberWithBool:YES], @"kCUIWindowFrameDrawTitleSeparatorKey",
-              [NSNumber numberWithBool:YES], @"is.flipped",
-              nil],
-            nil);
-  }
+  CGFloat unifiedHeight = std::max([(ToolbarWindow*)aWindow unifiedToolbarHeight],
+                                   inBoxRect.size.height);
+  BOOL isMain = [aWindow isMainWindow];
+  CGFloat titlebarHeight = unifiedHeight - inBoxRect.size.height;
+  CGRect drawRect = CGRectMake(inBoxRect.origin.x, inBoxRect.origin.y - titlebarHeight,
+                               inBoxRect.size.width, inBoxRect.size.height + titlebarHeight);
+  DrawNativeTitlebarToolbarWithSquareCorners(cgContext, drawRect, unifiedHeight, isMain);
 
   CGContextRestoreGState(cgContext);
 
@@ -1896,28 +1919,8 @@ void
 nsNativeThemeCocoa::DrawNativeTitlebar(CGContextRef aContext, CGRect aTitlebarRect,
                                        CGFloat aUnifiedHeight, BOOL aIsMain)
 {
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (aTitlebarRect.size.width * aTitlebarRect.size.height > CUIDRAW_MAX_AREA) {
-    return;
-  }
-
-  CGContextSaveGState(aContext);
-
-  CUIDraw([NSWindow coreUIRenderer], aTitlebarRect, aContext,
-          (CFDictionaryRef)[NSDictionary dictionaryWithObjectsAndKeys:
-            @"kCUIWidgetWindowFrame", @"widget",
-            @"regularwin", @"windowtype",
-            (aIsMain ? @"normal" : @"inactive"), @"state",
-            [NSNumber numberWithInt:aUnifiedHeight], @"kCUIWindowFrameUnifiedTitleBarHeightKey",
-            [NSNumber numberWithBool:NO], @"kCUIWindowFrameDrawTitleSeparatorKey",
-            [NSNumber numberWithBool:YES], @"is.flipped",
-            nil],
-          nil);
-
-  CGContextRestoreGState(aContext);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
+  CGFloat unifiedHeight = std::max(aUnifiedHeight, aTitlebarRect.size.height);
+  DrawNativeTitlebarToolbarWithSquareCorners(aContext, aTitlebarRect, unifiedHeight, aIsMain);
 }
 
 static void

From f5b49e385b5f88f6cb40285dc261a146350434dc Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Thu, 23 May 2013 16:49:16 +0200
Subject: [PATCH 144/230] Bug 676241 part 2: Remove titlebar event redirection.
 r=josh

---
 widget/cocoa/nsChildView.h    |   4 --
 widget/cocoa/nsChildView.mm   |   4 --
 widget/cocoa/nsCocoaWindow.mm | 109 ----------------------------------
 3 files changed, 117 deletions(-)

diff --git a/widget/cocoa/nsChildView.h b/widget/cocoa/nsChildView.h
index 01a6e5d0e06d..941bd3405bee 100644
--- a/widget/cocoa/nsChildView.h
+++ b/widget/cocoa/nsChildView.h
@@ -198,10 +198,6 @@ typedef NSInteger NSEventGestureAxis;
 - (NSEventPhase)momentumPhase;
 @end
 
-@protocol EventRedirection
-  - (NSView*)targetView;
-@end
-
 @interface ChildView : NSView<
 #ifdef ACCESSIBILITY
                               mozAccessible,
diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
index 19057c1c0741..6804b60f679d 100644
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -5483,10 +5483,6 @@ ChildViewMouseTracker::ViewForEvent(NSEvent* aEvent)
   NSPoint windowEventLocation = nsCocoaUtils::EventLocationForWindow(aEvent, window);
   NSView* view = [[[window contentView] superview] hitTest:windowEventLocation];
 
-  while([view conformsToProtocol:@protocol(EventRedirection)]) {
-    view = [(id<EventRedirection>)view targetView];
-  }
-
   if (![view isKindOfClass:[ChildView class]])
     return nil;
 
diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm
index 374486c0e586..5a7f4f75eb0f 100644
--- a/widget/cocoa/nsCocoaWindow.mm
+++ b/widget/cocoa/nsCocoaWindow.mm
@@ -2787,91 +2787,6 @@ static const NSString* kStateShowsToolbarButton = @"showsToolbarButton";
 
 @end
 
-@interface TitlebarMouseHandlingView : NSView<EventRedirection>
-{
-  ToolbarWindow* mWindow; // weak
-  BOOL mProcessingRightMouseDown;
-}
-
-- (id)initWithWindow:(ToolbarWindow*)aWindow;
-@end
-
-@implementation TitlebarMouseHandlingView
-
-- (id)initWithWindow:(ToolbarWindow*)aWindow
-{
-  if ((self = [super initWithFrame:[aWindow titlebarRect]])) {
-    mWindow = aWindow;
-    [self setAutoresizingMask:(NSViewWidthSizable | NSViewMinYMargin)];
-    [ChildView registerViewForDraggedTypes:self];
-    mProcessingRightMouseDown = NO;
-  }
-  return self;
-}
-
-- (NSView*)targetView
-{
-  return [mWindow mainChildView];
-}
-
-- (BOOL)mouseDownCanMoveWindow
-{
-  return [mWindow isMovableByWindowBackground];
-}
-
-// We redirect many types of events to the window's mainChildView simply by
-// passing the event object to the respective handler method. We don't need any
-// coordinate transformations because event coordinates are relative to the
-// window.
-// We only need to handle event types whose target NSView is determined by the
-// event's position. We don't need to handle key events and NSMouseMoved events
-// because those are only sent to the window's first responder. This view
-// doesn't override acceptsFirstResponder, so it will never receive those kinds
-// of events.
-
-- (void)mouseMoved:(NSEvent*)aEvent            { [[self targetView] mouseMoved:aEvent]; }
-- (void)mouseDown:(NSEvent*)aEvent             { [[self targetView] mouseDown:aEvent]; }
-- (void)mouseUp:(NSEvent*)aEvent               { [[self targetView] mouseUp:aEvent]; }
-- (void)mouseDragged:(NSEvent*)aEvent          { [[self targetView] mouseDragged:aEvent]; }
-- (void)rightMouseDown:(NSEvent*)aEvent
-{
-  // To avoid recursion...
-  if (mProcessingRightMouseDown)
-    return;
-  mProcessingRightMouseDown = YES;
-  [[self targetView] rightMouseDown:aEvent];
-  mProcessingRightMouseDown = NO;
-}
-- (void)rightMouseUp:(NSEvent*)aEvent          { [[self targetView] rightMouseUp:aEvent]; }
-- (void)rightMouseDragged:(NSEvent*)aEvent     { [[self targetView] rightMouseDragged:aEvent]; }
-- (void)otherMouseDown:(NSEvent*)aEvent        { [[self targetView] otherMouseDown:aEvent]; }
-- (void)otherMouseUp:(NSEvent*)aEvent          { [[self targetView] otherMouseUp:aEvent]; }
-- (void)otherMouseDragged:(NSEvent*)aEvent     { [[self targetView] otherMouseDragged:aEvent]; }
-- (void)scrollWheel:(NSEvent*)aEvent           { [[self targetView] scrollWheel:aEvent]; }
-- (void)swipeWithEvent:(NSEvent*)aEvent        { [[self targetView] swipeWithEvent:aEvent]; }
-- (void)beginGestureWithEvent:(NSEvent*)aEvent { [[self targetView] beginGestureWithEvent:aEvent]; }
-- (void)magnifyWithEvent:(NSEvent*)aEvent      { [[self targetView] magnifyWithEvent:aEvent]; }
-- (void)rotateWithEvent:(NSEvent*)aEvent       { [[self targetView] rotateWithEvent:aEvent]; }
-- (void)endGestureWithEvent:(NSEvent*)aEvent   { [[self targetView] endGestureWithEvent:aEvent]; }
-- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
-  { return [[self targetView] draggingEntered:sender]; }
-- (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender
-  { return [[self targetView] draggingUpdated:sender]; }
-- (void)draggingExited:(id <NSDraggingInfo>)sender
-  { [[self targetView] draggingExited:sender]; }
-- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
-  { return [[self targetView] performDragOperation:sender]; }
-- (void)draggedImage:(NSImage *)anImage endedAt:(NSPoint)aPoint operation:(NSDragOperation)operation
-  { [[self targetView] draggedImage:anImage endedAt:aPoint operation:operation]; }
-- (NSDragOperation)draggingSourceOperationMaskForLocal:(BOOL)isLocal
-  { return [[self targetView] draggingSourceOperationMaskForLocal:isLocal]; }
-- (NSArray *)namesOfPromisedFilesDroppedAtDestination:(NSURL*)dropDestination
-  { return [[self targetView] namesOfPromisedFilesDroppedAtDestination:dropDestination]; }
-- (NSMenu*)menuForEvent:(NSEvent*)aEvent
-  { return [[self targetView] menuForEvent:aEvent]; }
-
-@end
-
 // This class allows us to exercise control over the window's title bar. This
 // allows for a "unified toolbar" look, and for extending the content area into
 // the title bar. It works like this:
@@ -2908,11 +2823,6 @@ static const NSString* kStateShowsToolbarButton = @"showsToolbarButton";
 // to the containing window - the other direction doesn't work. That's why the
 // toolbar height is cached in the ToolbarWindow but nsNativeThemeCocoa can simply
 // query the window for its titlebar height when drawing the toolbar.
-@interface ToolbarWindow(Private)
-- (void)installTitlebarMouseHandlingView;
-- (void)uninstallTitlebarMouseHandlingView;
-@end;
-
 @implementation ToolbarWindow
 
 - (id)initWithContentRect:(NSRect)aContentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)aBufferingType defer:(BOOL)aFlag
@@ -3086,28 +2996,9 @@ static const NSString* kStateShowsToolbarButton = @"showsToolbarButton";
     // content area, so that event would have wrong position information. So
     // we'll send a mouse move event with the correct new position.
     ChildViewMouseTracker::ResendLastMouseMoveEvent();
-
-    if (aState) {
-      [self installTitlebarMouseHandlingView];
-    } else {
-      [self uninstallTitlebarMouseHandlingView];
-    }
   }
 }
 
-- (void)installTitlebarMouseHandlingView
-{
-  mTitlebarView = [[TitlebarMouseHandlingView alloc] initWithWindow:self];
-  [[[self contentView] superview] addSubview:mTitlebarView positioned:NSWindowBelow relativeTo:nil];
-}
-
-- (void)uninstallTitlebarMouseHandlingView
-{
-  [mTitlebarView removeFromSuperview];
-  [mTitlebarView release];
-  mTitlebarView = nil;
-}
-
 // Returning YES here makes the setShowsToolbarButton method work even though
 // the window doesn't contain an NSToolbar.
 - (BOOL)_hasToolbar

From 3b948a3f0a686efd7b6f7f9ff830968f64fd45ea Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Thu, 23 May 2013 16:49:16 +0200
Subject: [PATCH 145/230] Bug 676241 part 3: Remove titlebar drawing. r=josh

---
 widget/cocoa/nsChildView.h    |  17 +----
 widget/cocoa/nsChildView.mm   | 120 +++-------------------------------
 widget/cocoa/nsCocoaWindow.mm |  15 +----
 3 files changed, 12 insertions(+), 140 deletions(-)

diff --git a/widget/cocoa/nsChildView.h b/widget/cocoa/nsChildView.h
index 941bd3405bee..3acbea60c6e7 100644
--- a/widget/cocoa/nsChildView.h
+++ b/widget/cocoa/nsChildView.h
@@ -299,12 +299,6 @@ typedef NSInteger NSEventGestureAxis;
 
 - (void)updateWindowDraggableStateOnMouseMove:(NSEvent*)theEvent;
 
-- (void)maybeDrawInTitlebar;
-
-- (void)drawRect:(NSRect)aRect inTitlebarContext:(CGContextRef)aContext;
-
-- (void)drawTitlebar:(NSRect)aRect inTitlebarContext:(CGContextRef)aContext;
-
 - (void)sendMouseEnterOrExitEvent:(NSEvent*)aEvent
                             enter:(BOOL)aEnter
                              type:(nsMouseEvent::exitType)aType;
@@ -504,7 +498,7 @@ public:
   virtual bool      DispatchWindowEvent(nsGUIEvent& event);
 
   void WillPaintWindow();
-  bool PaintWindow(nsIntRegion aRegion, bool aIsAlternate);
+  bool PaintWindow(nsIntRegion aRegion);
 
 #ifdef ACCESSIBILITY
   already_AddRefed<mozilla::a11y::Accessible> GetDocumentAccessible();
@@ -539,10 +533,6 @@ public:
 
   NS_IMETHOD        ReparentNativeWidget(nsIWidget* aNewParent);
 
-  CGContextRef      GetCGContextForTitlebarDrawing(NSSize aSize);
-
-  virtual void      WillPaint() MOZ_OVERRIDE;
-
   mozilla::widget::TextInputHandler* GetTextInputHandler()
   {
     return mTextInputHandler;
@@ -565,8 +555,6 @@ public:
     return nsCocoaUtils::DevPixelsToCocoaPoints(aRect, BackingScaleFactor());
   }
 
-  void CompositeTitlebar(const gfxSize& aSize, CGContextRef aContext);
-
 protected:
 
   void              ReportMoveEvent();
@@ -623,9 +611,6 @@ protected:
   nsRefPtr<mozilla::gl::TextureImage> mResizerImage;
   nsRefPtr<mozilla::gl::TextureImage> mCornerMaskImage;
 
-  nsRefPtr<gfxQuartzSurface> mTitlebarSurf;
-  gfxSize mTitlebarSize;
-
   // Cached value of [mView backingScaleFactor], to avoid sending two obj-c
   // messages (respondsToSelector, backingScaleFactor) every time we need to
   // use it.
diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
index 6804b60f679d..9459ed889b8d 100644
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -138,7 +138,7 @@ uint32_t nsChildView::sLastInputEventCount = 0;
 
 - (void)processPendingRedraws;
 
-- (void)drawRect:(NSRect)aRect inContext:(CGContextRef)aContext alternate:(BOOL)aIsAlternate;
+- (void)drawRect:(NSRect)aRect inContext:(CGContextRef)aContext;
 
 - (BOOL)isUsingOpenGL;
 - (void)drawUsingOpenGL;
@@ -694,40 +694,6 @@ nsChildView::ReparentNativeWidget(nsIWidget* aNewParent)
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
 }
 
-CGContextRef
-nsChildView::GetCGContextForTitlebarDrawing(NSSize aSize)
-{
-  gfxSize titlebarSize(aSize.width, aSize.height);
-  if (!mTitlebarSurf || mTitlebarSize != titlebarSize) {
-    mTitlebarSize = titlebarSize;
-    mTitlebarSurf = new gfxQuartzSurface(titlebarSize, gfxASurface::ImageFormatARGB32);
-  }
-  return mTitlebarSurf->GetCGContext();
-}
-
-void
-nsChildView::WillPaint()
-{
-  [(ChildView*)mView maybeDrawInTitlebar];
-}
-
-void
-nsChildView::CompositeTitlebar(const gfxSize& aSize, CGContextRef aContext)
-{
-  NS_ASSERTION(mTitlebarSurf, "Must have titlebar surface");
-  if (!mTitlebarSurf) {
-    return;
-  }
-
-  CGImageRef image = CGBitmapContextCreateImage(mTitlebarSurf->GetCGContext());
-
-  CGContextDrawImage(aContext, 
-                     CGRectMake(0, 0, mTitlebarSize.width, mTitlebarSize.height), 
-                     image);
-
-  CGImageRelease(image);
-}
-
 void nsChildView::ResetParent()
 {
   if (!mOnDestroyCalled) {
@@ -1555,7 +1521,7 @@ void nsChildView::WillPaintWindow()
   }
 }
 
-bool nsChildView::PaintWindow(nsIntRegion aRegion, bool aIsAlternate)
+bool nsChildView::PaintWindow(nsIntRegion aRegion)
 {
   nsCOMPtr<nsIWidget> widget = GetWidgetForListenerEvents();
 
@@ -1566,11 +1532,7 @@ bool nsChildView::PaintWindow(nsIntRegion aRegion, bool aIsAlternate)
   bool returnValue = false;
   bool oldDispatchPaint = mIsDispatchPaint;
   mIsDispatchPaint = true;
-  uint32_t flags = 0;
-  if (aIsAlternate) {
-    flags |= nsIWidgetListener::PAINT_IS_ALTERNATE; 
-  }
-  returnValue = listener->PaintWindow(widget, aRegion, flags);
+  returnValue = listener->PaintWindow(widget, aRegion, 0);
 
   listener = widget->GetWidgetListener();
   if (listener) {
@@ -2521,15 +2483,6 @@ NSEvent* gLastDragMouseDownEvent = nil;
   } else {
     [super setNeedsDisplayInRect:aRect];
   }
-
-  if ([[self window] isKindOfClass:[ToolbarWindow class]]) {
-    ToolbarWindow* window = (ToolbarWindow*)[self window];
-    if ([window drawsContentsIntoWindowFrame]) {
-      // Tell it to mark the rect in the titlebar as dirty.
-      NSView* borderView = [[window contentView] superview];
-      [window setTitlebarNeedsDisplayInRect:[self convertRect:aRect toView:borderView]];
-    }
-  }
 }
 
 - (NSString*)description
@@ -2734,56 +2687,12 @@ NSEvent* gLastDragMouseDownEvent = nil;
   }
 }
 
-- (void)maybeDrawInTitlebar
-{
-  if (!mGeckoChild) {
-    return;
-  }
-  NSWindow* win = [self window];
-  if (!win || ![win isKindOfClass:[ToolbarWindow class]]) {
-    return;
-  }
-  ToolbarWindow* toolbarWin = (ToolbarWindow*)win;
-  if (![toolbarWin drawsContentsIntoWindowFrame]) {
-    return;
-  }
-
-  // Check the parts of the frame view occupied by the titlebar to see if all
-  // or part of it is "dirty" (needs to be redrawn).  This is effectively the
-  // top 22 pixels of the frame view, and is not the same thing as the
-  // "unified toolbar".  Our ChildView ('self') is the same size as the frame
-  // view and covers it.  Our ChildView has a flipped coordinate system, but
-  // the frame view doesn't.
-  NSRect titlebarRect = [toolbarWin titlebarRect];
-  NSView* frameView = [[toolbarWin contentView] superview];
-  NSRect dirtyRect = NSIntersectionRect([frameView _dirtyRect], titlebarRect);
-  // Flip dirtyRect's coordinate system.
-  dirtyRect.origin.y = [frameView bounds].size.height -
-    dirtyRect.origin.y - dirtyRect.size.height;
-  if (NSIsEmptyRect(dirtyRect)) {
-    return;
-  }
-
-  CGContextRef context = mGeckoChild->GetCGContextForTitlebarDrawing(titlebarRect.size);
-  CGContextSaveGState(context);
-  [self drawRect:dirtyRect inTitlebarContext:context];
-  CGContextRestoreGState(context);
-}
-
-- (void)drawTitlebar:(NSRect)aRect inTitlebarContext:(CGContextRef)aContext
-{
-  if (mGeckoChild) {
-    gfxSize size(aRect.size.width, aRect.size.height);
-    mGeckoChild->CompositeTitlebar(size, aContext);
-  }
-}
-
 // The display system has told us that a portion of our view is dirty. Tell
 // gecko to paint it
 - (void)drawRect:(NSRect)aRect
 {
   CGContextRef cgContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
-  [self drawRect:aRect inContext:cgContext alternate:false];
+  [self drawRect:aRect inContext:cgContext];
 
   // If we're a transparent window and our contents have changed, we need
   // to make sure the shadow is updated to the new contents.
@@ -2792,18 +2701,7 @@ NSEvent* gLastDragMouseDownEvent = nil;
   }
 }
 
-- (void)drawRect:(NSRect)aRect inTitlebarContext:(CGContextRef)aContext
-{
-  if (!mGeckoChild)
-    return;
-
-  // Title bar drawing only works if we really draw into aContext, which only
-  // the basic layer manager will do.
-  nsBaseWidget::AutoUseBasicLayerManager setupLayerManager(mGeckoChild);
-  [self drawRect:aRect inContext:aContext alternate:true];
-}
-
-- (void)drawRect:(NSRect)aRect inContext:(CGContextRef)aContext alternate:(BOOL)aIsAlternate
+- (void)drawRect:(NSRect)aRect inContext:(CGContextRef)aContext
 {
   if (!mGeckoChild || !mGeckoChild->IsVisible())
     return;
@@ -2850,7 +2748,7 @@ NSEvent* gLastDragMouseDownEvent = nil;
   const NSRect *rects;
   NSInteger count, i;
   [[NSView focusView] getRectsBeingDrawn:&rects count:&count];
-  if (count < MAX_RECTS_IN_REGION && !aIsAlternate) {
+  if (count < MAX_RECTS_IN_REGION) {
     for (i = 0; i < count; ++i) {
       // Add the rect to the region.
       NSRect r = [self convertRect:rects[i] fromView:[NSView focusView]];
@@ -2897,14 +2795,14 @@ NSEvent* gLastDragMouseDownEvent = nil;
   if (mGeckoChild->GetLayerManager()->GetBackendType() == LAYERS_BASIC) {
     nsBaseWidget::AutoLayerManagerSetup
       setupLayerManager(mGeckoChild, targetContext, BUFFER_NONE);
-    painted = mGeckoChild->PaintWindow(region, aIsAlternate);
+    painted = mGeckoChild->PaintWindow(region);
   } else if (mGeckoChild->GetLayerManager()->GetBackendType() == LAYERS_CLIENT) {
     // We only need this so that we actually get DidPaintWindow fired
     if (Compositor::GetBackend() == LAYERS_BASIC) {
       ClientLayerManager *manager = static_cast<ClientLayerManager*>(mGeckoChild->GetLayerManager());
       manager->SetShadowTarget(targetContext);
     }
-    painted = mGeckoChild->PaintWindow(region, aIsAlternate);
+    painted = mGeckoChild->PaintWindow(region);
   }
 
   // Force OpenGL to refresh the very first time we draw. This works around a
@@ -2977,7 +2875,7 @@ NSEvent* gLastDragMouseDownEvent = nil;
   [glContext setView:self];
   [glContext update];
 
-  mGeckoChild->PaintWindow(region, false);
+  mGeckoChild->PaintWindow(region);
 
   // Force OpenGL to refresh the very first time we draw. This works around a
   // Mac OS X bug that stops windows updating on OS X when we use OpenGL.
diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm
index 5a7f4f75eb0f..949055713a5d 100644
--- a/widget/cocoa/nsCocoaWindow.mm
+++ b/widget/cocoa/nsCocoaWindow.mm
@@ -2902,8 +2902,6 @@ static const NSString* kStateShowsToolbarButton = @"showsToolbarButton";
   } else {
     [borderView setNeedsDisplayInRect:rect];
   }
-
-  [[self mainChildView] maybeDrawInTitlebar];
 }
 
 - (NSRect)titlebarRect
@@ -3132,17 +3130,8 @@ static void
 TitlebarDrawCallback(void* aInfo, CGContextRef aContext)
 {
   ToolbarWindow *window = (ToolbarWindow*)aInfo;
-  NSRect titlebarRect = [window titlebarRect];
-
-  if ([window drawsContentsIntoWindowFrame]) {
-    ChildView* view = [window mainChildView];
-    if (!view)
-      return;
-
-    CGContextTranslateCTM(aContext, 0.0f, [window frame].size.height - titlebarRect.size.height);
-
-    [view drawTitlebar:[window frame] inTitlebarContext:aContext];
-  } else {
+  if (![window drawsContentsIntoWindowFrame]) {
+    NSRect titlebarRect = [window titlebarRect];
     BOOL isMain = [window isMainWindow];
     NSColor *titlebarColor = [window titlebarColorForActiveWindow:isMain];
     if (!titlebarColor) {

From 28619d13b16b2804f4119eacabec46d670313981 Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Thu, 23 May 2013 19:53:03 +0200
Subject: [PATCH 146/230] Bug 676241 - Back out _drawTitleBar swizzling from UX
 (originally landed in bug 865374 and bug 868211) because it's no longer
 necessary.

---
 widget/cocoa/nsCocoaWindow.h  |  5 ----
 widget/cocoa/nsCocoaWindow.mm | 47 -----------------------------------
 2 files changed, 52 deletions(-)

diff --git a/widget/cocoa/nsCocoaWindow.h b/widget/cocoa/nsCocoaWindow.h
index 45161fa4c65d..90f29fed15ef 100644
--- a/widget/cocoa/nsCocoaWindow.h
+++ b/widget/cocoa/nsCocoaWindow.h
@@ -115,11 +115,6 @@ typedef struct _nsCocoaWindowList {
 - (void)setBottomCornerRounded:(BOOL)rounded;
 - (BOOL)bottomCornerRounded;
 
-// Present since at least OS X 10.5.  The OS calls this method on NSWindow
-// (and its subclasses) to find out which NSFrameView subclass to instantiate
-// to create its "frame view".
-+ (Class)frameViewClassForStyleMask:(NSUInteger)styleMask;
-
 @end
 
 @interface PopupWindow : BaseWindow
diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm
index 949055713a5d..bfdafb36a925 100644
--- a/widget/cocoa/nsCocoaWindow.mm
+++ b/widget/cocoa/nsCocoaWindow.mm
@@ -2485,55 +2485,8 @@ GetDPI(NSWindow* aWindow)
 - (void)cursorUpdated:(NSEvent*)aEvent;
 @end
 
-@interface NSView(FrameViewMethodSwizzling)
-- (void)FrameViewClass__drawTitleBar:(NSRect)aRect;
-@end
-
-@implementation NSView(FrameViewMethodSwizzling)
-
-- (void)FrameViewClass__drawTitleBar:(NSRect)aRect
-{
-  NSWindow* window = [self window];
-  if ([window isKindOfClass:[BaseWindow class]] &&
-      [(BaseWindow*)window drawsContentsIntoWindowFrame]) {
-    // Do not draw the title.
-    return;
-  }
-  [self FrameViewClass__drawTitleBar:aRect];
-}
-
-@end
-
-static NSMutableSet *gSwizzledFrameViewClasses = nil;
-
 @implementation BaseWindow
 
-// The frame of a window is implemented using undocumented NSView subclasses.
-// We disable window title drawing by overriding the _drawTitleBar: method on
-// these frame view classes. The class which is used for a window is
-// determined in the window's frameViewClassForStyleMask: method, so this is
-// where we make sure that we have swizzled the method on all encountered
-// classes.
-+ (Class)frameViewClassForStyleMask:(NSUInteger)styleMask
-{
-  Class frameViewClass = [super frameViewClassForStyleMask:styleMask];
-
-  if (!gSwizzledFrameViewClasses) {
-    gSwizzledFrameViewClasses = [[NSMutableSet setWithCapacity:3] retain];
-    if (!gSwizzledFrameViewClasses) {
-      return frameViewClass;
-    }
-  }
-
-  if (![gSwizzledFrameViewClasses containsObject:frameViewClass]) {
-    nsToolkit::SwizzleMethods(frameViewClass, @selector(_drawTitleBar:),
-                              @selector(FrameViewClass__drawTitleBar:));
-    [gSwizzledFrameViewClasses addObject:frameViewClass];
-  }
-
-  return frameViewClass;
-}
-
 - (id)initWithContentRect:(NSRect)aContentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)aBufferingType defer:(BOOL)aFlag
 {
   [super initWithContentRect:aContentRect styleMask:aStyle backing:aBufferingType defer:aFlag];

From 5c8a7ce3f9de2e0cefb7f767003b985b2acb282f Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Thu, 23 May 2013 16:49:17 +0200
Subject: [PATCH 147/230] Bug 676241 part 4: Make the window's contentView
 cover the whole window in drawsContentsIntoWindowFrame mode. r=smichaud

---
 widget/cocoa/nsCocoaWindow.h  |  4 ++
 widget/cocoa/nsCocoaWindow.mm | 70 +++++++++++++++++++++++++++++++++--
 2 files changed, 71 insertions(+), 3 deletions(-)

diff --git a/widget/cocoa/nsCocoaWindow.h b/widget/cocoa/nsCocoaWindow.h
index 90f29fed15ef..c488f67d5b79 100644
--- a/widget/cocoa/nsCocoaWindow.h
+++ b/widget/cocoa/nsCocoaWindow.h
@@ -115,6 +115,10 @@ typedef struct _nsCocoaWindowList {
 - (void)setBottomCornerRounded:(BOOL)rounded;
 - (BOOL)bottomCornerRounded;
 
+// Present in the same form on OS X since at least OS X 10.5.
+- (NSRect)contentRectForFrameRect:(NSRect)windowFrame styleMask:(NSUInteger)windowStyle;
+- (NSRect)frameRectForContentRect:(NSRect)windowContentRect styleMask:(NSUInteger)windowStyle;
+
 @end
 
 @interface PopupWindow : BaseWindow
diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm
index bfdafb36a925..ba4ade3eb6c9 100644
--- a/widget/cocoa/nsCocoaWindow.mm
+++ b/widget/cocoa/nsCocoaWindow.mm
@@ -2483,15 +2483,16 @@ GetDPI(NSWindow* aWindow)
 @interface BaseWindow(Private)
 - (void)removeTrackingArea;
 - (void)cursorUpdated:(NSEvent*)aEvent;
+- (void)updateContentViewSize;
 @end
 
 @implementation BaseWindow
 
 - (id)initWithContentRect:(NSRect)aContentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)aBufferingType defer:(BOOL)aFlag
 {
+  mDrawsIntoWindowFrame = NO;
   [super initWithContentRect:aContentRect styleMask:aStyle backing:aBufferingType defer:aFlag];
   mState = nil;
-  mDrawsIntoWindowFrame = NO;
   mActiveTitlebarColor = nil;
   mInactiveTitlebarColor = nil;
   mScheduledShadowInvalidation = NO;
@@ -2548,6 +2549,7 @@ static const NSString* kStateShowsToolbarButton = @"showsToolbarButton";
 - (void)setDrawsContentsIntoWindowFrame:(BOOL)aState
 {
   mDrawsIntoWindowFrame = aState;
+  [self updateContentViewSize];
 }
 
 - (BOOL)drawsContentsIntoWindowFrame
@@ -2656,6 +2658,64 @@ static const NSString* kStateShowsToolbarButton = @"showsToolbarButton";
   // Nothing to do here, but NSTrackingArea wants us to implement this method.
 }
 
+- (void)updateContentViewSize
+{
+  NSRect rect = [self contentRectForFrameRect:[self frame]];
+  [[self contentView] setFrameSize:rect.size];
+}
+
+// Override methods that translate between content rect and frame rect.
+- (NSRect)contentRectForFrameRect:(NSRect)aRect
+{
+  if ([self drawsContentsIntoWindowFrame]) {
+    return aRect;
+  }
+  return [super contentRectForFrameRect:aRect];
+}
+
+- (NSRect)contentRectForFrameRect:(NSRect)aRect styleMask:(NSUInteger)aMask
+{
+  if ([self drawsContentsIntoWindowFrame]) {
+    return aRect;
+  }
+  if ([super respondsToSelector:@selector(contentRectForFrameRect:styleMask:)]) {
+    return [super contentRectForFrameRect:aRect styleMask:aMask];
+  } else {
+    return [NSWindow contentRectForFrameRect:aRect styleMask:aMask];
+  }
+}
+
+- (NSRect)frameRectForContentRect:(NSRect)aRect
+{
+  if ([self drawsContentsIntoWindowFrame]) {
+    return aRect;
+  }
+  return [super frameRectForContentRect:aRect];
+}
+
+- (NSRect)frameRectForContentRect:(NSRect)aRect styleMask:(NSUInteger)aMask
+{
+  if ([self drawsContentsIntoWindowFrame]) {
+    return aRect;
+  }
+  if ([super respondsToSelector:@selector(frameRectForContentRect:styleMask:)]) {
+    return [super frameRectForContentRect:aRect styleMask:aMask];
+  } else {
+    return [NSWindow frameRectForContentRect:aRect styleMask:aMask];
+  }
+}
+
+- (void)setContentView:(NSView*)aView
+{
+  [super setContentView:aView];
+
+  // Now move the contentView to the bottommost layer so that it's guaranteed
+  // to be under the window buttons.
+  NSView* frameView = [aView superview];
+  [aView removeFromSuperview];
+  [frameView addSubview:aView positioned:NSWindowBelow relativeTo:nil];
+}
+
 - (BOOL)respondsToSelector:(SEL)aSelector
 {
   // Claim the window doesn't respond to this so that the system
@@ -2883,8 +2943,12 @@ static const NSString* kStateShowsToolbarButton = @"showsToolbarButton";
 
   mUnifiedToolbarHeight = aHeight;
 
-  // Update sheet positioning hint.
-  [self setContentBorderThickness:mUnifiedToolbarHeight - [self titlebarHeight] forEdge:NSMaxYEdge];
+  // Update sheet positioning hint
+  NSRect frameRect = [self frame];
+  NSRect originalContentRect = [NSWindow contentRectForFrameRect:frameRect styleMask:[self styleMask]];
+  CGFloat originalTitlebarHeight = NSMaxY(frameRect) - NSMaxY(originalContentRect);
+  CGFloat topMargin = mUnifiedToolbarHeight - originalTitlebarHeight;
+  [self setContentBorderThickness:topMargin forEdge:NSMaxYEdge];
 
   // Redraw the title bar. If we're inside painting, we'll do it right now,
   // otherwise we'll just invalidate it.

From 1eb0c907850c5eb8a78a6965a4ea5614a6d238a7 Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Thu, 23 May 2013 16:55:50 +0200
Subject: [PATCH 148/230] Bug 676241 part 5: Don't invalidate unnecessarily in
 OMTC mode. r=mattwoodrow

---
 widget/cocoa/nsChildView.mm | 50 ++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
index 9459ed889b8d..d08c7821d43a 100644
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -140,6 +140,7 @@ uint32_t nsChildView::sLastInputEventCount = 0;
 
 - (void)drawRect:(NSRect)aRect inContext:(CGContextRef)aContext;
 
+- (BOOL)isUsingMainThreadOpenGL;
 - (BOOL)isUsingOpenGL;
 - (void)drawUsingOpenGL;
 - (void)drawUsingOpenGLCallback;
@@ -2461,11 +2462,13 @@ NSEvent* gLastDragMouseDownEvent = nil;
 
 - (void)setNeedsDisplayInRect:(NSRect)aRect
 {
-  if (![[self window] isVisible])
+  if (![self isUsingOpenGL]) {
+    [super setNeedsDisplayInRect:aRect];
     return;
+  }
 
-  if ([self isUsingOpenGL]) {
-    // Draw the frame outside of setNeedsDisplayInRect to prevent us from
+  if ([[self window] isVisible] && [self isUsingMainThreadOpenGL]) {
+    // Draw without calling drawRect. This prevent us from
     // needing to access the normal window buffer surface unnecessarily, so we
     // waste less time synchronizing the two surfaces. (These synchronizations
     // show up in a profiler as CGSDeviceLock / _CGSLockWindow /
@@ -2480,8 +2483,6 @@ NSEvent* gLastDragMouseDownEvent = nil;
                  afterDelay:0
                     inModes:[NSArray arrayWithObject:NSRunLoopCommonModes]];
     }
-  } else {
-    [super setNeedsDisplayInRect:aRect];
   }
 }
 
@@ -2805,17 +2806,6 @@ NSEvent* gLastDragMouseDownEvent = nil;
     painted = mGeckoChild->PaintWindow(region);
   }
 
-  // Force OpenGL to refresh the very first time we draw. This works around a
-  // Mac OS X bug that stops windows updating on OS X when we use OpenGL.
-  LayerManager *layerManager = mGeckoChild->GetLayerManager(nullptr);
-  if (mUsingOMTCompositor && painted && !mDidForceRefreshOpenGL &&
-      layerManager->AsLayerManagerComposite()) {
-    if (!mDidForceRefreshOpenGL) {
-      [self performSelector:@selector(forceRefreshOpenGL) withObject:nil afterDelay:0];
-      mDidForceRefreshOpenGL = YES;
-    }
-  }
-
   if (!painted && [self isOpaque]) {
     // Gecko refused to draw, but we've claimed to be opaque, so we have to
     // draw something--fill with white.
@@ -2843,7 +2833,7 @@ NSEvent* gLastDragMouseDownEvent = nil;
 #endif
 }
 
-- (BOOL)isUsingOpenGL
+- (BOOL)isUsingMainThreadOpenGL
 {
   if (!mGeckoChild || ![self window])
     return NO;
@@ -2851,6 +2841,14 @@ NSEvent* gLastDragMouseDownEvent = nil;
   return mGeckoChild->GetLayerManager(nullptr)->GetBackendType() == mozilla::layers::LAYERS_OPENGL;
 }
 
+- (BOOL)isUsingOpenGL
+{
+  if (!mGeckoChild || ![self window])
+    return NO;
+
+  return mGLContext || [self isUsingMainThreadOpenGL];
+}
+
 - (void)drawUsingOpenGL
 {
   PROFILER_LABEL("widget", "ChildView::drawUsingOpenGL");
@@ -2864,17 +2862,19 @@ NSEvent* gLastDragMouseDownEvent = nil;
   mGeckoChild->GetBounds(geckoBounds);
   nsIntRegion region(geckoBounds);
 
-  LayerManagerOGL *manager = static_cast<LayerManagerOGL*>(mGeckoChild->GetLayerManager(nullptr));
-  manager->SetClippingRegion(region);
-  NSOpenGLContext *glContext = (NSOpenGLContext *)manager->GetNSOpenGLContext();
+  if ([self isUsingMainThreadOpenGL]) {
+    LayerManagerOGL *manager = static_cast<LayerManagerOGL*>(mGeckoChild->GetLayerManager(nullptr));
+    manager->SetClippingRegion(region);
+    NSOpenGLContext *glContext = (NSOpenGLContext *)manager->GetNSOpenGLContext();
 
-  if (!mGLContext) {
-    [self setGLContext:glContext];
+    if (!mGLContext) {
+      [self setGLContext:glContext];
+    }
+
+    [glContext setView:self];
+    [glContext update];
   }
 
-  [glContext setView:self];
-  [glContext update];
-
   mGeckoChild->PaintWindow(region);
 
   // Force OpenGL to refresh the very first time we draw. This works around a

From 0193e2af913455e0ed8ad31e9ef74a8997271f4b Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Thu, 23 May 2013 16:49:17 +0200
Subject: [PATCH 149/230] Bug 676241 part 6/9/11: Correct titlebar drawing.
 r=bgirard, r=smichaud, r=mattwoodrow

---
 widget/cocoa/nsChildView.h    |  37 ++-
 widget/cocoa/nsChildView.mm   | 505 ++++++++++++++++++++++++++++------
 widget/cocoa/nsCocoaWindow.h  |   2 +
 widget/cocoa/nsCocoaWindow.mm |   9 +
 4 files changed, 466 insertions(+), 87 deletions(-)

diff --git a/widget/cocoa/nsChildView.h b/widget/cocoa/nsChildView.h
index 3acbea60c6e7..7c3b9be26ffb 100644
--- a/widget/cocoa/nsChildView.h
+++ b/widget/cocoa/nsChildView.h
@@ -279,6 +279,10 @@ typedef NSInteger NSEventGestureAxis;
 
   // Whether this uses off-main-thread compositing.
   BOOL mUsingOMTCompositor;
+
+  // The mask image that's used when painting into the titlebar using basic
+  // CGContext painting (i.e. non-accelerated).
+  CGImageRef mTopLeftCornerMask;
 }
 
 // class initialization
@@ -316,6 +320,8 @@ typedef NSInteger NSEventGestureAxis;
 - (void)setGLContext:(NSOpenGLContext *)aGLContext;
 - (void)preRender:(NSOpenGLContext *)aGLContext;
 
+- (BOOL)isCoveringTitlebar;
+
 // Simple gestures support
 //
 // XXX - The swipeWithEvent, beginGestureWithEvent, magnifyWithEvent,
@@ -538,6 +544,8 @@ public:
     return mTextInputHandler;
   }
 
+  void              NotifyDirtyRegion(const nsIntRegion& aDirtyRegion);
+
   // unit conversion convenience functions
   int32_t           CocoaPointsToDevPixels(CGFloat aPts) {
     return nsCocoaUtils::CocoaPointsToDevPixels(aPts, BackingScaleFactor());
@@ -573,8 +581,20 @@ protected:
     return widget.forget();
   }
 
-  void MaybeDrawResizeIndicator(mozilla::layers::GLManager* aManager, nsIntRect aRect);
-  void MaybeDrawRoundedBottomCorners(mozilla::layers::GLManager* aManager, nsIntRect aRect);
+  // Overlay drawing functions for OpenGL drawing
+  void MaybeDrawResizeIndicator(mozilla::layers::GLManager* aManager, const nsIntRect& aRect);
+  void MaybeDrawRoundedCorners(mozilla::layers::GLManager* aManager, const nsIntRect& aRect);
+  void MaybeDrawTitlebar(mozilla::layers::GLManager* aManager, const nsIntRect& aRect);
+
+  // Redraw the contents of mTitlebarImageBuffer on the main thread, as
+  // determined by mDirtyTitlebarRegion.
+  void UpdateTitlebarImageBuffer();
+
+  // Upload the contents of mTitlebarImageBuffer to mTitlebarImage on the
+  // compositor thread, as determined by mUpdatedTitlebarRegion.
+  void UpdateTitlebarImage(mozilla::layers::GLManager* aManager, const nsIntRect& aRect);
+
+  nsIntRect RectContainingTitlebarControls();
 
   nsIWidget* GetWidgetForListenerEvents();
 
@@ -604,12 +624,25 @@ protected:
   nsIntRect mResizeIndicatorRect;
   bool mHasRoundedBottomCorners;
   int mDevPixelCornerRadius;
+  bool mIsCoveringTitlebar;
+  nsIntRect mTitlebarRect;
+
+  // The area of mTitlebarImageBuffer that needs to be redrawn during the next
+  // transaction. Accessed from any thread, protected by mEffectsLock.
+  nsIntRegion mUpdatedTitlebarRegion;
+
+  nsRefPtr<gfxQuartzSurface> mTitlebarImageBuffer;
 
   // Compositor thread only
   bool                  mFailedResizerImage;
   bool                  mFailedCornerMaskImage;
   nsRefPtr<mozilla::gl::TextureImage> mResizerImage;
   nsRefPtr<mozilla::gl::TextureImage> mCornerMaskImage;
+  nsRefPtr<mozilla::gl::TextureImage> mTitlebarImage;
+
+  // The area of mTitlebarImageBuffer that has changed and needs to be
+  // uploaded to to mTitlebarImage. Main thread only.
+  nsIntRegion           mDirtyTitlebarRegion;
 
   // Cached value of [mView backingScaleFactor], to avoid sending two obj-c
   // messages (respondsToSelector, backingScaleFactor) every time we need to
diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
index d08c7821d43a..015c9312b48b 100644
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -48,6 +48,7 @@
 
 #include "gfxContext.h"
 #include "gfxQuartzSurface.h"
+#include "gfxUtils.h"
 #include "nsRegion.h"
 #include "Layers.h"
 #include "LayerManagerOGL.h"
@@ -146,8 +147,12 @@ uint32_t nsChildView::sLastInputEventCount = 0;
 - (void)drawUsingOpenGLCallback;
 
 - (BOOL)hasRoundedBottomCorners;
-- (CGFloat)bottomCornerRadius;
-- (void)maybeClearBottomCorners;
+- (CGFloat)cornerRadius;
+- (void)clearCorners;
+
+// Overlay drawing functions for traditional CGContext drawing
+- (void)drawTitlebarHighlight;
+- (void)maskTopCornersInContext:(CGContextRef)aContext;
 
 // Called using performSelector:withObject:afterDelay:0 to release
 // aWidgetArray (and its contents) the next time through the run loop.
@@ -246,6 +251,7 @@ nsChildView::nsChildView() : nsBaseWidget()
 , mEffectsLock("WidgetEffects")
 , mShowsResizeIndicator(false)
 , mHasRoundedBottomCorners(false)
+, mIsCoveringTitlebar(false)
 , mFailedResizerImage(false)
 , mFailedCornerMaskImage(false)
 , mBackingScaleFactor(0.0)
@@ -1815,15 +1821,45 @@ nsChildView::GetThebesSurface()
   return mTempThebesSurface;
 }
 
+void
+nsChildView::NotifyDirtyRegion(const nsIntRegion& aDirtyRegion)
+{
+  if ([(ChildView*)mView isCoveringTitlebar]) {
+    // We store the dirty region so that we know what to repaint in the titlebar.
+    mDirtyTitlebarRegion.Or(mDirtyTitlebarRegion, aDirtyRegion);
+    mDirtyTitlebarRegion.And(mDirtyTitlebarRegion, RectContainingTitlebarControls());
+  }
+}
+
+static const CGFloat kTitlebarHighlightHeight = 6;
+
+nsIntRect
+nsChildView::RectContainingTitlebarControls()
+{
+  // Start with a 6px high strip at the top of the window for the highlight line.
+  NSRect rect = NSMakeRect(0, 0, [mView bounds].size.width,
+                           kTitlebarHighlightHeight);
+
+  // Add the rects of the titlebar controls.
+  for (id view in [(BaseWindow*)[mView window] titlebarControls]) {
+    rect = NSUnionRect(rect, [mView convertRect:[view bounds] fromView:view]);
+  }
+  return CocoaPointsToDevPixels(rect);
+}
+
 void
 nsChildView::PrepareWindowEffects()
 {
   MutexAutoLock lock(mEffectsLock);
   mShowsResizeIndicator = ShowsResizeIndicator(&mResizeIndicatorRect);
-  mHasRoundedBottomCorners = [mView isKindOfClass:[ChildView class]] &&
-                             [(ChildView*)mView hasRoundedBottomCorners];
-  CGFloat cornerRadius = [(ChildView*)mView bottomCornerRadius];
+  mHasRoundedBottomCorners = [(ChildView*)mView hasRoundedBottomCorners];
+  CGFloat cornerRadius = [(ChildView*)mView cornerRadius];
   mDevPixelCornerRadius = cornerRadius * BackingScaleFactor();
+  mIsCoveringTitlebar = [(ChildView*)mView isCoveringTitlebar];
+  if (mIsCoveringTitlebar) {
+    mTitlebarRect = RectContainingTitlebarControls();
+    UpdateTitlebarImageBuffer();
+  }
 }
 
 void
@@ -1831,6 +1867,7 @@ nsChildView::CleanupWindowEffects()
 {
   mResizerImage = nullptr;
   mCornerMaskImage = nullptr;
+  mTitlebarImage = nullptr;
 }
 
 void
@@ -1852,8 +1889,22 @@ nsChildView::DrawWindowOverlay(LayerManager* aManager, nsIntRect aRect)
     return;
   }
 
+  manager->gl()->PushScissorRect(aRect);
+
+  MaybeDrawTitlebar(manager, aRect);
   MaybeDrawResizeIndicator(manager, aRect);
-  MaybeDrawRoundedBottomCorners(manager, aRect);
+  MaybeDrawRoundedCorners(manager, aRect);
+
+  manager->gl()->PopScissorRect();
+}
+
+static void
+ClearRegion(gfxASurface* aSurface, nsIntRegion aRegion)
+{
+  nsRefPtr<gfxContext> ctx = new gfxContext(aSurface);
+  gfxUtils::ClipToRegion(ctx, aRegion);
+  ctx->SetOperator(gfxContext::OPERATOR_CLEAR);
+  ctx->Paint();
 }
 
 static void
@@ -1890,14 +1941,14 @@ DrawResizer(CGContextRef aCtx)
 }
 
 void
-nsChildView::MaybeDrawResizeIndicator(GLManager* aManager, nsIntRect aRect)
+nsChildView::MaybeDrawResizeIndicator(GLManager* aManager, const nsIntRect& aRect)
 {
+  MutexAutoLock lock(mEffectsLock);
   if (!mShowsResizeIndicator || mFailedResizerImage) {
     return;
   }
 
   if (!mResizerImage) {
-    MutexAutoLock lock(mEffectsLock);
     mResizerImage =
       aManager->gl()->CreateTextureImage(nsIntSize(mResizeIndicatorRect.width,
                                                    mResizeIndicatorRect.height),
@@ -1916,17 +1967,18 @@ nsChildView::MaybeDrawResizeIndicator(GLManager* aManager, nsIntRect aRect)
       return;
     }
 
-    // is the CairoSurface of a non QuartzSurface usable in the gfxQuartzSurface constructor ?
-    // answer seems to be NO (see comments on bug 675410
-    // this should not work for instance: new gfxQuartzSurface(asurf->CairoSurface(), false))
+    // We need a Quartz surface because DrawResizer wants a CGContext.
     if (asurf->GetType() != gfxASurface::SurfaceTypeQuartz) {
       NS_WARN_IF_FALSE(FALSE, "mResizerImage's surface is not Quartz");
+      mResizerImage->EndUpdate();
       mResizerImage = nullptr;
       mFailedResizerImage = true;
       return;
     }
-    nsRefPtr<gfxQuartzSurface> image = static_cast<gfxQuartzSurface*>(asurf);
 
+    ClearRegion(asurf, update);
+
+    nsRefPtr<gfxQuartzSurface> image = static_cast<gfxQuartzSurface*>(asurf);
     DrawResizer(image->GetCGContext());
 
     mResizerImage->EndUpdate();
@@ -1934,8 +1986,8 @@ nsChildView::MaybeDrawResizeIndicator(GLManager* aManager, nsIntRect aRect)
 
   NS_ABORT_IF_FALSE(mResizerImage, "Must have a texture allocated by now!");
 
-  float bottomX = aRect.x + aRect.width;
-  float bottomY = aRect.y + aRect.height;
+  float bottomX = aRect.XMost();
+  float bottomY = aRect.YMost();
 
   TextureImage::ScopedBindTexture texBind(mResizerImage, LOCAL_GL_TEXTURE0);
 
@@ -1954,6 +2006,195 @@ nsChildView::MaybeDrawResizeIndicator(GLManager* aManager, nsIntRect aRect)
   aManager->BindAndDrawQuad(program);
 }
 
+// Draw the highlight line at the top of the titlebar.
+// This function draws into the current NSGraphicsContext and assumes flippedness.
+static void
+DrawTitlebarHighlight(NSSize aWindowSize, CGFloat aRadius, CGFloat aDevicePixelWidth)
+{
+  [NSGraphicsContext saveGraphicsState];
+
+  // Set up the clip path. We start with the outer rectangle and cut out a
+  // slightly smaller inner rectangle with rounded corners.
+  // The outer corners of the resulting path will be square, but they will be
+  // masked away in a later step.
+  NSBezierPath* path = [NSBezierPath bezierPath];
+  [path setWindingRule:NSEvenOddWindingRule];
+  NSRect pathRect = NSMakeRect(0, 0, aWindowSize.width, kTitlebarHighlightHeight + 2);
+  [path appendBezierPathWithRect:pathRect];
+  pathRect = NSInsetRect(pathRect, aDevicePixelWidth, aDevicePixelWidth);
+  CGFloat innerRadius = aRadius - aDevicePixelWidth;
+  [path appendBezierPathWithRoundedRect:pathRect xRadius:innerRadius yRadius:innerRadius];
+  [path addClip];
+
+  // Now we fill the path with a subtle highlight gradient.
+  NSColor* topColor = [NSColor colorWithDeviceWhite:1.0 alpha:0.4];
+  NSColor* bottomColor = [NSColor colorWithDeviceWhite:1.0 alpha:0.0];
+  NSGradient* gradient = [[NSGradient alloc] initWithStartingColor:topColor endingColor:bottomColor];
+  [gradient drawInRect:NSMakeRect(0, 0, aWindowSize.width, kTitlebarHighlightHeight) angle:90];
+  [gradient release];
+
+  [NSGraphicsContext restoreGraphicsState];
+}
+
+// When this method is entered, mEffectsLock is already being held.
+void
+nsChildView::UpdateTitlebarImageBuffer()
+{
+  nsIntRegion dirtyTitlebarRegion = mDirtyTitlebarRegion;
+  mDirtyTitlebarRegion.SetEmpty();
+
+  if (!mTitlebarImageBuffer ||
+      mTitlebarImageBuffer->GetSize() != mTitlebarRect.Size()) {
+    dirtyTitlebarRegion = mTitlebarRect;
+
+    mTitlebarImageBuffer = new gfxQuartzSurface(mTitlebarRect.Size(),
+                                                gfxASurface::ImageFormatARGB32);
+  }
+
+  if (dirtyTitlebarRegion.IsEmpty())
+    return;
+
+  ClearRegion(mTitlebarImageBuffer, dirtyTitlebarRegion);
+
+  CGContextRef ctx = mTitlebarImageBuffer->GetCGContext();
+
+  double scale = BackingScaleFactor();
+  CGContextScaleCTM(ctx, scale, scale);
+  NSGraphicsContext* oldContext = [NSGraphicsContext currentContext];
+  [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithGraphicsPort:ctx flipped:YES]];
+
+  CGContextSaveGState(ctx);
+
+  BaseWindow* window = (BaseWindow*)[mView window];
+  NSView* frameView = [[window contentView] superview];
+  if (![frameView isFlipped]) {
+    CGContextTranslateCTM(ctx, 0, [frameView bounds].size.height);
+    CGContextScaleCTM(ctx, 1, -1);
+  }
+
+  // Draw the titlebar controls into the titlebar image.
+  for (id view in [window titlebarControls]) {
+    NSRect viewFrame = [view frame];
+    nsIntRect viewRect = CocoaPointsToDevPixels([mView convertRect:viewFrame fromView:frameView]);
+    nsIntRegion intersection;
+    intersection.And(dirtyTitlebarRegion, viewRect);
+    if (intersection.IsEmpty()) {
+      continue;
+    }
+    // All of the titlebar controls we're interested in are subclasses of
+    // NSButton.
+    if (![view isKindOfClass:[NSButton class]]) {
+      continue;
+    }
+    NSButton *button = (NSButton *) view;
+    id cellObject = [button cell];
+    if (![cellObject isKindOfClass:[NSCell class]]) {
+      continue;
+    }
+    NSCell *cell = (NSCell *) cellObject;
+
+    CGContextSaveGState(ctx);
+    CGContextTranslateCTM(ctx, viewFrame.origin.x, viewFrame.origin.y);
+
+    if ([view isFlipped]) {
+      CGContextTranslateCTM(ctx, 0, viewFrame.size.height);
+      CGContextScaleCTM(ctx, 1, -1);
+    }
+
+    NSRect intersectRect = DevPixelsToCocoaPoints(intersection.GetBounds());
+    [cell drawWithFrame:[view convertRect:intersectRect fromView:mView] inView:button];
+
+    CGContextRestoreGState(ctx);
+  }
+
+  CGContextRestoreGState(ctx);
+
+  DrawTitlebarHighlight([frameView bounds].size, [(ChildView*)mView cornerRadius],
+                        DevPixelsToCocoaPoints(1));
+
+  [NSGraphicsContext setCurrentContext:oldContext];
+
+  mUpdatedTitlebarRegion.Or(mUpdatedTitlebarRegion, dirtyTitlebarRegion);
+}
+
+// When this method is entered, mEffectsLock is already being held.
+void
+nsChildView::UpdateTitlebarImage(GLManager* aManager, const nsIntRect& aRect)
+{
+  nsIntRegion updatedTitlebarRegion;
+  updatedTitlebarRegion.And(mUpdatedTitlebarRegion, mTitlebarRect);
+  mUpdatedTitlebarRegion.SetEmpty();
+
+  if (!mTitlebarImage || mTitlebarImage->GetSize() != mTitlebarRect.Size()) {
+    updatedTitlebarRegion = mTitlebarRect;
+
+    mTitlebarImage =
+      aManager->gl()->CreateTextureImage(mTitlebarRect.Size(),
+                                         gfxASurface::CONTENT_COLOR_ALPHA,
+                                         LOCAL_GL_CLAMP_TO_EDGE,
+                                         TextureImage::UseNearestFilter);
+
+    // Creation of texture images can fail.
+    if (!mTitlebarImage)
+      return;
+  }
+
+  if (updatedTitlebarRegion.IsEmpty())
+    return;
+
+  gfxASurface *asurf = mTitlebarImage->BeginUpdate(updatedTitlebarRegion);
+  if (!asurf) {
+    mTitlebarImage = nullptr;
+    return;
+  }
+
+  nsRefPtr<gfxContext> ctx = new gfxContext(asurf);
+  ctx->SetOperator(gfxContext::OPERATOR_SOURCE);
+  ctx->SetSource(mTitlebarImageBuffer);
+  ctx->Paint();
+
+  mTitlebarImage->EndUpdate();
+}
+
+// This method draws an overlay in the top of the window which contains the
+// titlebar controls (e.g. close, min, zoom, fullscreen) and the titlebar
+// highlight effect.
+// This is necessary because the real titlebar controls are covered by our
+// OpenGL context. Note that in terms of the NSView hierarchy, our ChildView
+// is actually below the titlebar controls - that's why hovering and clicking
+// them works as expected - but their visual representation is only drawn into
+// the normal window buffer, and the window buffer surface lies below the
+// GLContext surface. In order to make the titlebar controls visible, we have
+// to redraw them inside the OpenGL context surface.
+void
+nsChildView::MaybeDrawTitlebar(GLManager* aManager, const nsIntRect& aRect)
+{
+  MutexAutoLock lock(mEffectsLock);
+  if (!mIsCoveringTitlebar) {
+    return;
+  }
+
+  UpdateTitlebarImage(aManager, aRect);
+
+  if (!mTitlebarImage) {
+    return;
+  }
+
+  TextureImage::ScopedBindTexture texBind(mTitlebarImage, LOCAL_GL_TEXTURE0);
+
+  ShaderProgramOGL *program =
+    aManager->GetProgram(mTitlebarImage->GetShaderProgramType());
+  program->Activate();
+  program->SetLayerQuadRect(nsIntRect(nsIntPoint(0, 0),
+                                      mTitlebarImage->GetSize()));
+  program->SetLayerTransform(gfx3DMatrix());
+  program->SetLayerOpacity(1.0);
+  program->SetRenderOffset(nsIntPoint(0,0));
+  program->SetTextureUnit(0);
+
+  aManager->BindAndDrawQuad(program);
+}
+
 static void
 DrawTopLeftCornerMask(CGContextRef aCtx, int aRadius)
 {
@@ -1962,14 +2203,14 @@ DrawTopLeftCornerMask(CGContextRef aCtx, int aRadius)
 }
 
 void
-nsChildView::MaybeDrawRoundedBottomCorners(GLManager* aManager, nsIntRect aRect)
+nsChildView::MaybeDrawRoundedCorners(GLManager* aManager, const nsIntRect& aRect)
 {
-  if (!mHasRoundedBottomCorners ||
-      mFailedCornerMaskImage)
-    return;
-  
   MutexAutoLock lock(mEffectsLock);
   
+  if (mFailedCornerMaskImage) {
+    return;
+  }
+
   if (!mCornerMaskImage) {
     mCornerMaskImage =
       aManager->gl()->CreateTextureImage(nsIntSize(mDevPixelCornerRadius,
@@ -1988,20 +2229,20 @@ nsChildView::MaybeDrawRoundedBottomCorners(GLManager* aManager, nsIntRect aRect)
       mCornerMaskImage = nullptr;
       return;
     }
-    
-    // is the CairoSurface of a non QuartzSurface usable in the gfxQuartzSurface constructor ?
-    // answer seems to be NO (see comments on bug 675410
-    // this should not work for instance: new gfxQuartzSurface(asurf->CairoSurface(), false))
+
     if (asurf->GetType() != gfxASurface::SurfaceTypeQuartz) {
-      NS_WARN_IF_FALSE(FALSE, "mCornerMaskImage's surface is not Quartz");
+      NS_WARNING("mCornerMaskImage's surface is not Quartz");
+      mCornerMaskImage->EndUpdate();
       mCornerMaskImage = nullptr;
       mFailedCornerMaskImage = true;
       return;
     }
+
+    ClearRegion(asurf, update);
+
     nsRefPtr<gfxQuartzSurface> image = static_cast<gfxQuartzSurface*>(asurf);
-    
     DrawTopLeftCornerMask(image->GetCGContext(), mDevPixelCornerRadius);
-    
+
     mCornerMaskImage->EndUpdate();
   }
   
@@ -2011,25 +2252,36 @@ nsChildView::MaybeDrawRoundedBottomCorners(GLManager* aManager, nsIntRect aRect)
   
   ShaderProgramOGL *program = aManager->GetProgram(mCornerMaskImage->GetShaderProgramType());
   program->Activate();
-  program->SetLayerQuadRect(nsIntRect(0, 0, // aRect.x, aRect.y,
-                                      mDevPixelCornerRadius,
-                                      mDevPixelCornerRadius));
+  program->SetLayerQuadRect(nsIntRect(nsIntPoint(0, 0),
+                                      mCornerMaskImage->GetSize()));
   program->SetLayerOpacity(1.0);
   program->SetRenderOffset(nsIntPoint(0,0));
   program->SetTextureUnit(0);
-  
+
   // Use operator destination in: multiply all 4 channels with source alpha.
   aManager->gl()->fBlendFuncSeparate(LOCAL_GL_ZERO, LOCAL_GL_SRC_ALPHA,
                                      LOCAL_GL_ZERO, LOCAL_GL_SRC_ALPHA);
   
-  // Draw; first bottom left, then bottom right.
-  program->SetLayerTransform(gfx3DMatrix::ScalingMatrix(1, -1, 1) *
-                             gfx3DMatrix::Translation(0, aRect.height, 0));
-  aManager->BindAndDrawQuad(program);
-  program->SetLayerTransform(gfx3DMatrix::ScalingMatrix(-1, -1, 1) *
-                             gfx3DMatrix::Translation(aRect.width, aRect.height, 0));
-  aManager->BindAndDrawQuad(program);
-  
+  if (mIsCoveringTitlebar) {
+    // Mask the top corners.
+    program->SetLayerTransform(gfx3DMatrix::ScalingMatrix(1, 1, 1) *
+                               gfx3DMatrix::Translation(0, 0, 0));
+    aManager->BindAndDrawQuad(program);
+    program->SetLayerTransform(gfx3DMatrix::ScalingMatrix(-1, 1, 1) *
+                               gfx3DMatrix::Translation(aRect.width, 0, 0));
+    aManager->BindAndDrawQuad(program);
+  }
+
+  if (mHasRoundedBottomCorners) {
+    // Mask the bottom corners.
+    program->SetLayerTransform(gfx3DMatrix::ScalingMatrix(1, -1, 1) *
+                               gfx3DMatrix::Translation(0, aRect.height, 0));
+    aManager->BindAndDrawQuad(program);
+    program->SetLayerTransform(gfx3DMatrix::ScalingMatrix(-1, -1, 1) *
+                               gfx3DMatrix::Translation(aRect.width, aRect.height, 0));
+    aManager->BindAndDrawQuad(program);
+  }
+
   // Reset blend mode.
   aManager->gl()->fBlendFuncSeparate(LOCAL_GL_ONE, LOCAL_GL_ONE_MINUS_SRC_ALPHA,
                                      LOCAL_GL_ONE, LOCAL_GL_ONE);
@@ -2235,6 +2487,8 @@ NSEvent* gLastDragMouseDownEvent = nil;
     mCancelSwipeAnimation = nil;
     mCurrentSwipeDir = 0;
 #endif
+
+    mTopLeftCornerMask = NULL;
   }
 
   // register for things we'll take from other applications
@@ -2335,6 +2589,7 @@ NSEvent* gLastDragMouseDownEvent = nil;
   [mPendingDirtyRects release];
   [mLastMouseDownEvent release];
   [mClickThroughMouseDownEvent release];
+  CGImageRelease(mTopLeftCornerMask);
   ChildViewMouseTracker::OnDestroyView(self);
 
   [[NSNotificationCenter defaultCenter] removeObserver:self];
@@ -2688,6 +2943,13 @@ NSEvent* gLastDragMouseDownEvent = nil;
   }
 }
 
+- (BOOL)isCoveringTitlebar
+{
+  return [[self window] isKindOfClass:[BaseWindow class]] &&
+         [(BaseWindow*)[self window] mainChildView] == self &&
+         [(BaseWindow*)[self window] drawsContentsIntoWindowFrame];
+}
+
 // The display system has told us that a portion of our view is dirty. Tell
 // gecko to paint it
 - (void)drawRect:(NSRect)aRect
@@ -2724,31 +2986,14 @@ NSEvent* gLastDragMouseDownEvent = nil;
   fprintf (stderr, "  xform in: [%f %f %f %f %f %f]\n", xform.a, xform.b, xform.c, xform.d, xform.tx, xform.ty);
 #endif
 
-  if ([self isUsingOpenGL]) {
-    // We usually don't get here for Gecko-initiated repaints. Instead, those
-    // eventually call drawUsingOpenGL, and don't go through drawRect.
-    // Paints that come through here are triggered by something that Cocoa
-    // controls, for example by window resizing or window focus changes.
-
-    // Since our window is usually declared as opaque, the window's pixel
-    // buffer may now contain garbage which we need to prevent from reaching
-    // the screen. The only place where garbage can show is in the bottom
-    // corners - the rest of the window is covered by our OpenGL surface.
-    // So we need to clear the pixel buffer contents in the corners.
-    [self maybeClearBottomCorners];
-
-    // Do GL composition and return.
-    [self drawUsingOpenGL];
-    return;
-  }
-
-  PROFILER_LABEL("widget", "ChildView::drawRect");
-
   nsIntRegion region;
   nsIntRect boundingRect = mGeckoChild->CocoaPointsToDevPixels(aRect);
   const NSRect *rects;
   NSInteger count, i;
   [[NSView focusView] getRectsBeingDrawn:&rects count:&count];
+
+  CGContextClipToRects(aContext, (CGRect*)rects, count);
+
   if (count < MAX_RECTS_IN_REGION) {
     for (i = 0; i < count; ++i) {
       // Add the rect to the region.
@@ -2760,26 +3005,53 @@ NSEvent* gLastDragMouseDownEvent = nil;
     region = boundingRect;
   }
 
-  // Create Cairo objects.
+  if ([self isUsingOpenGL]) {
+    // For Gecko-initiated repaints in OpenGL mode, drawUsingOpenGL is
+    // directly called from a delayed perform callback - without going through
+    // drawRect.
+    // Paints that come through here are triggered by something that Cocoa
+    // controls, for example by window resizing or window focus changes.
+
+    // Since this view is usually declared as opaque, the window's pixel
+    // buffer may now contain garbage which we need to prevent from reaching
+    // the screen. The only place where garbage can show is in the window
+    // corners - the rest of the window is covered by opaque content in our
+    // OpenGL surface.
+    // So we need to clear the pixel buffer contents in the corners.
+    [self clearCorners];
+
+    // When our view covers the titlebar, we need to repaint the titlebar
+    // texture buffer when, for example, the window buttons are hovered.
+    // So we notify our nsChildView about any areas needing repainting.
+    mGeckoChild->NotifyDirtyRegion(region);
+
+    // Do GL composition and return.
+    [self drawUsingOpenGL];
+    return;
+  }
+
+  PROFILER_LABEL("widget", "ChildView::drawRect");
 
   // The CGContext that drawRect supplies us with comes with a transform that
   // scales one user space unit to one Cocoa point, which can consist of
   // multiple dev pixels. But Gecko expects its supplied context to be scaled
   // to device pixels, so we need to reverse the scaling.
   double scale = mGeckoChild->BackingScaleFactor();
+  CGContextSaveGState(aContext);
   CGContextScaleCTM(aContext, 1.0 / scale, 1.0 / scale);
 
   NSSize viewSize = [self bounds].size;
   nsIntSize backingSize(viewSize.width * scale, viewSize.height * scale);
 
+  CGContextSaveGState(aContext);
+
+  // Create Cairo objects.
   nsRefPtr<gfxQuartzSurface> targetSurface =
     new gfxQuartzSurface(aContext, backingSize);
   targetSurface->SetAllowUseAsSource(false);
 
   nsRefPtr<gfxContext> targetContext = new gfxContext(targetSurface);
 
-  gfxContextMatrixAutoSaveRestore save(targetContext);
-
   // Set up the clip region.
   nsIntRegionRectIterator iter(region);
   targetContext->NewPath();
@@ -2806,6 +3078,15 @@ NSEvent* gLastDragMouseDownEvent = nil;
     painted = mGeckoChild->PaintWindow(region);
   }
 
+  targetContext = nullptr;
+  targetSurface = nullptr;
+
+  CGContextRestoreGState(aContext);
+
+  // Undo the scale transform so that from now on the context is in
+  // CocoaPoints again.
+  CGContextRestoreGState(aContext);
+
   if (!painted && [self isOpaque]) {
     // Gecko refused to draw, but we've claimed to be opaque, so we have to
     // draw something--fill with white.
@@ -2813,9 +3094,10 @@ NSEvent* gLastDragMouseDownEvent = nil;
     CGContextFillRect(aContext, NSRectToCGRect(aRect));
   }
 
-  // note that the cairo surface *MUST* be destroyed at this point,
-  // or bad things will happen (since we can't keep the cgContext around
-  // beyond this drawRect message handler)
+  if ([self isCoveringTitlebar]) {
+    [self drawTitlebarHighlight];
+    [self maskTopCornersInContext:aContext];
+  }
 
 #ifdef DEBUG_UPDATE
   fprintf (stderr, "---- update done ----\n");
@@ -2900,39 +3182,92 @@ NSEvent* gLastDragMouseDownEvent = nil;
   [[self window] bottomCornerRounded];
 }
 
-- (CGFloat)bottomCornerRadius
+- (CGFloat)cornerRadius
 {
-  if (![self hasRoundedBottomCorners])
-    return 0.0f;
-  NSView* borderView = [[[self window] contentView] superview];
-  if (!borderView || ![borderView respondsToSelector:@selector(roundedCornerRadius)])
+  NSView* frameView = [[[self window] contentView] superview];
+  if (!frameView || ![frameView respondsToSelector:@selector(roundedCornerRadius)])
     return 4.0f;
-  return [borderView roundedCornerRadius];
+  return [frameView roundedCornerRadius];
 }
 
 // Accelerated windows have two NSSurfaces:
 //  (1) The window's pixel buffer in the back and
 //  (2) the OpenGL view in the front.
-// These two surfaces are composited by the window manager. Drawing with the
-// usual CGContext functions ends up in (1).
-// When our window has rounded bottom corners, the OpenGL view has transparent
-// pixels in the corners. In these places the contents of the window's pixel
-// buffer can show through. So we need to make sure that the pixel buffer is
+// These two surfaces are composited by the window manager. Drawing into the
+// CGContext which is provided by drawRect ends up in (1).
+// When our window has rounded corners, the OpenGL view has transparent pixels
+// in the corners. In these places the contents of the window's pixel buffer
+// can show through. So we need to make sure that the pixel buffer is
 // transparent in the corners so that no garbage reaches the screen.
 // The contents of the pixel buffer in the rest of the window don't matter
-// because they're covered by the OpenGL view.
-// Making the bottom corners transparent works even though our window is
+// because they're covered by opaque pixels of the OpenGL context.
+// Making the corners transparent works even though our window is
 // declared "opaque" (in the NSWindow's isOpaque method).
-- (void)maybeClearBottomCorners
+- (void)clearCorners
 {
-  if (![self hasRoundedBottomCorners])
-    return;
-  
-  int radius = [self bottomCornerRadius];
-  int w = [self bounds].size.width, h = [self bounds].size.height;
+  CGFloat radius = [self cornerRadius];
+  CGFloat w = [self bounds].size.width, h = [self bounds].size.height;
   [[NSColor clearColor] set];
-  NSRectFill(NSMakeRect(0, h - radius, radius, radius));
-  NSRectFill(NSMakeRect(w - radius, h - radius, radius, radius));
+
+  if ([self isCoveringTitlebar]) {
+    NSRectFill(NSMakeRect(0, 0, radius, radius));
+    NSRectFill(NSMakeRect(w - radius, 0, radius, radius));
+  }
+
+  if ([self hasRoundedBottomCorners]) {
+    NSRectFill(NSMakeRect(0, h - radius, radius, radius));
+    NSRectFill(NSMakeRect(w - radius, h - radius, radius, radius));
+  }
+}
+
+// This is the analog of nsChildView::MaybeDrawRoundedCorners for CGContexts.
+// We only need to mask the top corners here because Cocoa does the masking
+// for the window's bottom corners automatically (starting with 10.7).
+- (void)maskTopCornersInContext:(CGContextRef)aContext
+{
+  CGFloat radius = [self cornerRadius];
+  int32_t devPixelCornerRadius = mGeckoChild->CocoaPointsToDevPixels(radius);
+
+  // First make sure that mTopLeftCornerMask is set up.
+  if (!mTopLeftCornerMask ||
+      int32_t(CGImageGetWidth(mTopLeftCornerMask)) != devPixelCornerRadius) {
+    CGImageRelease(mTopLeftCornerMask);
+    CGColorSpaceRef rgb = CGColorSpaceCreateDeviceRGB();
+    CGContextRef imgCtx = CGBitmapContextCreate(NULL,
+                                                devPixelCornerRadius,
+                                                devPixelCornerRadius,
+                                                8, devPixelCornerRadius * 4,
+                                                rgb, kCGImageAlphaPremultipliedFirst);
+    CGColorSpaceRelease(rgb);
+    DrawTopLeftCornerMask(imgCtx, devPixelCornerRadius);
+    mTopLeftCornerMask = CGBitmapContextCreateImage(imgCtx);
+    CGContextRelease(imgCtx);
+  }
+
+  // kCGBlendModeDestinationIn is the secret sauce which allows us to erase
+  // already painted pixels. It's defined as R = D * Sa: multiply all channels
+  // of the destination pixel with the alpha of the source pixel. In our case,
+  // the source is mTopLeftCornerMask.
+  CGContextSaveGState(aContext);
+  CGContextSetBlendMode(aContext, kCGBlendModeDestinationIn);
+
+  CGRect destRect = CGRectMake(0, 0, radius, radius);
+
+  // Erase the top left corner...
+  CGContextDrawImage(aContext, destRect, mTopLeftCornerMask);
+
+  // ... and the top right corner.
+  CGContextTranslateCTM(aContext, [self bounds].size.width, 0);
+  CGContextScaleCTM(aContext, -1, 1);
+  CGContextDrawImage(aContext, destRect, mTopLeftCornerMask);
+
+  CGContextRestoreGState(aContext);
+}
+
+- (void)drawTitlebarHighlight
+{
+  DrawTitlebarHighlight([self bounds].size, [self cornerRadius],
+                        mGeckoChild->DevPixelsToCocoaPoints(1));
 }
 
 - (void)releaseWidgets:(NSArray*)aWidgetArray
diff --git a/widget/cocoa/nsCocoaWindow.h b/widget/cocoa/nsCocoaWindow.h
index c488f67d5b79..c2beb562d977 100644
--- a/widget/cocoa/nsCocoaWindow.h
+++ b/widget/cocoa/nsCocoaWindow.h
@@ -97,6 +97,8 @@ typedef struct _nsCocoaWindowList {
 
 - (ChildView*)mainChildView;
 
+- (NSArray*)titlebarControls;
+
 @end
 
 @interface NSWindow (Undocumented)
diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm
index ba4ade3eb6c9..ff9cbae85d0f 100644
--- a/widget/cocoa/nsCocoaWindow.mm
+++ b/widget/cocoa/nsCocoaWindow.mm
@@ -2716,6 +2716,15 @@ static const NSString* kStateShowsToolbarButton = @"showsToolbarButton";
   [frameView addSubview:aView positioned:NSWindowBelow relativeTo:nil];
 }
 
+- (NSArray*)titlebarControls
+{
+  // Return all subviews of the frameView which are not the content view.
+  NSView* frameView = [[self contentView] superview];
+  NSMutableArray* array = [[[frameView subviews] mutableCopy] autorelease];
+  [array removeObject:[self contentView]];
+  return array;
+}
+
 - (BOOL)respondsToSelector:(SEL)aSelector
 {
   // Claim the window doesn't respond to this so that the system

From 5a0070db140f5cbdaa521ad3c722ad86a661b323 Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Thu, 23 May 2013 16:49:17 +0200
Subject: [PATCH 150/230] Bug 676241 part 7: Update comments.

---
 widget/cocoa/nsCocoaWindow.mm | 54 +++++++++--------------------------
 1 file changed, 14 insertions(+), 40 deletions(-)

diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm
index ff9cbae85d0f..421ae4605fd8 100644
--- a/widget/cocoa/nsCocoaWindow.mm
+++ b/widget/cocoa/nsCocoaWindow.mm
@@ -2810,8 +2810,8 @@ static const NSString* kStateShowsToolbarButton = @"showsToolbarButton";
 @end
 
 // This class allows us to exercise control over the window's title bar. This
-// allows for a "unified toolbar" look, and for extending the content area into
-// the title bar. It works like this:
+// allows for a "unified toolbar" look without having to extend the content
+// area into the title bar. It works like this:
 // 1) We set the window's style to textured.
 // 2) Because of this, the background color applies to the entire window, including
 //     the titlebar area. For normal textured windows, the default pattern is a 
@@ -2823,10 +2823,11 @@ static const NSString* kStateShowsToolbarButton = @"showsToolbarButton";
 // 4) Whenever the window's main state changes and when [window display] is called,
 //    Cocoa redraws the titlebar using the patternDraw callback function.
 //
-// This class also provides us with a pill button to show/hide the toolbar.
+// This class also provides us with a pill button to show/hide the toolbar up to 10.6.
 //
 // Drawing the unified gradient in the titlebar and the toolbar works like this:
-// 1) In the style sheet we set the toolbar's -moz-appearance to -moz-mac-unified-toolbar.
+// 1) In the style sheet we set the toolbar's -moz-appearance to toolbar or
+//    -moz-mac-unified-toolbar.
 // 2) When the toolbar is visible and we paint the application chrome
 //    window, the array that Gecko passes nsChildView::UpdateThemeGeometries
 //    will contain an entry for the widget type NS_THEME_TOOLBAR or
@@ -2840,11 +2841,15 @@ static const NSString* kStateShowsToolbarButton = @"showsToolbarButton";
 //
 // Whenever the unified gradient is drawn in the titlebar or the toolbar, both
 // titlebar height and toolbar height must be known in order to construct the
-// correct gradient (which is a linear gradient with the length
-// titlebarHeight + toolbarHeight - 1). But you can only get from the toolbar frame
+// correct gradient. But you can only get from the toolbar frame
 // to the containing window - the other direction doesn't work. That's why the
 // toolbar height is cached in the ToolbarWindow but nsNativeThemeCocoa can simply
 // query the window for its titlebar height when drawing the toolbar.
+//
+// Note that in drawsContentsIntoWindowFrame mode, titlebar drawing works in a
+// completely different way: In that mode, the window's mainChildView will
+// cover the titlebar completely and nothing that happens in the window
+// background will reach the screen.
 @implementation ToolbarWindow
 
 - (id)initWithContentRect:(NSRect)aContentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)aBufferingType defer:(BOOL)aFlag
@@ -2965,39 +2970,8 @@ static const NSString* kStateShowsToolbarButton = @"showsToolbarButton";
   [self setTitlebarNeedsDisplayInRect:[self titlebarRect] sync:needSyncRedraw];
 }
 
-// Extending the content area into the title bar works by redirection of both
-// drawing and mouse events.
-// The window's NSView hierarchy looks like this:
-//  - border view ([[window contentView] superview])
-//     - transparent title bar event redirection view
-//     - window controls (traffic light buttons)
-//     - content view ([window contentView], default NSView provided by the window)
-//        - our main Gecko ChildView ([window mainChildView]), which has an
-//          OpenGL context attached to it when accelerated
-//           - possibly more ChildViews for plugins
-//
-// When the window is in title bar extension mode, the mainChildView covers the
-// whole window but is only visible in the content area of the window, because
-// it's a subview of the window's contentView and thus clipped to its dimensions.
-// This clipping is a good thing because it avoids a few problems. For example,
-// if the mainChildView weren't clipped and thus visible in the titlebar, we'd
-// have have to do the rounded corner masking and the drawing of the highlight
-// line ourselves.
-// This would be especially hard in combination with OpenGL acceleration since
-// rounded corners would require making the OpenGL context transparent, which
-// would bring another set of challenges with it. Having the window controls
-// draw on top of an OpenGL context could be hard, too.
-//
-// So title bar drawing happens in the border view. The border view's drawRect
-// method is not under our control, but we can get it to call into our code
-// using some tricks, see the TitlebarAndBackgroundColor class below.
-// Specifically, we have it call the TitlebarDrawCallback function, which
-// draws the contents of mainChildView into the provided CGContext.
-// (Even if the ChildView uses OpenGL for rendering, drawing in the title bar
-// will happen non-accelerated in that CGContext.)
-//
-// Mouse event redirection happens via a TitlebarMouseHandlingView which we
-// install below.
+// Extending the content area into the title bar works by resizing the
+// mainChildView so that it covers the titlebar.
 - (void)setDrawsContentsIntoWindowFrame:(BOOL)aState
 {
   BOOL stateChanged = ([self drawsContentsIntoWindowFrame] != aState);
@@ -3112,7 +3086,7 @@ static const NSString* kStateShowsToolbarButton = @"showsToolbarButton";
 @end
 
 // Custom NSColor subclass where most of the work takes place for drawing in
-// the titlebar area.
+// the titlebar area. Not used in drawsContentsIntoWindowFrame mode.
 @implementation TitlebarAndBackgroundColor
 
 - (id)initWithWindow:(ToolbarWindow*)aWindow

From 450dc8aa874718649a26dbd1f0a0ea0df2a845ce Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Thu, 23 May 2013 16:49:18 +0200
Subject: [PATCH 151/230] Bug 676241 part 8: Remove alternate layer manager
 handling. r=mattwoodrow

---
 embedding/browser/webBrowser/nsWebBrowser.cpp |  2 +-
 embedding/browser/webBrowser/nsWebBrowser.h   |  2 +-
 layout/base/nsDisplayList.cpp                 |  2 +-
 layout/base/nsDisplayList.h                   |  3 +--
 layout/base/nsLayoutUtils.cpp                 |  3 ---
 layout/base/nsLayoutUtils.h                   |  3 +--
 layout/base/nsPresShell.cpp                   |  3 ---
 view/public/nsView.h                          | 14 ++------------
 view/public/nsViewManager.h                   |  3 +--
 view/src/nsView.cpp                           | 12 ++----------
 view/src/nsViewManager.cpp                    |  4 +---
 widget/android/nsWindow.cpp                   |  6 +++---
 widget/cocoa/nsChildView.mm                   |  2 +-
 widget/gonk/nsWindow.cpp                      |  4 ++--
 widget/gtk2/nsWindow.cpp                      |  6 +++---
 widget/nsIWidget.h                            | 11 ++---------
 widget/nsIWidgetListener.h                    |  5 +----
 widget/qt/nsWindow.cpp                        |  4 ++--
 widget/windows/nsWindowGfx.cpp                |  8 ++++----
 widget/windows/winrt/MetroWidget.cpp          |  2 +-
 widget/xpwidgets/PuppetWidget.cpp             |  4 ++--
 21 files changed, 32 insertions(+), 71 deletions(-)

diff --git a/embedding/browser/webBrowser/nsWebBrowser.cpp b/embedding/browser/webBrowser/nsWebBrowser.cpp
index 5c094f79c3b6..e536e507b7a4 100644
--- a/embedding/browser/webBrowser/nsWebBrowser.cpp
+++ b/embedding/browser/webBrowser/nsWebBrowser.cpp
@@ -1687,7 +1687,7 @@ void nsWebBrowser::WindowLowered(nsIWidget* aWidget)
   Deactivate();
 }
 
-bool nsWebBrowser::PaintWindow(nsIWidget* aWidget, nsIntRegion aRegion, uint32_t aFlags)
+bool nsWebBrowser::PaintWindow(nsIWidget* aWidget, nsIntRegion aRegion)
 {
   LayerManager* layerManager = aWidget->GetLayerManager();
   NS_ASSERTION(layerManager, "Must be in paint event");
diff --git a/embedding/browser/webBrowser/nsWebBrowser.h b/embedding/browser/webBrowser/nsWebBrowser.h
index 27f62caf4203..52bdf997e92d 100644
--- a/embedding/browser/webBrowser/nsWebBrowser.h
+++ b/embedding/browser/webBrowser/nsWebBrowser.h
@@ -124,7 +124,7 @@ protected:
     // nsIWidgetListener
     virtual void WindowRaised(nsIWidget* aWidget);
     virtual void WindowLowered(nsIWidget* aWidget);
-    virtual bool PaintWindow(nsIWidget* aWidget, nsIntRegion aRegion, uint32_t aFlags) MOZ_OVERRIDE;
+    virtual bool PaintWindow(nsIWidget* aWidget, nsIntRegion aRegion) MOZ_OVERRIDE;
 
 protected:
    nsDocShellTreeOwner*       mDocShellTreeOwner;
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 3291f954d290..820c6d79438a 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -1144,7 +1144,7 @@ void nsDisplayList::PaintForFrame(nsDisplayListBuilder* aBuilder,
     BuildContainerLayerFor(aBuilder, layerManager, aForFrame, nullptr, *this,
                            containerParameters, nullptr);
 
-  if (widgetTransaction && !(aFlags & PAINT_NO_CLEAR_INVALIDATIONS)) {
+  if (widgetTransaction) {
     aForFrame->ClearInvalidationStateBits();
   }
 
diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h
index 07d1e59e13fa..c898366b2f60 100644
--- a/layout/base/nsDisplayList.h
+++ b/layout/base/nsDisplayList.h
@@ -1478,8 +1478,7 @@ public:
     PAINT_USE_WIDGET_LAYERS = 0x01,
     PAINT_FLUSH_LAYERS = 0x02,
     PAINT_EXISTING_TRANSACTION = 0x04,
-    PAINT_NO_COMPOSITE = 0x08,
-    PAINT_NO_CLEAR_INVALIDATIONS = 0x10
+    PAINT_NO_COMPOSITE = 0x08
   };
   void PaintRoot(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx,
                  uint32_t aFlags) const;
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index da5912f81421..504def4587dc 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -2089,9 +2089,6 @@ nsLayoutUtils::PaintFrame(nsRenderingContext* aRenderingContext, nsIFrame* aFram
   if (aFlags & PAINT_NO_COMPOSITE) {
     flags |= nsDisplayList::PAINT_NO_COMPOSITE;
   }
-  if (aFlags & PAINT_NO_CLEAR_INVALIDATIONS) {
-    flags |= nsDisplayList::PAINT_NO_CLEAR_INVALIDATIONS;
-  }
 
   list.PaintRoot(&builder, aRenderingContext, flags);
 
diff --git a/layout/base/nsLayoutUtils.h b/layout/base/nsLayoutUtils.h
index cc77da4f0bcb..4c42e3e2582a 100644
--- a/layout/base/nsLayoutUtils.h
+++ b/layout/base/nsLayoutUtils.h
@@ -676,8 +676,7 @@ public:
     PAINT_ALL_CONTINUATIONS = 0x40,
     PAINT_TO_WINDOW = 0x80,
     PAINT_EXISTING_TRANSACTION = 0x100,
-    PAINT_NO_COMPOSITE = 0x200,
-    PAINT_NO_CLEAR_INVALIDATIONS = 0x400
+    PAINT_NO_COMPOSITE = 0x200
   };
 
   /**
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 33b279f942eb..75ccfb38c629 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -5576,9 +5576,6 @@ PresShell::Paint(nsView*        aViewToPaint,
   if (!(aFlags & PAINT_COMPOSITE)) {
     flags |= nsLayoutUtils::PAINT_NO_COMPOSITE;
   }
-  if (aViewToPaint->InAlternatePaint()) {
-    flags |= nsLayoutUtils::PAINT_NO_CLEAR_INVALIDATIONS;
-  }
 
   if (frame) {
     // Defer invalidates that are triggered during painting, and discard
diff --git a/view/public/nsView.h b/view/public/nsView.h
index 76ae229abe6e..b9581b483f80 100644
--- a/view/public/nsView.h
+++ b/view/public/nsView.h
@@ -290,18 +290,9 @@ public:
   bool HasWidget() const { return mWindow != nullptr; }
   
   void SetForcedRepaint(bool aForceRepaint) { 
-    if (!mInAlternatePaint) { 
-      mForcedRepaint = aForceRepaint; 
-    }
+    mForcedRepaint = aForceRepaint; 
   }
 
-  /**
-   * Returns true if the view is currently painting
-   * into an alternate destination, such as the titlebar
-   * area on OSX.
-   */
-  bool InAlternatePaint() { return mInAlternatePaint; }
-
   /**
    * Make aWidget direct its events to this view.
    * The caller must call DetachWidgetEventHandler before this view
@@ -381,7 +372,7 @@ public:
   virtual bool WindowResized(nsIWidget* aWidget, int32_t aWidth, int32_t aHeight) MOZ_OVERRIDE;
   virtual bool RequestWindowClose(nsIWidget* aWidget) MOZ_OVERRIDE;
   virtual void WillPaintWindow(nsIWidget* aWidget) MOZ_OVERRIDE;
-  virtual bool PaintWindow(nsIWidget* aWidget, nsIntRegion aRegion, uint32_t aFlags) MOZ_OVERRIDE;
+  virtual bool PaintWindow(nsIWidget* aWidget, nsIntRegion aRegion) MOZ_OVERRIDE;
   virtual void DidPaintWindow() MOZ_OVERRIDE;
   virtual void RequestRepaint() MOZ_OVERRIDE;
   virtual nsEventStatus HandleEvent(nsGUIEvent* aEvent, bool aUseAttachedEvents) MOZ_OVERRIDE;
@@ -476,7 +467,6 @@ private:
   uint32_t          mVFlags;
   bool              mWidgetIsTopLevel;
   bool              mForcedRepaint;
-  bool              mInAlternatePaint;
 };
 
 #endif
diff --git a/view/public/nsViewManager.h b/view/public/nsViewManager.h
index 4918800bf75b..3cb547956019 100644
--- a/view/public/nsViewManager.h
+++ b/view/public/nsViewManager.h
@@ -380,8 +380,7 @@ private:
   bool IsPaintingAllowed() { return RootViewManager()->mRefreshDisableCount == 0; }
 
   void WillPaintWindow(nsIWidget* aWidget);
-  bool PaintWindow(nsIWidget* aWidget, nsIntRegion aRegion,
-                   uint32_t aFlags);
+  bool PaintWindow(nsIWidget* aWidget, nsIntRegion aRegion);
   void DidPaintWindow();
 
   // Call this when you need to let the viewmanager know that it now has
diff --git a/view/src/nsView.cpp b/view/src/nsView.cpp
index 9a521990e1ba..fc66617d216e 100644
--- a/view/src/nsView.cpp
+++ b/view/src/nsView.cpp
@@ -32,7 +32,6 @@ nsView::nsView(nsViewManager* aViewManager, nsViewVisibility aVisibility)
   mViewManager = aViewManager;
   mDirtyRegion = nullptr;
   mWidgetIsTopLevel = false;
-  mInAlternatePaint = false;
 }
 
 void nsView::DropMouseGrabbing()
@@ -998,19 +997,12 @@ nsView::WillPaintWindow(nsIWidget* aWidget)
 }
 
 bool
-nsView::PaintWindow(nsIWidget* aWidget, nsIntRegion aRegion, uint32_t aFlags)
+nsView::PaintWindow(nsIWidget* aWidget, nsIntRegion aRegion)
 {
   NS_ASSERTION(this == nsView::GetViewFor(aWidget), "wrong view for widget?");
 
-  mInAlternatePaint = aFlags & PAINT_IS_ALTERNATE;
   nsRefPtr<nsViewManager> vm = mViewManager;
-  bool result = vm->PaintWindow(aWidget, aRegion, aFlags);
-  // PaintWindow can destroy this via WillPaintWindow notification, so we have
-  // to re-get the view from the widget.
-  nsView* view = nsView::GetViewFor(aWidget);
-  if (view) {
-    view->mInAlternatePaint = false;
-  }
+  bool result = vm->PaintWindow(aWidget, aRegion);
   return result;
 }
 
diff --git a/view/src/nsViewManager.cpp b/view/src/nsViewManager.cpp
index be73197723b2..de10d5c56da3 100644
--- a/view/src/nsViewManager.cpp
+++ b/view/src/nsViewManager.cpp
@@ -397,7 +397,6 @@ void nsViewManager::ProcessPendingUpdatesForView(nsView* aView,
 #endif
       nsAutoScriptBlocker scriptBlocker;
       NS_ASSERTION(aView->HasWidget(), "Must have a widget!");
-      aView->GetWidget()->WillPaint();
       SetPainting(true);
       mPresShell->Paint(aView, nsRegion(),
                         nsIPresShell::PAINT_LAYERS);
@@ -639,8 +638,7 @@ void nsViewManager::WillPaintWindow(nsIWidget* aWidget)
   }
 }
 
-bool nsViewManager::PaintWindow(nsIWidget* aWidget, nsIntRegion aRegion,
-                                uint32_t aFlags)
+bool nsViewManager::PaintWindow(nsIWidget* aWidget, nsIntRegion aRegion)
 {
   if (!aWidget || !mContext)
     return false;
diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
index adedf79af469..1d15c5d52041 100644
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -981,13 +981,13 @@ nsWindow::DrawTo(gfxASurface *targetSurface, const nsIntRect &invalidRect)
                     AutoLayerManagerSetup
                       setupLayerManager(this, ctx, mozilla::layers::BUFFER_NONE);
 
-                    mWidgetListener->PaintWindow(this, region, 0);
+                    mWidgetListener->PaintWindow(this, region);
                 }
                 break;
             }
 
             case mozilla::layers::LAYERS_CLIENT: {
-                mWidgetListener->PaintWindow(this, region, 0);
+                mWidgetListener->PaintWindow(this, region);
                 break;
             }
 
@@ -996,7 +996,7 @@ nsWindow::DrawTo(gfxASurface *targetSurface, const nsIntRect &invalidRect)
                 static_cast<mozilla::layers::LayerManagerOGL*>(GetLayerManager(nullptr))->
                     SetClippingRegion(nsIntRegion(boundsRect));
 
-                mWidgetListener->PaintWindow(this, region, 0);
+                mWidgetListener->PaintWindow(this, region);
                 break;
             }
 
diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
index 015c9312b48b..5b96d5257eb7 100644
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -1539,7 +1539,7 @@ bool nsChildView::PaintWindow(nsIntRegion aRegion)
   bool returnValue = false;
   bool oldDispatchPaint = mIsDispatchPaint;
   mIsDispatchPaint = true;
-  returnValue = listener->PaintWindow(widget, aRegion, 0);
+  returnValue = listener->PaintWindow(widget, aRegion);
 
   listener = widget->GetWidgetListener();
   if (listener) {
diff --git a/widget/gonk/nsWindow.cpp b/widget/gonk/nsWindow.cpp
index cbb1fb148eb9..312009c2a43b 100644
--- a/widget/gonk/nsWindow.cpp
+++ b/widget/gonk/nsWindow.cpp
@@ -227,7 +227,7 @@ nsWindow::DoDraw(void)
 
         listener = gWindowToRedraw->GetWidgetListener();
         if (listener) {
-            listener->PaintWindow(gWindowToRedraw, region, 0);
+            listener->PaintWindow(gWindowToRedraw, region);
         }
     } else if (mozilla::layers::LAYERS_CLIENT == lm->GetBackendType()) {
       // No need to do anything, the compositor will handle drawing
@@ -252,7 +252,7 @@ nsWindow::DoDraw(void)
 
             listener = gWindowToRedraw->GetWidgetListener();
             if (listener) {
-                listener->PaintWindow(gWindowToRedraw, region, 0);
+                listener->PaintWindow(gWindowToRedraw, region);
             }
         }
 
diff --git a/widget/gtk2/nsWindow.cpp b/widget/gtk2/nsWindow.cpp
index 99722b01a9ea..4512b4669f52 100644
--- a/widget/gtk2/nsWindow.cpp
+++ b/widget/gtk2/nsWindow.cpp
@@ -2135,7 +2135,7 @@ nsWindow::OnExposeEvent(cairo_t *cr)
         LayerManagerOGL *manager = static_cast<LayerManagerOGL*>(GetLayerManager());
         manager->SetClippingRegion(region);
 
-        listener->PaintWindow(this, region, 0);
+        listener->PaintWindow(this, region);
         listener->DidPaintWindow();
 
         g_free(rects);
@@ -2199,11 +2199,11 @@ nsWindow::OnExposeEvent(cairo_t *cr)
     {
       if (GetLayerManager()->GetBackendType() == LAYERS_BASIC) {
         AutoLayerManagerSetup setupLayerManager(this, ctx, layerBuffering);
-        painted = listener->PaintWindow(this, region, 0);
+        painted = listener->PaintWindow(this, region);
       } else if (GetLayerManager()->GetBackendType() == LAYERS_CLIENT) {
         ClientLayerManager *manager = static_cast<ClientLayerManager*>(GetLayerManager());
         manager->SetShadowTarget(ctx);
-        painted = listener->PaintWindow(this, region, 0);
+        painted = listener->PaintWindow(this, region);
       }
     }
 
diff --git a/widget/nsIWidget.h b/widget/nsIWidget.h
index e579cbd39d42..76edf233d13c 100644
--- a/widget/nsIWidget.h
+++ b/widget/nsIWidget.h
@@ -92,8 +92,8 @@ typedef nsEventStatus (* EVENT_CALLBACK)(nsGUIEvent *event);
 #endif
 
 #define NS_IWIDGET_IID \
-{ 0x37b67cb4, 0x140c, 0x4d46, \
-  { 0xa9, 0xf8, 0x28, 0xcc, 0x08, 0x3d, 0x1f, 0x54 } }
+{ 0xa7d1e8d4, 0xe2c1, 0x45cb, \
+  { 0xab, 0x72, 0xb3, 0xe9, 0xf9, 0xcc, 0xb2, 0xce } }
 
 /*
  * Window shadow styles
@@ -1658,13 +1658,6 @@ class nsIWidget : public nsISupports {
        return !bounds.IsEmpty();
     }
 
-    /**
-     * This function is called by nsViewManager right before the retained layer 
-     * tree for this widget is about to be updated, and any required
-     * ThebesLayer painting occurs.
-     */
-    virtual void WillPaint() { }
-
     /**
      * Get the natural bounds of this widget.  This method is only
      * meaningful for widgets for which Gecko implements screen
diff --git a/widget/nsIWidgetListener.h b/widget/nsIWidgetListener.h
index d7c3ecbb55f5..d3d166536085 100644
--- a/widget/nsIWidgetListener.h
+++ b/widget/nsIWidgetListener.h
@@ -125,10 +125,7 @@ public:
    * This is called at a time when it is not OK to change the geometry of
    * this widget or of other widgets.
    */
-  enum {
-    PAINT_IS_ALTERNATE = 1 << 0 /* We are painting something other than the normal widget */
-  };
-  virtual bool PaintWindow(nsIWidget* aWidget, nsIntRegion aRegion, uint32_t aFlags) { return false; }
+  virtual bool PaintWindow(nsIWidget* aWidget, nsIntRegion aRegion) { return false; }
 
   /**
    * Indicates that a paint occurred.
diff --git a/widget/qt/nsWindow.cpp b/widget/qt/nsWindow.cpp
index 0414c2b7be66..1d049f2bee3e 100644
--- a/widget/qt/nsWindow.cpp
+++ b/widget/qt/nsWindow.cpp
@@ -1077,7 +1077,7 @@ nsWindow::DoPaint(QPainter* aPainter, const QStyleOptionGraphicsItem* aOption, Q
 #endif //MOZ_ENABLE_QTMOBILITY
 
         if (mWidgetListener)
-          painted = mWidgetListener->PaintWindow(this, region, 0);
+          painted = mWidgetListener->PaintWindow(this, region);
         aPainter->endNativePainting();
         if (mWidgetListener)
           mWidgetListener->DidPaintWindow();
@@ -1135,7 +1135,7 @@ nsWindow::DoPaint(QPainter* aPainter, const QStyleOptionGraphicsItem* aOption, Q
             setupLayerManager(this, ctx, mozilla::layers::BUFFER_NONE);
         if (mWidgetListener) {
           nsIntRegion region(rect);
-          painted = mWidgetListener->PaintWindow(this, region, 0);
+          painted = mWidgetListener->PaintWindow(this, region);
         }
     }
 
diff --git a/widget/windows/nsWindowGfx.cpp b/widget/windows/nsWindowGfx.cpp
index 699a24f8822b..3a66a01f4206 100644
--- a/widget/windows/nsWindowGfx.cpp
+++ b/widget/windows/nsWindowGfx.cpp
@@ -397,7 +397,7 @@ bool nsWindow::OnPaint(HDC aDC, uint32_t aNestingLevel)
           {
             AutoLayerManagerSetup
                 setupLayerManager(this, thebesContext, doubleBuffering);
-            result = listener->PaintWindow(this, region, 0);
+            result = listener->PaintWindow(this, region);
           }
 
 #ifdef MOZ_XUL
@@ -512,7 +512,7 @@ bool nsWindow::OnPaint(HDC aDC, uint32_t aNestingLevel)
       case LAYERS_OPENGL:
         static_cast<mozilla::layers::LayerManagerOGL*>(GetLayerManager())->
           SetClippingRegion(region);
-        result = listener->PaintWindow(this, region, 0);
+        result = listener->PaintWindow(this, region);
         break;
 #ifdef MOZ_ENABLE_D3D9_LAYER
       case LAYERS_D3D9:
@@ -520,7 +520,7 @@ bool nsWindow::OnPaint(HDC aDC, uint32_t aNestingLevel)
           nsRefPtr<LayerManagerD3D9> layerManagerD3D9 =
             static_cast<mozilla::layers::LayerManagerD3D9*>(GetLayerManager());
           layerManagerD3D9->SetClippingRegion(region);
-          result = listener->PaintWindow(this, region, 0);
+          result = listener->PaintWindow(this, region);
           if (layerManagerD3D9->DeviceWasRemoved()) {
             mLayerManager->Destroy();
             mLayerManager = nullptr;
@@ -540,7 +540,7 @@ bool nsWindow::OnPaint(HDC aDC, uint32_t aNestingLevel)
           if (layerManagerD3D10->device() != gfxWindowsPlatform::GetPlatform()->GetD3D10Device()) {
             Invalidate();
           } else {
-            result = listener->PaintWindow(this, region, 0);
+            result = listener->PaintWindow(this, region);
           }
         }
         break;
diff --git a/widget/windows/winrt/MetroWidget.cpp b/widget/windows/winrt/MetroWidget.cpp
index 3205915848da..3f061cfcc409 100644
--- a/widget/windows/winrt/MetroWidget.cpp
+++ b/widget/windows/winrt/MetroWidget.cpp
@@ -935,7 +935,7 @@ void MetroWidget::Paint(const nsIntRegion& aInvalidRegion)
   if (!listener)
     return;
 
-  listener->PaintWindow(this, aInvalidRegion, 0);
+  listener->PaintWindow(this, aInvalidRegion);
 
   listener = GetPaintListener();
   if (!listener)
diff --git a/widget/xpwidgets/PuppetWidget.cpp b/widget/xpwidgets/PuppetWidget.cpp
index 0e49b8aa40a6..d8fcb5e4c3a8 100644
--- a/widget/xpwidgets/PuppetWidget.cpp
+++ b/widget/xpwidgets/PuppetWidget.cpp
@@ -570,7 +570,7 @@ PuppetWidget::Paint()
 #endif
 
     if (mozilla::layers::LAYERS_D3D10 == mLayerManager->GetBackendType()) {
-      mAttachedWidgetListener->PaintWindow(this, region, 0);
+      mAttachedWidgetListener->PaintWindow(this, region);
     } else if (mozilla::layers::LAYERS_CLIENT == mLayerManager->GetBackendType()) {
       // Do nothing, the compositor will handle drawing
       if (mTabChild) {
@@ -582,7 +582,7 @@ PuppetWidget::Paint()
       ctx->Clip();
       AutoLayerManagerSetup setupLayerManager(this, ctx,
                                               BUFFER_NONE);
-      mAttachedWidgetListener->PaintWindow(this, region, 0);
+      mAttachedWidgetListener->PaintWindow(this, region);
       if (mTabChild) {
         mTabChild->NotifyPainted();
       }

From 6b9dd03cc4a53888fd19092c40d25e5535ee4333 Mon Sep 17 00:00:00 2001
From: Blair McBride <bmcbride@mozilla.com>
Date: Fri, 24 May 2013 11:44:55 +1200
Subject: [PATCH 152/230] Bug 875129 - Enable CustomizableUI debug logging.
 r=mconley

---
 browser/app/profile/firefox.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 133a611708c4..2c1828040900 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1249,3 +1249,6 @@ pref("media.webaudio.enabled", true);
 // If this turns true, Moz*Gesture events are not called stopPropagation()
 // before content.
 pref("dom.debug.propagate_gesture_events_through_content", false);
+
+// Enable CustomizableUI debug logging.
+pref("browser.uiCustomization.debug", true);

From 43af10a8884482375007967c26f3133497eaaa85 Mon Sep 17 00:00:00 2001
From: Blair McBride <bmcbride@mozilla.com>
Date: Fri, 24 May 2013 11:45:46 +1200
Subject: [PATCH 153/230] Bug 875139 - CustomizableUI.serializerHelper() should
 use spread operator instead of manually iterating over data. r=mconley

---
 browser/components/customizableui/src/CustomizableUI.jsm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index c5f9f65d0b19..b5461b0d711e 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -1035,7 +1035,7 @@ let CustomizableUIInternal = {
     }
 
     if (typeof aValue == "object" && aValue.constructor.name == "Set") {
-      return [i for (i of aValue)];
+      return [...aValue];
     }
 
     return aValue;

From 7f37ac2c90dacad2edf3bdc70fbf005ecaac5f2b Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Fri, 24 May 2013 08:12:27 +0200
Subject: [PATCH 154/230] Bug 875441 - Don't keep reapplying the 2x scale in
 HiDPI mode when drawing the titlebar buttons. r=mattwoodrow

---
 widget/cocoa/nsChildView.mm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
index 5b96d5257eb7..763276ca0b0e 100644
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -2057,6 +2057,7 @@ nsChildView::UpdateTitlebarImageBuffer()
   ClearRegion(mTitlebarImageBuffer, dirtyTitlebarRegion);
 
   CGContextRef ctx = mTitlebarImageBuffer->GetCGContext();
+  CGContextSaveGState(ctx);
 
   double scale = BackingScaleFactor();
   CGContextScaleCTM(ctx, scale, scale);
@@ -2113,6 +2114,7 @@ nsChildView::UpdateTitlebarImageBuffer()
                         DevPixelsToCocoaPoints(1));
 
   [NSGraphicsContext setCurrentContext:oldContext];
+  CGContextRestoreGState(ctx);
 
   mUpdatedTitlebarRegion.Or(mUpdatedTitlebarRegion, dirtyTitlebarRegion);
 }

From 624141a222a87e1fe04e59805e3695423a118fb7 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch+bugs@gmail.com>
Date: Thu, 23 May 2013 13:20:12 +0200
Subject: [PATCH 155/230] Bug 875163 - Panel icons are outrageously large on
 Retina displays on OSX. r=mconley.

---
 .../osx/customizableui/panelUIOverlay.css     | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/browser/themes/osx/customizableui/panelUIOverlay.css b/browser/themes/osx/customizableui/panelUIOverlay.css
index d4ed3e23ba5e..ab22343e2bed 100644
--- a/browser/themes/osx/customizableui/panelUIOverlay.css
+++ b/browser/themes/osx/customizableui/panelUIOverlay.css
@@ -13,7 +13,12 @@
     list-style-image: url(chrome://browser/skin/customizableui/menuPanel-icons@2x.png);
   }
 
-  #PanelUI-popup .panel-combined-button {
+  #customization-palette toolbarbutton > .toolbarbutton-icon,
+  #PanelUI-mainView toolbarbutton > .toolbarbutton-icon {
+    width: 20px;
+  }
+
+  .panel-combined-button {
     list-style-image: url(chrome://browser/skin/customizableui/menuPanel-small-icons@2x.png);
   }
 
@@ -114,23 +119,23 @@
     -moz-image-region: rect(384px 128px 448px 64px);
   }
 
-  #PanelUI-popup #PanelUI-cut-btn {
+  #PanelUI-cut-btn {
     -moz-image-region: rect(0 32px 32px 0);
   }
 
-  #PanelUI-popup #PanelUI-copy-btn {
+  #PanelUI-copy-btn {
     -moz-image-region: rect(0 64px 32px 32px);
   }
 
-  #PanelUI-popup #PanelUI-paste-btn {
+  #PanelUI-paste-btn {
     -moz-image-region: rect(0 96px 32px 64px);
   }
 
-  #PanelUI-popup #PanelUI-zoomOut-btn {
+  #PanelUI-zoomOut-btn {
     -moz-image-region: rect(0 128px 32px 96px);
   }
 
-  #PanelUI-popup #PanelUI-zoomIn-btn {
+  #PanelUI-zoomIn-btn {
     -moz-image-region: rect(0 160px 32px 128px);
   }
 }
@@ -163,4 +168,4 @@
 #PanelUI-zoomOut-btn .toolbarbutton-text,
 #PanelUI-zoomReset-btn .toolbarbutton-icon {
   display: none;
-}
\ No newline at end of file
+}

From bafaf52ccd53c605f75dabc649f6d1f530206952 Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Fri, 24 May 2013 17:43:39 +0200
Subject: [PATCH 156/230] Bug 870011 - Allow user to restore customized
 toolbars and panels to their default states without a restart. r=mconley.

---
 .../customizableui/src/CustomizableUI.jsm     | 18 ++++
 .../customizableui/src/CustomizeMode.jsm      | 84 ++++++++++++-------
 2 files changed, 73 insertions(+), 29 deletions(-)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index b5461b0d711e..0a7dfa87717f 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -1420,6 +1420,24 @@ let CustomizableUIInternal = {
   reset: function() {
     Services.prefs.clearUserPref(kPrefCustomizationState);
     LOG("State reset");
+
+    // Reset placements to make restoring default placements possible.
+    gPlacements = new Map();
+    // Clear the saved state to ensure that defaults will be used.
+    gSavedState = null;
+    // Restore the state for each area to its defaults
+    for (let [area, defaultPlacements] of gDefaultPlacements) {
+      this.restoreStateForArea(area);
+    }
+
+    // Rebuild each registered area (across windows) to reflect the state that
+    // was reset above.
+    for (let [areaId, areaNodes] of gBuildAreas) {
+      let placements = gPlacements.get(areaId);
+      for (let areaNode of areaNodes) {
+        this.buildArea(areaId, placements, areaNode);
+      }
+    }
   },
 
   _addParentFlex: function(aElement) {
diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index 5320ca485649..07201d521390 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -124,23 +124,7 @@ CustomizeMode.prototype = {
     deck.addEventListener("transitionend", function customizeTransitionEnd() {
       deck.removeEventListener("transitionend", customizeTransitionEnd);
 
-      // Add drag-and-drop event handlers to all of the customizable areas.
-      self.areas = [];
-      for (let area of CustomizableUI.areas) {
-        let target = CustomizableUI.getCustomizeTargetForArea(area, window);
-        target.addEventListener("dragstart", self);
-        target.addEventListener("dragover", self);
-        target.addEventListener("dragexit", self);
-        target.addEventListener("drop", self);
-        target.addEventListener("dragend", self);
-        for (let child of target.children) {
-          if (self.isCustomizableItem(child)) {
-            self.wrapToolbarItem(child, getPlaceForItem(child));
-          }
-        }
-        self.areas.push(target);
-      }
-
+      self._wrapToolbarItems();
       self.populatePalette();
       self.dispatchToolboxEvent("customizationready");
     });
@@ -195,18 +179,7 @@ CustomizeMode.prototype = {
       documentElement.removeAttribute("customize-exiting");
     });
 
-    for (let target of this.areas) {
-      for (let toolbarItem of target.children) {
-        if (this.isWrappedToolbarItem(toolbarItem)) {
-          this.unwrapToolbarItem(toolbarItem);
-        }
-      }
-      target.removeEventListener("dragstart", this);
-      target.removeEventListener("dragover", this);
-      target.removeEventListener("dragexit", this);
-      target.removeEventListener("drop", this);
-      target.removeEventListener("dragend", this);
-    }
+    this._unwrapToolbarItems();
 
     if (this._changed) {
       // XXXmconley: At first, it seems strange to also persist the old way with
@@ -446,6 +419,41 @@ CustomizeMode.prototype = {
     return toolbarItem;
   },
 
+  _wrapToolbarItems: function() {
+    let window = this.window;
+    // Add drag-and-drop event handlers to all of the customizable areas.
+    this.areas = [];
+    for (let area of CustomizableUI.areas) {
+      let target = CustomizableUI.getCustomizeTargetForArea(area, window);
+      target.addEventListener("dragstart", this);
+      target.addEventListener("dragover", this);
+      target.addEventListener("dragexit", this);
+      target.addEventListener("drop", this);
+      target.addEventListener("dragend", this);
+      for (let child of target.children) {
+        if (this.isCustomizableItem(child)) {
+          this.wrapToolbarItem(child, getPlaceForItem(child));
+        }
+      }
+      this.areas.push(target);
+    }
+  },
+
+  _unwrapToolbarItems: function() {
+    for (let target of this.areas) {
+      for (let toolbarItem of target.children) {
+        if (this.isWrappedToolbarItem(toolbarItem)) {
+          this.unwrapToolbarItem(toolbarItem);
+        }
+      }
+      target.removeEventListener("dragstart", this);
+      target.removeEventListener("dragover", this);
+      target.removeEventListener("dragexit", this);
+      target.removeEventListener("drop", this);
+      target.removeEventListener("dragend", this);
+    }
+  },
+
   persistCurrentSets: function()  {
     let document = this.document;
     let toolbars = document.querySelectorAll("toolbar[customizable='true']");
@@ -459,7 +467,25 @@ CustomizeMode.prototype = {
   },
 
   reset: function() {
+    this.depopulatePalette();
+    this._unwrapToolbarItems();
+
     CustomizableUI.reset();
+
+    this._wrapToolbarItems();
+    this.populatePalette();
+
+    let document = this.document;
+    let toolbars = document.querySelectorAll("toolbar[customizable='true']");
+    for (let toolbar of toolbars) {
+      let set = toolbar.currentSet;
+      toolbar.removeAttribute("currentset");
+      LOG("[RESET] Removing currentset of " + toolbar.id);
+      // Persist the currentset attribute directly on hardcoded toolbars.
+      document.persist(toolbar.id, "currentset");
+    }
+
+    this.resetButton.hidden = CustomizableUI.inDefaultState;
   },
 
   onWidgetMoved: function(aWidgetId, aArea, aOldPosition, aNewPosition) {

From 2bfc48b191079d037d1173038cfc769dc152853c Mon Sep 17 00:00:00 2001
From: Blair McBride <bmcbride@mozilla.com>
Date: Fri, 24 May 2013 11:52:59 +1200
Subject: [PATCH 157/230] Bug 875574 - CustomizableUI.getUnusedWidgets() should
 use spread operator instead of manually iterating over data. r=mconley

---
 browser/components/customizableui/src/CustomizableUI.jsm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 0a7dfa87717f..516780d6cd3e 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -790,7 +790,7 @@ let CustomizableUIInternal = {
       }
     }
 
-    return [i for (i of widgets)];
+    return [...widgets];
   },
 
   getPlacementOfWidget: function(aWidgetId) {

From 82798cb8d7dae12bf43bc899a331d632d8e38c5e Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Mon, 27 May 2013 10:28:27 -0400
Subject: [PATCH 158/230] Bug 867368 - Remove Bookmarks sidebar control as a
 toolbar customization item. r=jaws.

---
 browser/base/content/browser.js               | 29 -------------------
 browser/base/content/browser.xul              |  8 -----
 .../locales/en-US/chrome/browser/browser.dtd  |  1 -
 browser/themes/linux/browser.css              |  7 -----
 browser/themes/osx/browser.css                | 10 -------
 browser/themes/shared/browser.inc             |  2 +-
 browser/themes/windows/browser.css            |  1 -
 7 files changed, 1 insertion(+), 57 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 4106ad6bed29..e0d1183df79c 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -2773,35 +2773,6 @@ function openHomeDialog(aURL)
   }
 }
 
-var bookmarksButtonObserver = {
-  onDrop: function (aEvent)
-  {
-    let name = { };
-    let url = browserDragAndDrop.drop(aEvent, name);
-    try {
-      PlacesUIUtils.showBookmarkDialog({ action: "add"
-                                       , type: "bookmark"
-                                       , uri: makeURI(url)
-                                       , title: name
-                                       , hiddenRows: [ "description"
-                                                     , "location"
-                                                     , "loadInSidebar"
-                                                     , "keyword" ]
-                                       }, window);
-    } catch(ex) { }
-  },
-
-  onDragOver: function (aEvent)
-  {
-    browserDragAndDrop.dragOver(aEvent);
-    aEvent.dropEffect = "link";
-  },
-
-  onDragExit: function (aEvent)
-  {
-  }
-}
-
 var newTabButtonObserver = {
   onDragOver: function (aEvent)
   {
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 4bfbd36ffd83..1f11d4315f18 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -990,14 +990,6 @@
                      observes="viewHistorySidebar" label="&historyButton.label;"
                      tooltiptext="&historyButton.tooltip;"/>
 
-      <toolbarbutton id="bookmarks-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-                     observes="viewBookmarksSidebar"
-                     tooltiptext="&bookmarksButton.tooltip;"
-                     ondrop="bookmarksButtonObserver.onDrop(event)"
-                     ondragover="bookmarksButtonObserver.onDragOver(event)"
-                     ondragenter="bookmarksButtonObserver.onDragOver(event)"
-                     ondragexit="bookmarksButtonObserver.onDragExit(event)"/>
-
       <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                      label="&newNavigatorCmd.label;"
                      command="key_newNavigator"
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index e9831b901fcf..bc3cbbe2ef24 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -171,7 +171,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY feedButton.tooltip           "Subscribe to this page…">
 
 <!ENTITY bookmarksButton.label          "Bookmarks">
-<!ENTITY bookmarksButton.tooltip        "Display your bookmarks">
 <!ENTITY bookmarksCmd.commandkey "b">
 
 <!ENTITY bookmarksMenuButton.label          "Bookmarks">
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index a1ec57f611b6..392561fdd5ba 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -657,7 +657,6 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   -moz-image-region: rect(0px 48px 24px 24px);
 }
 
-#bookmarks-button,
 #bookmarks-menu-button {
   -moz-image-region: rect(0px 72px 24px 48px);
 }
@@ -690,15 +689,10 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
  * !important.
  *
  * Here are the relevant removal bugs:
- * #bookmarks-button - Bug 867368
  * #cut-button, #copy-button, #paste-button - Bug 870901
  * #zoom-out-button, #zoom-in-button - Bug 870897
  */
 
-#bookmarks-button {
-  list-style-image: url("chrome://browser/skin/Toolbar.png") !important;
-}
-
 #cut-button {
   list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar") !important;
 }
@@ -837,7 +831,6 @@ toolbar[iconsize="small"] #history-button {
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
-toolbar[iconsize="small"] #bookmarks-button,
 toolbar[iconsize="small"] #bookmarks-menu-button,
 #bookmarks-menu-button.bookmark-item {
   -moz-image-region: rect(0px 48px 16px 32px);
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index fbe90668c8eb..f110eb2173e8 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -898,30 +898,20 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
 
 /* bookmark sidebar & menu buttons */
 
-#bookmarks-button,
 #bookmarks-menu-button {
   -moz-image-region: rect(0, 180px, 20px, 160px);
 }
 
-#bookmarks-button[checked="true"] {
-  -moz-image-region: rect(20px, 180px, 40px, 160px);
-}
-
 #bookmarks-menu-button.bookmark-item {
   -moz-image-region: rect(2px, 178px, 18px, 162px);
   list-style-image: url("chrome://browser/skin/Toolbar.png");
 }
 
 @media (min-resolution: 2dppx) {
-  #bookmarks-button,
   #bookmarks-menu-button {
     -moz-image-region: rect(0, 360px, 40px, 320px);
   }
 
-  #bookmarks-button[checked="true"] {
-    -moz-image-region: rect(40px, 360px, 80px, 320px);
-  }
-
   #bookmarks-menu-button.bookmark-item {
     -moz-image-region: rect(4px, 356px, 36px, 324px);
     list-style-image: url("chrome://browser/skin/Toolbar@2x.png");
diff --git a/browser/themes/shared/browser.inc b/browser/themes/shared/browser.inc
index cf4cb7df0e26..24815b497c28 100644
--- a/browser/themes/shared/browser.inc
+++ b/browser/themes/shared/browser.inc
@@ -1,3 +1,3 @@
 %filter substitution
 
-%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #history-button, #bookmarks-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button
+%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #history-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index f58795cc2328..5cce63bc08f6 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -694,7 +694,6 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   -moz-image-region: rect(0, 126px, 18px, 108px);
 }
 
-#bookmarks-button,
 #bookmarks-menu-button {
   -moz-image-region: rect(0, 144px, 18px, 126px);
 }

From 149eb1c5b56c718745dc985d34cea79e064f9ef2 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Tue, 28 May 2013 09:07:10 -0400
Subject: [PATCH 159/230] Bug 871296 - 'Undo Close Tab' breaks customization
 mode. r=mconley

---
 .../customizableui/src/CustomizeMode.jsm      | 50 ++++++-------------
 1 file changed, 15 insertions(+), 35 deletions(-)

diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index 07201d521390..08e699e7e3a0 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -123,12 +123,12 @@ CustomizeMode.prototype = {
     let self = this;
     deck.addEventListener("transitionend", function customizeTransitionEnd() {
       deck.removeEventListener("transitionend", customizeTransitionEnd);
-
-      self._wrapToolbarItems();
-      self.populatePalette();
       self.dispatchToolboxEvent("customizationready");
     });
 
+    this._wrapToolbarItems();
+    this.populatePalette();
+
     this.visiblePalette.addEventListener("dragstart", this);
     this.visiblePalette.addEventListener("dragover", this);
     this.visiblePalette.addEventListener("dragexit", this);
@@ -273,46 +273,26 @@ CustomizeMode.prototype = {
   },
 
   depopulatePalette: function() {
-    let wrapper = this.visiblePalette.firstChild;
-
-    while (wrapper) {
-      let widgetNode = wrapper.firstChild;
-
-      let provider = CustomizableUI.getWidget(widgetNode.id);
-      // If provider is PROVIDER_SPECIAL, then it just gets thrown away.
-      if (provider = CustomizableUI.PROVIDER_XUL) {
-        if (wrapper.hasAttribute("itemdisabled")) {
-          widgetNode.disabled = true;
-        }
-
-        if (wrapper.hasAttribute("itemchecked")) {
-          widgetNode.checked = true;
-        }
-
-        if (wrapper.hasAttribute("itemcommand")) {
-          let commandID = wrapper.getAttribute("itemcommand");
-          widgetNode.setAttribute("command", commandID);
-
-          // Ensure node is in sync with its command after customizing.
-          let command = this.document.getElementById(commandID);
-          if (command && command.hasAttribute("disabled")) {
-            widgetNode.setAttribute("disabled",
-                                    command.getAttribute("disabled"));
-          }
-        }
-
-        this._stowedPalette.appendChild(widgetNode);
-      } else if (provider = CustomizableUI.PROVIDER_API) {
+    let paletteChild = this.visiblePalette.firstChild;
+    let nextChild;
+    while (paletteChild) {
+      nextChild = paletteChild.nextElementSibling;
+      let provider = CustomizableUI.getWidget(paletteChild.id).provider;
+      if (provider == CustomizableUI.PROVIDER_XUL) {
+        let unwrappedPaletteItem = this.unwrapToolbarItem(paletteChild);
+        this._stowedPalette.appendChild(unwrappedPaletteItem);
+      } else if (provider == CustomizableUI.PROVIDER_API) {
         //XXXunf Currently this doesn't destroy the (now unused) node. It would
         //       be good to do so, but we need to keep strong refs to it in
         //       CustomizableUI (can't iterate of WeakMaps), and there's the
         //       question of what behavior wrappers should have if consumers
         //       keep hold of them.
         //widget.destroyInstance(widgetNode);
+      } else if (provider == CustomizableUI.PROVIDER_SPECIAL) {
+        this.visiblePalette.removeChild(paletteChild);
       }
 
-      this.visiblePalette.removeChild(wrapper);
-      wrapper = this.visiblePalette.firstChild;
+      paletteChild = nextChild;
     }
     this.window.gNavToolbox.palette = this._stowedPalette;
   },

From 2a17cdd2d7bf6acadbe157c0fe3d67799179cf89 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Tue, 28 May 2013 16:30:47 +0200
Subject: [PATCH 160/230] Bug 873518 - Remove throbber button from
 customization palette, r=jaws

--HG--
extra : rebase_source : 0692e06311053ec0c016a7aee8e802f99cc813fb
---
 browser/base/content/browser.js                |  11 -----------
 browser/base/content/browser.xul               |   5 -----
 .../locales/en-US/chrome/browser/browser.dtd   |   1 -
 browser/themes/linux/browser.css               |  16 ----------------
 browser/themes/osx/browser.css                 |  16 ----------------
 browser/themes/windows/browser.css             |  17 -----------------
 .../linux/global/icons/notloading_16.png       | Bin 233 -> 0 bytes
 toolkit/themes/linux/global/jar.mn             |   1 -
 .../themes/osx/global/icons/notloading_16.png  | Bin 686 -> 0 bytes
 toolkit/themes/osx/global/jar.mn               |   1 -
 .../windows/global/icons/notloading_16.png     | Bin 294 -> 0 bytes
 toolkit/themes/windows/global/jar.mn           |   1 -
 12 files changed, 69 deletions(-)
 delete mode 100644 toolkit/themes/linux/global/icons/notloading_16.png
 delete mode 100644 toolkit/themes/osx/global/icons/notloading_16.png
 delete mode 100644 toolkit/themes/windows/global/icons/notloading_16.png

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index e0d1183df79c..07338222406e 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -3475,8 +3475,6 @@ var XULBrowserWindow = {
   },
 
   init: function () {
-    this.throbberElement = document.getElementById("navigator-throbber");
-
     // Bug 666809 - SecurityUI support for e10s
     if (gMultiProcessBrowser)
       return;
@@ -3490,7 +3488,6 @@ var XULBrowserWindow = {
 
   destroy: function () {
     // XXXjag to avoid leaks :-/, see bug 60729
-    delete this.throbberElement;
     delete this.stopCommand;
     delete this.reloadCommand;
     delete this.statusTextField;
@@ -3615,10 +3612,6 @@ var XULBrowserWindow = {
       if (!(aStateFlags & nsIWebProgressListener.STATE_RESTORING)) {
         this._busyUI = true;
 
-        // Turn the throbber on.
-        if (this.throbberElement)
-          this.throbberElement.setAttribute("busy", "true");
-
         // XXX: This needs to be based on window activity...
         this.stopCommand.removeAttribute("disabled");
         CombinedStopReload.switchToStop();
@@ -3663,10 +3656,6 @@ var XULBrowserWindow = {
       if (this._busyUI) {
         this._busyUI = false;
 
-        // Turn the throbber off.
-        if (this.throbberElement)
-          this.throbberElement.removeAttribute("busy");
-
         this.stopCommand.setAttribute("disabled", "true");
         CombinedStopReload.switchToReload(aRequest instanceof Ci.nsIRequest);
       }
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 1f11d4315f18..07b6a3916c3c 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1053,11 +1053,6 @@
                      oncommand="gSyncUI.handleToolbarButton()"/>
 #endif
 
-      <toolbaritem id="navigator-throbber" title="&throbberItem.title;" align="center" pack="center"
-                   mousethrough="always">
-        <image/>
-      </toolbaritem>
-
       <toolbarbutton id="tabview-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                      label="&tabGroupsButton.label;"
                      command="Browser:ToggleTabView"
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index bc3cbbe2ef24..99a2f59d3bbf 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -158,7 +158,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY backForwardItem.title        "Back/Forward">
 <!ENTITY locationItem.title           "Location">
 <!ENTITY searchItem.title             "Search">
-<!ENTITY throbberItem.title           "Activity Indicator">
 <!ENTITY bookmarksItem.title          "Bookmarks">
 
 <!-- Toolbar items --> 
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 392561fdd5ba..4365ea335f55 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -1604,22 +1604,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   background-color: Window;
 }
 
-/* Throbber */
-#navigator-throbber {
-  width: 16px;
-  min-height: 16px;
-  margin: 0 3px;
-}
-
-#navigator-throbber[busy="true"] {
-  list-style-image: url("chrome://global/skin/icons/loading_16.png");
-}
-
-#navigator-throbber,
-#wrapper-navigator-throbber > #navigator-throbber {
-  list-style-image: url("chrome://global/skin/icons/notloading_16.png");
-}
-
 /* Tabstrip */
 
 %include ../shared/tabs.inc.css
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index f110eb2173e8..08552ea02f35 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -2128,22 +2128,6 @@ sidebarheader > .tabs-closebutton > .toolbarbutton-text {
 }
 
 
-/* ----- THROBBER ----- */
-
-#navigator-throbber {
-  width: 17px;
-  min-height: 16px;
-  margin: 0 4px;
-}
-
-#navigator-throbber[busy="true"] {
-  list-style-image: url("chrome://global/skin/icons/loading_16.png");
-}
-
-#wrapper-navigator-throbber > #navigator-throbber {
-  list-style-image: url("chrome://global/skin/icons/notloading_16.png");
-}
-
 toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   display: none;
 }
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 5cce63bc08f6..3a6df0ba0804 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1522,23 +1522,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   -moz-padding-start: 0px;
 }
 
-/* ::::: throbber ::::: */
-
-#navigator-throbber {
-  width: 16px;
-  min-height: 16px;
-  margin: 0 3px;
-}
-
-#navigator-throbber[busy="true"] {
-  list-style-image: url("chrome://global/skin/icons/loading_16.png");
-}
-
-#navigator-throbber,
-#wrapper-navigator-throbber > #navigator-throbber {
-  list-style-image: url("chrome://global/skin/icons/notloading_16.png");
-}
-
 /* Tabstrip */
 
 #TabsToolbar {
diff --git a/toolkit/themes/linux/global/icons/notloading_16.png b/toolkit/themes/linux/global/icons/notloading_16.png
deleted file mode 100644
index 04dab30ed37c3adc05e20068ccf5bf0f46dbf803..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 233
zcmV<F02cp=P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00026Nkl<ZIE}TE
zOAf*?3`8FlpMnslK+r`iAwfV%x&OIX*lkT{LP6?moY<aGJPyo^6L9>Oyaycc_=WTY
zJh0Jw(0eE7fi@@LfeUapxvj=VYd$7fl)z16j2%!VYCRUYVy>@749m_3ERhlJ%J~rR
zU!GVX#yZ}80>t_3d{J-mi8X`s7AxdaCCM<X@oEG+!zQh<)rNx+40<m097cGfC=j<D
ju-4qvHTP(c&oduh#5)Q`r7!2N00000NkvXXu0mjf=gM93

diff --git a/toolkit/themes/linux/global/jar.mn b/toolkit/themes/linux/global/jar.mn
index 3558cc261cb0..251f8ad2afe3 100644
--- a/toolkit/themes/linux/global/jar.mn
+++ b/toolkit/themes/linux/global/jar.mn
@@ -45,7 +45,6 @@ toolkit.jar:
 +  skin/classic/global/icons/blacklist_large.png               (icons/blacklist_large.png)
 +  skin/classic/global/icons/find.png                          (icons/find.png)
 +  skin/classic/global/icons/loading_16.png                    (icons/loading_16.png)
-+  skin/classic/global/icons/notloading_16.png                 (icons/notloading_16.png)
 +  skin/classic/global/icons/panelarrow-horizontal.svg         (icons/panelarrow-horizontal.svg)
 +  skin/classic/global/icons/panelarrow-vertical.svg           (icons/panelarrow-vertical.svg)
 +  skin/classic/global/icons/resizer.png                       (icons/resizer.png)
diff --git a/toolkit/themes/osx/global/icons/notloading_16.png b/toolkit/themes/osx/global/icons/notloading_16.png
deleted file mode 100644
index ece0ee18a1cffa9bccdd9eae5146b48df48819c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 686
zcmV;f0#W^mP)<h;3K|Lk000e1NJLTq000mG000pP1^@s6)UPbW00004XF*Lt006O$
zeEU(800009a7bBm000XU000XU0RWnu7ytkQP)S5VR5;6xQ%z{nVHnr6=GU0w)YKWK
zW<kpobULPOlK+|+n;$4*CkKlT3PEPz)hNMJLWqHv5RYEGbhU#>bW!lA9!2mbp6&O@
z-xyoQUik4m@AE$2&+~FPSI><L{2}lS;Bl^bRKQ2zK6`%!bXf;CS%><y)~QtLF31l)
zpZ|pwodLgzk;!C_KqBdM+PE(A_F}Qvwpy*H;D1Uak|#!^@x4$e{3Vr2A43-Qdc6mv
z!)8O2yQ~=z-+_Jw+}&<>*JLt%4+evuYPH&VKA-=POeV9jSnRCd?>}UN`FK1Y1=`@i
zBez^GABn}{w-8hf2E*skXyoekdIr1+3FGlt59~!E5g(PIR4Sj>>vcETF7pSY0-V`w
z_9Pq*rw4<<*5w-UzF8;~0>xs{N4jLQdh<|yKuE1tM{>EGWnGh-&E_4Hw-43@5Vdm5
zW^)|OYv5d`)4jpnu+Bjuk&xMJHa}PfcxJcT8A{Cp90Bf9sbo{BRJ*J0UOsvp(ji^e
z=5MwefP;d_<#OsS|6dNYTCJCw2<!opm7FUO2$l~F!yL3)t$QMo$j)w~2-pO6FltY`
z-8RMJaU1TZ7~{!uA7~WSYSrIpG!DUA9S+BBa)xo5L1}@WI-SlPl4&%W2c*;KbX=86
zB@m59d8-jgFKig2P$-V)^SOpC>jmD_NS`_%0=7t(Y_8Op$z<p+yu_01LxG$*>5dJ&
zg~g)3;Kznq*M6qiY^In@CJc<J3{EH%a(g_U0QHGv)9KVV91d02{o1P$TmGl>2fA|O
UbWt)`L;wH)07*qoM6N<$f?sGkasU7T

diff --git a/toolkit/themes/osx/global/jar.mn b/toolkit/themes/osx/global/jar.mn
index fa8ba8745f20..7430f972243f 100644
--- a/toolkit/themes/osx/global/jar.mn
+++ b/toolkit/themes/osx/global/jar.mn
@@ -111,7 +111,6 @@ toolkit.jar:
   skin/classic/global/icons/information-large.png                    (icons/information-large.png)
   skin/classic/global/icons/loading_16.png                           (icons/loading_16.png)
   skin/classic/global/icons/menulist-dropmarker.png                  (icons/menulist-dropmarker.png)
-  skin/classic/global/icons/notloading_16.png                        (icons/notloading_16.png)
   skin/classic/global/icons/notfound.png                             (icons/notfound.png)
   skin/classic/global/icons/panebutton-active.png                    (icons/panebutton-active.png)
   skin/classic/global/icons/panebutton-inactive.png                  (icons/panebutton-inactive.png)
diff --git a/toolkit/themes/windows/global/icons/notloading_16.png b/toolkit/themes/windows/global/icons/notloading_16.png
deleted file mode 100644
index f8366ded5146007efaf63a49d9097e706e0af42e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 294
zcmV+>0oneEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002(Nkl<ZIE|%~
zv2DXJ5Jly}2Asl;_wWwd!Ja`2sJ8`Z3vF<P3f?<%33e$2L*9jHm>`fMD2YD6hX43L
ze%=+uf<)w~st;9th{$oNZc)y;3K)RFIajS72q9d|tOFWVeFJLXl~<kj8Z+xc2$vZ^
zRXgAbjNbce-}h&r1=_yv&))khFal3i?PdU=$p!B~`Ga3(Zv>hdAjY@{Za|q*+D-kG
z(k?@8F~<FuAtDDetAN^je_G4Rdw&9IGpj`8P?*_0r#%Ag8X)H~0)v^|w*xjm;Zy$(
s@!Qq5edFdv+T6-h{dt(C`t3M>0InuW4D#^(3jhEB07*qoM6N<$f)a{<W&i*H

diff --git a/toolkit/themes/windows/global/jar.mn b/toolkit/themes/windows/global/jar.mn
index ff47e5955df0..b6a548a3c309 100644
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -118,7 +118,6 @@ toolkit.jar:
         skin/classic/global/icons/information-48.png             (icons/information-48.png)
         skin/classic/global/icons/information-64.png             (icons/information-64.png)
         skin/classic/global/icons/loading_16.png                 (icons/loading_16.png)
-        skin/classic/global/icons/notloading_16.png              (icons/notloading_16.png)
         skin/classic/global/icons/Minimize.gif                   (icons/Minimize.gif)
         skin/classic/global/icons/Print-preview.png              (icons/Print-preview.png)
         skin/classic/global/icons/Portrait.png                   (icons/Portrait.png)

From 980c35497f64daadbb12b0e66ba8df0d4e22c2ee Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Tue, 28 May 2013 16:33:43 +0200
Subject: [PATCH 161/230] Bug 873518 - Remove cut/copy/paste buttons from
 customization palette, r=jaws

--HG--
extra : rebase_source : 13c09247872eac1fd1ffe73e05321a981f21dafa
---
 browser/base/content/browser.js    |  7 ++---
 browser/base/content/browser.xul   | 15 ----------
 browser/themes/linux/browser.css   | 45 +-----------------------------
 browser/themes/osx/browser.css     | 36 ------------------------
 browser/themes/shared/browser.inc  |  2 +-
 browser/themes/windows/browser.css | 12 --------
 6 files changed, 5 insertions(+), 112 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 07338222406e..d0a71753670d 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -3363,15 +3363,14 @@ function updateEditUIVisibility()
   // The UI is visible if the Edit menu is opening or open, if the context menu
   // is open, or if the toolbar has been customized to include the Cut, Copy,
   // or Paste toolbar buttons.
+  // XXXgijs: this needs to be updated with the unified cut/copy/paste toolbarbutton
+  // once that is customizable! See bug 870901.
   gEditUIVisible = editMenuPopupState == "showing" ||
                    editMenuPopupState == "open" ||
                    contextMenuPopupState == "showing" ||
                    contextMenuPopupState == "open" ||
                    placesContextMenuPopupState == "showing" ||
-                   placesContextMenuPopupState == "open" ||
-                   document.getElementById("cut-button") ||
-                   document.getElementById("copy-button") ||
-                   document.getElementById("paste-button") ? true : false;
+                   placesContextMenuPopupState == "open";
 
   // If UI is visible, update the edit commands' enabled state to reflect
   // whether or not they are actually enabled for the current focus/selection.
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 07b6a3916c3c..52c7f3ea5ca1 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1031,21 +1031,6 @@
                    onclick="checkForMiddleClick(this, event);"/>
       </toolbarbutton>
 
-      <toolbarbutton id="cut-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-                     label="&cutCmd.label;"
-                     command="cmd_cut"
-                     tooltiptext="&cutButton.tooltip;"/>
-
-      <toolbarbutton id="copy-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-                     label="&copyCmd.label;"
-                     command="cmd_copy"
-                     tooltiptext="&copyButton.tooltip;"/>
-
-      <toolbarbutton id="paste-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-                     label="&pasteCmd.label;"
-                     command="cmd_paste"
-                     tooltiptext="&pasteButton.tooltip;"/>
-
 #ifdef MOZ_SERVICES_SYNC
       <toolbarbutton id="sync-button"
                      class="toolbarbutton-1 chromeclass-toolbar-additional"
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 4365ea335f55..3ef15a65d524 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -684,36 +684,14 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   -moz-image-region: rect(0px 120px 24px 96px);
 }
 
-/* A lot of these buttons are going to be removed in later bugs, but until then
+/* These buttons are going to be removed in later bugs, but until then
  * we're overriding the menuPanel-icons sprites with these ones with
  * !important.
  *
  * Here are the relevant removal bugs:
- * #cut-button, #copy-button, #paste-button - Bug 870901
  * #zoom-out-button, #zoom-in-button - Bug 870897
  */
 
-#cut-button {
-  list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar") !important;
-}
-#cut-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar&state=disabled") !important;
-}
-
-#copy-button {
-  list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar") !important;
-}
-#copy-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar&state=disabled") !important;
-}
-
-#paste-button {
-  list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar") !important;
-}
-#paste-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar&state=disabled") !important;
-}
-
 #zoom-out-button {
   list-style-image: url("moz-icon://stock/gtk-zoom-out?size=toolbar") !important;
 }
@@ -851,27 +829,6 @@ toolbar[iconsize="small"] #new-window-button {
   -moz-image-region: rect(0px 80px 16px 64px);
 }
 
-toolbar[iconsize="small"] #cut-button {
-  list-style-image: url("moz-icon://stock/gtk-cut?size=menu");
-}
-toolbar[iconsize="small"] #cut-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-cut?size=menu&state=disabled");
-}
-
-toolbar[iconsize="small"] #copy-button {
-  list-style-image: url("moz-icon://stock/gtk-copy?size=menu");
-}
-toolbar[iconsize="small"] #copy-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-copy?size=menu&state=disabled");
-}
-
-toolbar[iconsize="small"] #paste-button {
-  list-style-image: url("moz-icon://stock/gtk-paste?size=menu");
-}
-toolbar[iconsize="small"] #paste-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-paste?size=menu&state=disabled");
-}
-
 toolbar[iconsize="small"] #fullscreen-button {
   list-style-image: url("moz-icon://stock/gtk-fullscreen?size=menu");
 }
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 08552ea02f35..20554cf85e39 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -962,42 +962,6 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   }
 }
 
-/* cut button */
-
-#cut-button {
-  -moz-image-region: rect(0, 260px, 20px, 240px);
-}
-
-@media (min-resolution: 2dppx) {
-  #cut-button {
-    -moz-image-region: rect(0, 520px, 40px, 480px);
-  }
-}
-
-/* copy button */
-
-#copy-button {
-  -moz-image-region: rect(0, 280px, 20px, 260px);
-}
-
-@media (min-resolution: 2dppx) {
-  #copy-button {
-    -moz-image-region: rect(0, 560px, 40px, 520px);
-  }
-}
-
-/* paste button */
-
-#paste-button {
-  -moz-image-region: rect(0, 300px, 20px, 280px);
-}
-
-@media (min-resolution: 2dppx) {
-  #paste-button {
-    -moz-image-region: rect(0, 600px, 40px, 560px);
-  }
-}
-
 /* alltabs button */
 
 #alltabs-button {
diff --git a/browser/themes/shared/browser.inc b/browser/themes/shared/browser.inc
index 24815b497c28..c9cab4fa911d 100644
--- a/browser/themes/shared/browser.inc
+++ b/browser/themes/shared/browser.inc
@@ -1,3 +1,3 @@
 %filter substitution
 
-%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #history-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button
+%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #history-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #zoom-out-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 3a6df0ba0804..f0d0f1717a0e 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -718,18 +718,6 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   -moz-image-region: rect(0, 198px, 18px, 180px);
 }
 
-#cut-button {
-  -moz-image-region: rect(0, 216px, 18px, 198px);
-}
-
-#copy-button {
-  -moz-image-region: rect(0, 234px, 18px, 216px);
-}
-
-#paste-button {
-  -moz-image-region: rect(0, 252px, 18px, 234px);
-}
-
 #fullscreen-button {
   -moz-image-region: rect(0, 270px, 18px, 252px);
 }

From 74ab8d28250294e69358e6f40a4e8c18ab58c23b Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Tue, 28 May 2013 16:34:35 +0200
Subject: [PATCH 162/230] Bug 873518 - Fix off-by-one error when moving widgets
 within their area, r=jaws

--HG--
extra : rebase_source : f88fdacfbdc34564d70eec022fd7201c4490c9aa
---
 browser/components/customizableui/src/CustomizableUI.jsm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 516780d6cd3e..5e0cd397e7e7 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -911,6 +911,11 @@ let CustomizableUIInternal = {
     }
 
     placements.splice(oldPlacement.position, 1);
+    // If we just removed the item from *before* where it is now added,
+    // we need to compensate the position offset for that:
+    if (oldPlacement.position < aPosition) {
+      aPosition--;
+    }
     placements.splice(aPosition, 0, aWidgetId);
 
     let widget = gPalette.get(aWidgetId);

From b3c482a8bbd23d119452a7bb0a770c4f0b46a90c Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Tue, 28 May 2013 17:11:30 +0200
Subject: [PATCH 163/230] Bug 873518 - bustage fix aero builds' jar.mn,
 rs=bustage

---
 toolkit/themes/windows/global/jar.mn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/toolkit/themes/windows/global/jar.mn b/toolkit/themes/windows/global/jar.mn
index b6a548a3c309..b409490939eb 100644
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -296,7 +296,6 @@ toolkit.jar:
         skin/classic/aero/global/icons/information-48.png                (icons/information-48-aero.png)
         skin/classic/aero/global/icons/information-64.png                (icons/information-64-aero.png)
         skin/classic/aero/global/icons/loading_16.png                    (icons/loading_16.png)
-        skin/classic/aero/global/icons/notloading_16.png                 (icons/notloading_16.png)
         skin/classic/aero/global/icons/Minimize.gif                      (icons/Minimize.gif)
         skin/classic/aero/global/icons/Print-preview.png                 (icons/Print-preview-aero.png)
         skin/classic/aero/global/icons/Portrait.png                      (icons/Portrait-aero.png)

From e7163ef8b95bc63ea58ad7a721502fe13af90ee0 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Tue, 28 May 2013 13:00:49 -0400
Subject: [PATCH 164/230] Bug 875775 - Allow widgets created by createWidget to
 specify if they're removable or not. r=mconley

--HG--
extra : rebase_source : 317bb5500c18a38314e835fc78dbcb658620cae7
---
 browser/components/customizableui/src/CustomizableUI.jsm  | 8 +++++++-
 .../components/customizableui/src/CustomizableWidgets.jsm | 8 ++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 5e0cd397e7e7..d5bf52125aa2 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -685,6 +685,7 @@ let CustomizableUIInternal = {
     if (aWidget.disabled) {
       node.setAttribute("disabled", true);
     }
+    node.setAttribute("removable", aWidget.removable);
     node.setAttribute("label", aWidget.name);
     node.setAttribute("tooltiptext", aWidget.description);
     //XXXunf Need to hook this up to a <key> element or something.
@@ -1170,7 +1171,7 @@ let CustomizableUIInternal = {
 
   createBuiltinWidget: function(aData) {
     // This should only ever be called on startup, before any windows are
-    // openned - so we know there's no build areas to handle. Also, builtin
+    // opened - so we know there's no build areas to handle. Also, builtin
     // widgets are expected to be (mostly) static, so shouldn't affect the
     // current placement settings.
     let widget = this.normalizeWidget(aData, CustomizableUI.SOURCE_BUILTIN);
@@ -1197,6 +1198,7 @@ let CustomizableUIInternal = {
       source: aSource || "addon",
       instances: new Map(),
       currentArea: null,
+      removable: false,
       defaultArea: null,
       allowedAreas: [],
       shortcut: null,
@@ -1224,6 +1226,10 @@ let CustomizableUIInternal = {
       }
     }
 
+    if ("removable" in aData && typeof aData.removable == "boolean") {
+      widget.removable = aData.removable;
+    }
+
     if (aData.defaultArea && gAreas.has(aData.defaultArea)) {
       widget.defaultArea = aData.defaultArea;
     }
diff --git a/browser/components/customizableui/src/CustomizableWidgets.jsm b/browser/components/customizableui/src/CustomizableWidgets.jsm
index 3e69eb452fee..a8c27906cb91 100644
--- a/browser/components/customizableui/src/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/src/CustomizableWidgets.jsm
@@ -34,6 +34,7 @@ const CustomizableWidgets = [{
     viewId: "PanelUI-history",
     name: "History...",
     description: "History",
+    removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
     icons: {
@@ -103,6 +104,7 @@ const CustomizableWidgets = [{
     id: "privatebrowsing-button",
     name: "Private Browsing\u2026",
     description: "Open a new Private Browsing window",
+    removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL],
     icons: {
@@ -123,6 +125,7 @@ const CustomizableWidgets = [{
     name: "Save Page",
     shortcut: "Ctrl+S",
     description: "Save this page",
+    removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL],
     icons: {
@@ -143,6 +146,7 @@ const CustomizableWidgets = [{
     name: "Find",
     shortcut: "Ctrl+F",
     description: "Find in this page",
+    removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL],
     icons: {
@@ -163,6 +167,7 @@ const CustomizableWidgets = [{
     name: "Open File",
     shortcut: "Ctrl+O",
     description: "Open file",
+    removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL],
     icons: {
@@ -183,6 +188,7 @@ const CustomizableWidgets = [{
     name: "Developer",
     shortcut: "Shift+F11",
     description: "Toggle Developer Tools",
+    removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL],
     icons: {
@@ -203,6 +209,7 @@ const CustomizableWidgets = [{
     name: "Add-ons",
     shortcut: "Ctrl+Shift+A",
     description: "Add-ons Manager",
+    removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL],
     icons: {
@@ -223,6 +230,7 @@ const CustomizableWidgets = [{
     name: "Preferences",
     shortcut: "Ctrl+Shift+O",
     description: "Preferences\u2026",
+    removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL],
     icons: {

From 395fd585cb8d5279377d549d2ecb8ef9db8e3930 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Tue, 28 May 2013 17:49:11 -0400
Subject: [PATCH 165/230] Bug 876764 - Entering customization mode with open
 customization tab breaks it. r=mconley

---
 .../components/customizableui/src/CustomizeMode.jsm  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index 08e699e7e3a0..229ed1db4cab 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -76,6 +76,13 @@ CustomizeMode.prototype = {
       return;
     }
 
+    // We don't need to switch to kAboutURI, or open a new tab at
+    // kAboutURI if we're already on it.
+    if (this.browser.selectedBrowser.currentURI.spec != kAboutURI) {
+      this.window.switchToTabHavingURI(kAboutURI, true);
+      return;
+    }
+
     this.dispatchToolboxEvent("beforecustomization");
 
     let window = this.window;
@@ -84,11 +91,6 @@ CustomizeMode.prototype = {
     let customizer = document.getElementById("customization-container");
     customizer.hidden = false;
 
-    // We don't need to switch to kAboutURI, or open a new tab at
-    // kAboutURI if we're already on it.
-    if (this.browser.selectedBrowser.currentURI.spec != kAboutURI) {
-      this.window.switchToTabHavingURI(kAboutURI, true);
-    }
 
     CustomizableUI.addListener(this);
 

From 37e8fb96ec9b00202cc892a852387033f52a84f0 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Tue, 28 May 2013 16:56:32 -0700
Subject: [PATCH 166/230] Bug 857886 - Backout bug 874051 (9443ce3837d5) due to
 reverting to background-image for the tab stroke. r=Gijs

---
 .../tests/mochitest/tree/test_tabbrowser.xul      | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/accessible/tests/mochitest/tree/test_tabbrowser.xul b/accessible/tests/mochitest/tree/test_tabbrowser.xul
index cb2c3a343a3c..d4755c120fc5 100644
--- a/accessible/tests/mochitest/tree/test_tabbrowser.xul
+++ b/accessible/tests/mochitest/tree/test_tabbrowser.xul
@@ -98,16 +98,6 @@
               // xul:tab ("about:")
               role: ROLE_PAGETAB,
               children: [
-                {
-                  // :before and :after image
-                  // (selected tab border on left/right)
-                  role: ROLE_GRAPHIC,
-                  children: []
-                },
-                {
-                  role: ROLE_GRAPHIC,
-                  children: []
-                },
                 {
                   // xul:toolbarbutton ("Close Tab")
                   role: ROLE_PUSHBUTTON,
@@ -123,11 +113,6 @@
                   // xul:toolbarbutton ("Close Tab")
                   role: ROLE_PUSHBUTTON,
                   children: []
-                },
-                {
-                  // :after image (separator)
-                  role: ROLE_GRAPHIC,
-                  children: []
                 }
               ]
             },

From 1340c8bbc360179e38392b9f8bafa4c8ed984d2d Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Wed, 22 May 2013 12:47:12 -0700
Subject: [PATCH 167/230] Bug 857886 - Use HiDPI images for Australis
 foreground tabs and separators on OS X. r=mconley,Gijs

---
 browser/themes/osx/browser.css                |  22 ++++++++++++++++++
 browser/themes/osx/jar.mn                     |   4 ++++
 .../osx/tabbrowser/tab-active-middle@2x.png   | Bin 0 -> 1032 bytes
 .../osx/tabbrowser/tab-separator@2x.png       | Bin 0 -> 186 bytes
 .../osx/tabbrowser/tab-stroke-end@2x.png      | Bin 0 -> 2456 bytes
 .../osx/tabbrowser/tab-stroke-start@2x.png    | Bin 0 -> 2463 bytes
 browser/themes/shared/tabs.inc.css            |  12 +++++++---
 browser/themes/windows/browser.css            |   2 +-
 8 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 browser/themes/osx/tabbrowser/tab-active-middle@2x.png
 create mode 100644 browser/themes/osx/tabbrowser/tab-separator@2x.png
 create mode 100644 browser/themes/osx/tabbrowser/tab-stroke-end@2x.png
 create mode 100644 browser/themes/osx/tabbrowser/tab-stroke-start@2x.png

diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 20554cf85e39..837382cd80bc 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -2144,6 +2144,21 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
                       url(chrome://browser/skin/tabbrowser/tab-background-end@2x.png);
   }
 
+  .tab-background-middle[selected=true] {
+    background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle@2x.png),
+                      @fgTabBackgroundMiddle@;
+  }
+
+  .tab-background-start[selected=true]:-moz-locale-dir(ltr)::after,
+  .tab-background-end[selected=true]:-moz-locale-dir(rtl)::after {
+    background-image: url(chrome://browser/skin/tabbrowser/tab-stroke-start@2x.png);
+  }
+
+  .tab-background-end[selected=true]:-moz-locale-dir(ltr)::after,
+  .tab-background-start[selected=true]:-moz-locale-dir(rtl)::after {
+    background-image: url(chrome://browser/skin/tabbrowser/tab-stroke-end@2x.png);
+  }
+
   .tab-icon-image {
     list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
     image-rendering: -moz-crisp-edges;
@@ -2156,6 +2171,13 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   .tab-throbber[progress] {
     list-style-image: url("chrome://browser/skin/tabbrowser/loading@2x.png");
   }
+
+  /* Background tab separators */
+  #tabbrowser-tabs[movingtab] > .tabbrowser-tab[beforeselected]:not([last-visible-tab])::after,
+  .tabbrowser-tab:not([selected]):not([afterselected-visible]):not([afterhovered]):not([first-visible-tab]):not(:hover)::before,
+  #tabbrowser-tabs:not([overflow]) > .tabbrowser-tab[last-visible-tab]:not([selected]):not([beforehovered]):not(:hover)::after {
+    background-image: url(chrome://browser/skin/tabbrowser/tab-separator@2x.png);
+  }
 }
 
 .tabbrowser-tab:not(:hover) > .tab-stack > .tab-content > .tab-icon-image:not([selected="true"]) {
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index 3064f20f3fd4..14e690f8ad0c 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -194,6 +194,7 @@ browser.jar:
   skin/classic/browser/tabbrowser/loading.png                            (tabbrowser/loading.png)
   skin/classic/browser/tabbrowser/loading@2x.png                         (tabbrowser/loading@2x.png)
   skin/classic/browser/tabbrowser/tab-active-middle.png                  (tabbrowser/tab-active-middle.png)
+  skin/classic/browser/tabbrowser/tab-active-middle@2x.png               (tabbrowser/tab-active-middle@2x.png)
   skin/classic/browser/tabbrowser/tab-active-middle-lwtheme.png          (tabbrowser/tab-active-middle-lwtheme.png)
   skin/classic/browser/tabbrowser/tab-arrow-left.png                     (tabbrowser/tab-arrow-left.png)
   skin/classic/browser/tabbrowser/tab-arrow-left@2x.png                  (tabbrowser/tab-arrow-left@2x.png)
@@ -206,7 +207,9 @@ browser.jar:
   skin/classic/browser/tabbrowser/tab-background-start.png               (tabbrowser/tab-background-start.png)
   skin/classic/browser/tabbrowser/tab-background-start@2x.png            (tabbrowser/tab-background-start@2x.png)
   skin/classic/browser/tabbrowser/tab-stroke-end.png                     (tabbrowser/tab-stroke-end.png)
+  skin/classic/browser/tabbrowser/tab-stroke-end@2x.png                  (tabbrowser/tab-stroke-end@2x.png)
   skin/classic/browser/tabbrowser/tab-stroke-start.png                   (tabbrowser/tab-stroke-start.png)
+  skin/classic/browser/tabbrowser/tab-stroke-start@2x.png                (tabbrowser/tab-stroke-start@2x.png)
   skin/classic/browser/tabbrowser/tabbar-bottom-bg-active.png            (tabbrowser/tabbar-bottom-bg-active.png)
   skin/classic/browser/tabbrowser/tabbar-bottom-bg-inactive.png          (tabbrowser/tabbar-bottom-bg-inactive.png)
   skin/classic/browser/tabbrowser/tabbar-top-bg-active.png               (tabbrowser/tabbar-top-bg-active.png)
@@ -215,6 +218,7 @@ browser.jar:
   skin/classic/browser/tabbrowser/tabDragIndicator.png                   (tabbrowser/tabDragIndicator.png)
   skin/classic/browser/tabbrowser/tabDragIndicator@2x.png                (tabbrowser/tabDragIndicator.png)
   skin/classic/browser/tabbrowser/tab-separator.png                      (tabbrowser/tab-separator.png)
+  skin/classic/browser/tabbrowser/tab-separator@2x.png                   (tabbrowser/tab-separator@2x.png)
   skin/classic/browser/tabview/close.png                    (tabview/close.png)
   skin/classic/browser/tabview/edit-light.png               (tabview/edit-light.png)
   skin/classic/browser/tabview/search.png                   (tabview/search.png)
diff --git a/browser/themes/osx/tabbrowser/tab-active-middle@2x.png b/browser/themes/osx/tabbrowser/tab-active-middle@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c73eb967bd20cff4878e0a5148d9d96f5b7dede8
GIT binary patch
literal 1032
zcmaJ=&rj1(94}c!Kqg#Jgab{H2#M>DZ7sB6V7G2EV+oEWE*KL^``DVTKWrcFhcSYB
z&_s=YfL9VP81EePV4_4rJg5<46eD*@IGA|R*Rc%`&Zg~q@0-u(^Zohm&P<>6cl32&
z80Jq-Nh!2;qHm(D75xWZ{u0r00>(3N)>?!`#Q~V8SqlJ98cG(VfTESJY=ChL^PSYw
z8JLmJ3#w(1iiaUfhK<-5Ha=Oh6*Uhaz5uei86keGKO=Bmix3xCnU?Js$mvrR2h3Kc
z(`qHJ@)|KYfsdC2Bwzrj;3cDAx<V;JRCNWk_skT5S0OMTA@+mH$TN7%asbYfp@2#=
z49;;R6J|M%IgJNtCP>lf<pNAtU^yW;iq{?jd2_TyAtfbhzR)Q`<RG*KiYgY1WHCfq
zPL^VLp7%6@!2m)8+_DLkQowWv>k1NZRY$j>Zkf2Js4Q4ZFhZb6_fs(JhOFt<%7h9=
zl@yy|NZL!O4wU8pLk**Wc3}z}#QRTSH(j;?l>)A{<fy1|i-VpkTZlP8ftHiDtU|qt
zGdT-dZqBmt*er(+%ZjR-o?)cQkYyohx==Aykdz_>(jawR6B1)$G%SY3_=LzYOgt#E
zEFEP>!)ziR4M}0P&Xp{6$p9v-bF~95-<0bOgJC1j5^(gZKub85fmf3j^yaZ}P4#MA
zt$8e?O}P{bhVokbSF7tLG(X<9F}Uc^7=2)(d3VrY5A|Grg)T)UDT(RQr+2S6+L!6>
zGZ*}K-f!LL+WHxJ9N3}hy>A0wH+t6}+}|Add};gl%Ax$)@ndiJjay7>`R%n+U32*z
zajmC+c=h37K3l+7Z~I^Lu83_d{kvaO-zHypK6j+^9`kYeLtpRk>eH5yA-X#{?|ZZt
b*lnk=qvy82@A|Hny}Ox=PfJgt^EdwhQ^rWp

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/tabbrowser/tab-separator@2x.png b/browser/themes/osx/tabbrowser/tab-separator@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..11cfca4c149871587aec2e18b71fd6ef3d49823a
GIT binary patch
literal 186
zcmeAS@N?(olHy`uVBq!ia0vp^Y(Q+o!2%@Tt1xo_DajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_d9MKPW(jv*Qo=LQ`VV-Vn2{Qv*+5UUSrlVpSTo)y@d8mRj4
z++I$TNqK8@3f1~b7TvJ=?80SnjgfD~!UIjx?34KYazw7$S>3MPGoegY+SbcnCPZ%I
iC+_!!ovf3ZRV1t`*qmi^JF<ZGFnGH9xvX<aXaWG?^E}=F

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/tabbrowser/tab-stroke-end@2x.png b/browser/themes/osx/tabbrowser/tab-stroke-end@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..5477f9e92c392a34f7110c9aba63c4e933eaa614
GIT binary patch
literal 2456
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
W&v3K8+6@E%0000<MNUMnLSTaESFg7K

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/tabbrowser/tab-stroke-start@2x.png b/browser/themes/osx/tabbrowser/tab-stroke-start@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bdbe97cd04c25a6f4ec94925f3095d329dfc9e4
GIT binary patch
literal 2463
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

literal 0
HcmV?d00001

diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
index c25792973054..bf989a165d31 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -128,6 +128,8 @@
 .tab-background-end[selected=true]::after {
   /* position ::after on top of its parent */
   -moz-margin-start: -@tabCurveWidth@;
+  background-size: 100% 100%;
+  content: "";
   display: -moz-box;
 }
 
@@ -150,12 +152,12 @@
 
 .tab-background-start[selected=true]:-moz-locale-dir(ltr)::after,
 .tab-background-end[selected=true]:-moz-locale-dir(rtl)::after {
-  content: url(chrome://browser/skin/tabbrowser/tab-stroke-start.png);
+  background-image: url(chrome://browser/skin/tabbrowser/tab-stroke-start.png);
 }
 
 .tab-background-end[selected=true]:-moz-locale-dir(ltr)::after,
 .tab-background-start[selected=true]:-moz-locale-dir(rtl)::after {
-  content: url(chrome://browser/skin/tabbrowser/tab-stroke-end.png);
+  background-image: url(chrome://browser/skin/tabbrowser/tab-stroke-end.png);
 }
 
 .tab-background-start[selected=true]::before,
@@ -243,7 +245,11 @@
 #tabbrowser-tabs:not([overflow]) > .tabbrowser-tab[last-visible-tab]:not([selected]):not([beforehovered]):not(:hover)::after {
   -moz-margin-start: -1.5px;
   -moz-margin-end: -1.5px;
-  content: url(chrome://browser/skin/tabbrowser/tab-separator.png);
+  background-image: url(chrome://browser/skin/tabbrowser/tab-separator.png);
+  background-position: left bottom;
+  background-repeat: no-repeat;
+  background-size: 3px 100%;
+  content: "";
   display: -moz-box;
   width: 3px;
 }
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index f0d0f1717a0e..63a7baa055a9 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1570,7 +1570,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   #tabbrowser-tabs[movingtab] > .tabbrowser-tab[beforeselected]:not([last-visible-tab])::after,
   .tabbrowser-tab:not([selected]):not([afterselected-visible]):not([afterhovered]):not([first-visible-tab]):not(:hover)::before,
   #tabbrowser-tabs:not([overflow]) > .tabbrowser-tab[last-visible-tab]:not([selected]):not([beforehovered]):not(:hover)::after {
-    content: url("chrome://browser/skin/tabbrowser/tab-separator-luna-blue.png");
+    background-image: url("chrome://browser/skin/tabbrowser/tab-separator-luna-blue.png");
   }
 }
 %endif

From 560a4b18871b17f6a351f4ffe9d92c691d33adaa Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Wed, 29 May 2013 10:48:04 -0400
Subject: [PATCH 168/230] Bug 877183 - Remove unreferenced variable in
 getPlacementOfWidget. r=gijs

--HG--
extra : rebase_source : 0b6569639b8e2a38deac49e9c1a516015abc2a5a
---
 browser/components/customizableui/src/CustomizableUI.jsm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index d5bf52125aa2..c874b5cdff48 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -795,8 +795,6 @@ let CustomizableUIInternal = {
   },
 
   getPlacementOfWidget: function(aWidgetId) {
-    let widget = gPalette.get(aWidgetId);
-
     for (let [area, placements] of gPlacements) {
       let index = placements.indexOf(aWidgetId);
       if (index != -1) {

From a4c0b4ae397c21e166449da758032350084cdff9 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Wed, 29 May 2013 10:57:17 -0400
Subject: [PATCH 169/230] Bug 875775 - followup, update isWidgetRemovable.
 r=gijs

--HG--
extra : rebase_source : cd093fda0b3b66cabb654756d829959fa009ceee
---
 browser/components/customizableui/src/CustomizableUI.jsm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index c874b5cdff48..7d21f0140881 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -1470,9 +1470,9 @@ let CustomizableUIInternal = {
 
   isWidgetRemovable: function(aWidgetId) {
     let provider = this.getWidgetProvider(aWidgetId);
+
     if (provider == CustomizableUI.PROVIDER_API) {
-      //XXXunf Not suppported yet.
-      return true;
+      return gPalette.get(aWidgetId).removable;
     }
 
     if (provider == CustomizableUI.PROVIDER_XUL) {

From 45ee65a10442171df3ed8cf092e734fef3a11294 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Wed, 29 May 2013 16:41:44 -0400
Subject: [PATCH 170/230] Bug 873056 - Drag-over and drop effects when
 customizing. r=mconley

---
 .../customizableui/src/CustomizeMode.jsm      | 76 ++++++++++++++-----
 .../customizableui/customizeMode.inc.css      | 12 ++-
 2 files changed, 68 insertions(+), 20 deletions(-)

diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index 229ed1db4cab..e6ea4082e811 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -11,6 +11,7 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 const kPrefCustomizationDebug = "browser.uiCustomization.debug";
 const kPaletteId = "customization-palette";
 const kAboutURI = "about:customizing";
+const kDragDataTypePrefix = "text/toolbarwrapper-id/";
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource:///modules/CustomizableUI.jsm");
@@ -548,7 +549,15 @@ CustomizeMode.prototype = {
 
     let dt = aEvent.dataTransfer;
     let documentId = aEvent.target.ownerDocument.documentElement.id;
-    dt.setData("text/toolbarwrapper-id/" + documentId, item.firstChild.id);
+    let draggedItem = item.firstChild;
+    let draggedItemWidth = draggedItem.getBoundingClientRect().width + "px";
+
+    let data = {
+      id: draggedItem.id,
+      width: draggedItemWidth,
+    };
+
+    dt.mozSetDataAt(kDragDataTypePrefix + documentId, data, 0);
     dt.effectAllowed = "move";
   },
 
@@ -557,12 +566,12 @@ CustomizeMode.prototype = {
 
     let document = aEvent.target.ownerDocument;
     let documentId = document.documentElement.id;
-    if (!aEvent.dataTransfer.types.contains("text/toolbarwrapper-id/"
-                                            + documentId.toLowerCase())) {
+    if (!aEvent.dataTransfer.mozTypesAt(0)) {
       return;
     }
 
-    let draggedItemId = aEvent.dataTransfer.getData("text/toolbarwrapper-id/" + documentId);
+    let {id: draggedItemId, width: draggedItemWidth} =
+      aEvent.dataTransfer.mozGetDataAt(kDragDataTypePrefix + documentId, 0);
     let draggedWrapper = document.getElementById("wrapper-" + draggedItemId);
     let targetNode = aEvent.target;
     let targetParent = targetNode.parentNode;
@@ -588,8 +597,15 @@ CustomizeMode.prototype = {
 
     // We need to determine the place that the widget is being dropped in
     // the target.
-    let position = Array.indexOf(targetParent.children, targetNode);
-    let dragOverItem = position == -1 ? targetParent.lastChild : targetParent.children[position];
+    let dragOverItem;
+    let atEnd = false;
+    if (targetNode == targetArea.customizationTarget) {
+      dragOverItem = targetNode.lastChild;
+      atEnd = true;
+    } else {
+      let position = Array.indexOf(targetParent.children, targetNode);
+      dragOverItem = position == -1 ? targetParent.lastChild : targetParent.children[position];
+    }
 
     if (this._dragOverItem && dragOverItem != this._dragOverItem) {
       this._setDragActive(this._dragOverItem, false);
@@ -597,7 +613,11 @@ CustomizeMode.prototype = {
 
     // XXXjaws Only handling the toolbar case first.
     if (targetArea.localName == "toolbar") {
-      this._setDragActive(dragOverItem, true);
+      let draggedItem = document.getElementById(draggedItemId);
+      if (getPlaceForItem(draggedItem) == "toolbar") {
+        draggedItem.hidden = true;
+      }
+      this._setDragActive(dragOverItem, true, draggedItemWidth, atEnd);
     }
     this._dragOverItem = dragOverItem;
 
@@ -612,9 +632,14 @@ CustomizeMode.prototype = {
 
     let document = aEvent.target.ownerDocument;
     let documentId = document.documentElement.id;
-    let draggedItemId = aEvent.dataTransfer.getData("text/toolbarwrapper-id/" + documentId);
+    let {id: draggedItemId} =
+      aEvent.dataTransfer.mozGetDataAt(kDragDataTypePrefix + documentId, 0);
     let draggedWrapper = document.getElementById("wrapper-" + draggedItemId);
 
+    let draggedItem = document.getElementById(draggedItemId);
+    if (getPlaceForItem(draggedItem) == "toolbar") {
+      draggedItem.hidden = false;
+    }
     draggedWrapper.removeAttribute("mousedown");
 
     let targetNode = aEvent.target;
@@ -719,26 +744,31 @@ CustomizeMode.prototype = {
     document.documentElement.removeAttribute("customizing-movingItem");
 
     let documentId = document.documentElement.id;
-    if (!aEvent.dataTransfer.types.contains("text/toolbarwrapper-id/"
-                                            + documentId.toLowerCase())) {
+    if (!aEvent.dataTransfer.mozTypesAt(0)) {
       return;
     }
 
-    let draggedItemId = aEvent.dataTransfer.getData("text/toolbarwrapper-id/" + documentId);
-    let draggedWrapper = document.getElementById("wrapper-" + draggedItemId);
+    let {id: draggedItemId} =
+      aEvent.dataTransfer.mozGetDataAt(kDragDataTypePrefix + documentId, 0);
+    let draggedItem = document.getElementById(draggedItemId);
+    if (getPlaceForItem(draggedItem) == "toolbar") {
+      draggedItem.hidden = false;
+    }
 
+    let draggedWrapper = document.getElementById("wrapper-" + draggedItemId);
     draggedWrapper.removeAttribute("mousedown");
   },
 
-  // XXXjaws Show a ghost image or blank area where the item could be added, instead of black bar
-  _setDragActive: function(aItem, aValue) {
+  _setDragActive: function(aItem, aValue, aWidth, aAtEnd) {
     let node = aItem;
     let window = aItem.ownerDocument.defaultView;
     let direction = window.getComputedStyle(aItem, null).direction;
-    let value = direction == "ltr"? "left" : "right";
-    if (aItem.localName == "toolbar") {
-      node = aItem.lastChild;
+    let value = direction == "ltr" ? "left" : "right";
+    if (aItem.localName == "toolbar" || aAtEnd) {
       value = direction == "ltr"? "right" : "left";
+      if (aItem.localName == "toolbar") {
+        node = aItem.lastChild;
+      }
     }
 
     if (!node) {
@@ -748,9 +778,21 @@ CustomizeMode.prototype = {
     if (aValue) {
       if (!node.hasAttribute("dragover")) {
         node.setAttribute("dragover", value);
+
+        if (aWidth) {
+          if (value == "left") {
+            node.style.borderLeftWidth = aWidth;
+          } else {
+            node.style.borderRightWidth = aWidth;
+          }
+        }
       }
     } else {
       node.removeAttribute("dragover");
+      // Remove both property values in the case that the end padding
+      // had been set.
+      node.style.removeProperty("border-left-width");
+      node.style.removeProperty("border-right-width");
     }
   },
 
diff --git a/browser/themes/shared/customizableui/customizeMode.inc.css b/browser/themes/shared/customizableui/customizeMode.inc.css
index ed7359226608..7eea0918b834 100644
--- a/browser/themes/shared/customizableui/customizeMode.inc.css
+++ b/browser/themes/shared/customizableui/customizeMode.inc.css
@@ -63,9 +63,9 @@
 
 toolbarpaletteitem {
   cursor: -moz-grab;
-  transition: transform, background-color, border-color, box-shadow;
-  transition-duration: 50ms, 10ms, 10ms, 10ms;
-  transition-timing-function: ease-in-out, linear, linear, linear;
+  transition: transform, background-color, border-color, box-shadow, border-width;
+  transition-duration: 50ms, 10ms, 10ms, 10ms, 250ms;
+  transition-timing-function: ease-in-out, linear, linear, linear, ease-in-out;
 }
 
 toolbarpaletteitem[mousedown] {
@@ -75,6 +75,12 @@ toolbarpaletteitem[mousedown] {
   transform: scale(1.1);
 }
 
+/* Override the toolkit styling for items being dragged over. */
+toolbarpaletteitem[dragover] {
+  border-left-color: transparent;
+  border-right-color: transparent;
+}
+
 #customization-palette {
   display: block;
   overflow: auto;

From 62bc3cd267aebae2d785c89cfdb678a234affbfa Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Wed, 29 May 2013 17:41:44 -0400
Subject: [PATCH 171/230] Bug 868135 - Remove the History sidebar control as a
 toolbar customization item. r=jaws.

---
 browser/base/content/browser.xul                  |  4 ----
 browser/locales/en-US/chrome/browser/browser.dtd  |  1 -
 browser/themes/linux/browser.css                  |  4 +---
 browser/themes/osx/browser.css                    | 15 ---------------
 .../themes/osx/customizableui/panelUIOverlay.css  |  2 --
 browser/themes/shared/browser.inc                 |  2 +-
 browser/themes/windows/browser.css                |  1 -
 7 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 52c7f3ea5ca1..5e0a1496ab97 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -986,10 +986,6 @@
                      label="&downloads.label;"
                      tooltiptext="&downloads.tooltip;"/>
 
-      <toolbarbutton id="history-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-                     observes="viewHistorySidebar" label="&historyButton.label;"
-                     tooltiptext="&historyButton.tooltip;"/>
-
       <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                      label="&newNavigatorCmd.label;"
                      command="key_newNavigator"
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 7ee7e1453041..3ee00426af17 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -185,7 +185,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY bookmarksWinCmd.commandkey "i">
 
 <!ENTITY historyButton.label            "History">
-<!ENTITY historyButton.tooltip          "Display pages you've viewed recently">
 <!ENTITY historySidebarCmd.commandKey   "h">
 
 <!ENTITY toolsMenu.label              "Tools">
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 3ef15a65d524..74fda3d4cdc3 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -651,7 +651,6 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   -moz-image-region: rect(0px 24px 24px 0px);
 }
 
-#history-button,
 toolbar > .customization-target > #history-panelmenu,
 toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   -moz-image-region: rect(0px 48px 24px 24px);
@@ -804,8 +803,7 @@ toolbar[iconsize="small"] #downloads-button {
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
-toolbar[iconsize="small"] #webrtc-status-button /* temporary placeholder (bug 824825) */,
-toolbar[iconsize="small"] #history-button {
+toolbar[iconsize="small"] #webrtc-status-button /* temporary placeholder (bug 824825) */ {
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 837382cd80bc..57111c476cca 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -876,26 +876,11 @@ toolbarbutton.bookmark-item > menupopup {
 
 /* history sidebar button */
 
-#history-button,
 toolbar > .customization-target > #history-panelmenu,
 toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   -moz-image-region: rect(0, 160px, 20px, 140px);
 }
 
-#history-button[checked="true"] {
-  -moz-image-region: rect(20px, 160px, 40px, 140px);
-}
-
-@media (min-resolution: 2dppx) {
-  #history-button {
-    -moz-image-region: rect(0, 320px, 40px, 280px);
-  }
-
-  #history-button[checked="true"] {
-    -moz-image-region: rect(40px, 320px, 80px, 280px);
-  }
-}
-
 /* bookmark sidebar & menu buttons */
 
 #bookmarks-menu-button {
diff --git a/browser/themes/osx/customizableui/panelUIOverlay.css b/browser/themes/osx/customizableui/panelUIOverlay.css
index ab22343e2bed..ad050b8c7ef0 100644
--- a/browser/themes/osx/customizableui/panelUIOverlay.css
+++ b/browser/themes/osx/customizableui/panelUIOverlay.css
@@ -47,8 +47,6 @@
     -moz-image-region: rect(64px 192px 128px 128px);
   }
 
-  #PanelUI-contents[type="grid"] #history-button,
-  #customization-palette #history-button,
   #PanelUI-contents[type="grid"] #history-panelmenu,
   #customization-palette #history-panelmenu {
     -moz-image-region: rect(128px 64px 192px 0);
diff --git a/browser/themes/shared/browser.inc b/browser/themes/shared/browser.inc
index c9cab4fa911d..017d06ff1624 100644
--- a/browser/themes/shared/browser.inc
+++ b/browser/themes/shared/browser.inc
@@ -1,3 +1,3 @@
 %filter substitution
 
-%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #history-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #zoom-out-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button
+%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #zoom-out-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 63a7baa055a9..b4e20a407222 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -688,7 +688,6 @@ menuitem.bookmark-item {
   -moz-image-region: rect(0, 108px, 18px, 90px);
 }
 
-#history-button,
 toolbar > .customization-target > #history-panelmenu,
 toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   -moz-image-region: rect(0, 126px, 18px, 108px);

From 21aec1c53929a5750f30095758e9d08b171a93a8 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Wed, 29 May 2013 17:41:46 -0400
Subject: [PATCH 172/230] Bug 875798 - Make the default placements for nav-bar
 reflect reality. r=Gijs.

---
 browser/components/customizableui/src/CustomizableUI.jsm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 7d21f0140881..7b7c08e728aa 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -82,7 +82,8 @@ let gDefaultPlacements = new Map([
     "bookmarks-menu-button",
     "downloads-button",
     "home-button",
-    "social-toolbar-button",
+    "social-share-button",
+    "social-toolbar-item",
   ]],
   ["PersonalToolbar", [
     "personal-bookmarks",

From fea8f34169403ecd8d1646d92f410d3e85107340 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Wed, 29 May 2013 18:22:22 -0400
Subject: [PATCH 173/230] Bug 874140 - The "Restore Defaults" button should not
 be display:none when hidden. r=jaws.

---
 browser/base/content/browser.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index ba1b78dbee40..244f7734cea6 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -662,3 +662,8 @@ chatbar {
   height: 0;
   max-height: 0;
 }
+
+#customization-reset-button[hidden="true"] {
+  display: -moz-box;
+  visibility: hidden;
+}

From 9a1b967bfe24e5b5e4585baa7d5663b58cc6f725 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 30 May 2013 10:07:43 +0200
Subject: [PATCH 174/230] Bug 870014 - Cannot insert customizable items to the
 left of the tabstrip, r=mconley

---
 .../customizableui/src/CustomizeMode.jsm      | 76 ++++++++++++-------
 1 file changed, 48 insertions(+), 28 deletions(-)

diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index e6ea4082e811..33175c22d373 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -132,11 +132,11 @@ CustomizeMode.prototype = {
     this._wrapToolbarItems();
     this.populatePalette();
 
-    this.visiblePalette.addEventListener("dragstart", this);
-    this.visiblePalette.addEventListener("dragover", this);
-    this.visiblePalette.addEventListener("dragexit", this);
-    this.visiblePalette.addEventListener("drop", this);
-    this.visiblePalette.addEventListener("dragend", this);
+    this.visiblePalette.addEventListener("dragstart", this, true);
+    this.visiblePalette.addEventListener("dragover", this, true);
+    this.visiblePalette.addEventListener("dragexit", this, true);
+    this.visiblePalette.addEventListener("drop", this, true);
+    this.visiblePalette.addEventListener("dragend", this, true);
 
     this.resetButton.hidden = CustomizableUI.inDefaultState;
 
@@ -163,11 +163,11 @@ CustomizeMode.prototype = {
 
     this.depopulatePalette();
 
-    this.visiblePalette.removeEventListener("dragstart", this);
-    this.visiblePalette.removeEventListener("dragover", this);
-    this.visiblePalette.removeEventListener("dragexit", this);
-    this.visiblePalette.removeEventListener("drop", this);
-    this.visiblePalette.removeEventListener("dragend", this);
+    this.visiblePalette.removeEventListener("dragstart", this, true);
+    this.visiblePalette.removeEventListener("dragover", this, true);
+    this.visiblePalette.removeEventListener("dragexit", this, true);
+    this.visiblePalette.removeEventListener("drop", this, true);
+    this.visiblePalette.removeEventListener("dragend", this, true);
 
     let window = this.window;
     let document = this.document;
@@ -313,6 +313,9 @@ CustomizeMode.prototype = {
   },
 
   wrapToolbarItem: function(aNode, aPlace) {
+    if (!this.isCustomizableItem(aNode)) {
+      return aNode;
+    }
     let wrapper = this.createWrapper(aNode, aPlace);
     // It's possible that this toolbar node is "mid-flight" and doesn't have
     // a parent, in which case we skip replacing it. This can happen if a
@@ -372,6 +375,9 @@ CustomizeMode.prototype = {
   },
 
   unwrapToolbarItem: function(aWrapper) {
+    if (aWrapper.nodeName != "toolbarpaletteitem") {
+      return aWrapper;
+    }
     aWrapper.removeEventListener("mousedown", this);
     aWrapper.removeEventListener("mouseup", this);
 
@@ -408,11 +414,11 @@ CustomizeMode.prototype = {
     this.areas = [];
     for (let area of CustomizableUI.areas) {
       let target = CustomizableUI.getCustomizeTargetForArea(area, window);
-      target.addEventListener("dragstart", this);
-      target.addEventListener("dragover", this);
-      target.addEventListener("dragexit", this);
-      target.addEventListener("drop", this);
-      target.addEventListener("dragend", this);
+      target.addEventListener("dragstart", this, true);
+      target.addEventListener("dragover", this, true);
+      target.addEventListener("dragexit", this, true);
+      target.addEventListener("drop", this, true);
+      target.addEventListener("dragend", this, true);
       for (let child of target.children) {
         if (this.isCustomizableItem(child)) {
           this.wrapToolbarItem(child, getPlaceForItem(child));
@@ -429,11 +435,11 @@ CustomizeMode.prototype = {
           this.unwrapToolbarItem(toolbarItem);
         }
       }
-      target.removeEventListener("dragstart", this);
-      target.removeEventListener("dragover", this);
-      target.removeEventListener("dragexit", this);
-      target.removeEventListener("drop", this);
-      target.removeEventListener("dragend", this);
+      target.removeEventListener("dragstart", this, true);
+      target.removeEventListener("dragover", this, true);
+      target.removeEventListener("dragexit", this, true);
+      target.removeEventListener("drop", this, true);
+      target.removeEventListener("dragend", this, true);
     }
   },
 
@@ -573,9 +579,7 @@ CustomizeMode.prototype = {
     let {id: draggedItemId, width: draggedItemWidth} =
       aEvent.dataTransfer.mozGetDataAt(kDragDataTypePrefix + documentId, 0);
     let draggedWrapper = document.getElementById("wrapper-" + draggedItemId);
-    let targetNode = aEvent.target;
-    let targetParent = targetNode.parentNode;
-    let targetArea = this._getCustomizableParent(targetNode);
+    let targetArea = this._getCustomizableParent(aEvent.currentTarget);
     let originArea = this._getCustomizableParent(draggedWrapper);
 
     // Do nothing if the target or origin are not customizable.
@@ -595,6 +599,9 @@ CustomizeMode.prototype = {
       return;
     }
 
+    let targetNode = this._getDragOverNode(aEvent.target);
+    let targetParent = targetNode.parentNode;
+
     // We need to determine the place that the widget is being dropped in
     // the target.
     let dragOverItem;
@@ -642,9 +649,7 @@ CustomizeMode.prototype = {
     }
     draggedWrapper.removeAttribute("mousedown");
 
-    let targetNode = aEvent.target;
-    let targetParent = targetNode.parentNode;
-    let targetArea = this._getCustomizableParent(targetNode);
+    let targetArea = this._getCustomizableParent(aEvent.currentTarget);
     let originArea = this._getCustomizableParent(draggedWrapper);
 
     // Do nothing if the target area or origin area are not customizable.
@@ -652,6 +657,8 @@ CustomizeMode.prototype = {
       return;
     }
 
+    let targetNode = this._getDragOverNode(aEvent.target);
+
     // Do nothing if the target was dropped onto itself (ie, no change in area
     // or position).
     if (draggedWrapper == targetNode) {
@@ -695,9 +702,13 @@ CustomizeMode.prototype = {
 
     // We need to determine the place that the widget is being dropped in
     // the target.
-    let placement = CustomizableUI.getPlacementOfWidget(targetNode.firstChild.id);
+    let targetNodeId = (targetNode.nodeName == "toolbarpaletteitem") ?
+                          targetNode.firstChild && targetNode.firstChild.id :
+                          targetNode.id;
+
+    let placement = CustomizableUI.getPlacementOfWidget(targetNodeId);
     if (!placement) {
-      ERROR("Could not get a position for " + targetNode.firstChild.id);
+      ERROR("Could not get a position for " + targetNodeId);
       return;
     }
 
@@ -808,6 +819,15 @@ CustomizeMode.prototype = {
     return null;
   },
 
+  _getDragOverNode: function(aElement, aAreaElement) {
+    let expectedParent = aAreaElement.customizationTarget || aAreaElement;
+    let targetNode = aElement;
+    while (targetNode && targetNode.parentNode != expectedParent) {
+      targetNode = targetNode.parentNode;
+    }
+    return targetNode || aElement;
+  },
+
   _onMouseDown: function(aEvent) {
     LOG("_onMouseDown");
     let doc = aEvent.target.ownerDocument;

From 9b67ed8c89a16f98e7dc5b996a591c1f42e99892 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 30 May 2013 14:32:13 +0200
Subject: [PATCH 175/230] Bug 870014 - Fix botched conflict resolution and pass
 targetArea, too; original-r=mconley.

---
 browser/components/customizableui/src/CustomizeMode.jsm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index 33175c22d373..93f25349e145 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -599,7 +599,7 @@ CustomizeMode.prototype = {
       return;
     }
 
-    let targetNode = this._getDragOverNode(aEvent.target);
+    let targetNode = this._getDragOverNode(aEvent.target, targetArea);
     let targetParent = targetNode.parentNode;
 
     // We need to determine the place that the widget is being dropped in
@@ -657,7 +657,7 @@ CustomizeMode.prototype = {
       return;
     }
 
-    let targetNode = this._getDragOverNode(aEvent.target);
+    let targetNode = this._getDragOverNode(aEvent.target, targetArea);
 
     // Do nothing if the target was dropped onto itself (ie, no change in area
     // or position).

From 750ae6b455650347c4f4fc86e0d2771aa178e47a Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 30 May 2013 23:08:49 +0200
Subject: [PATCH 176/230] Bug 873501 - Make code dealing with special widgets
 more robust, r=mconley

--HG--
extra : rebase_source : 8e02c477fa0095a096cbe312956085fac98981f7
---
 .../customizableui/src/CustomizableUI.jsm     | 38 +++++++++++++------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 7b7c08e728aa..d5c68d371272 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -18,6 +18,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "DeferredTask",
 
 const kNSXUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
+const kSpecialWidgetPfx = "customizableui-special-";
+
 const kPrefCustomizationState        = "browser.uiCustomization.state";
 const kPrefCustomizationAutoAdd      = "browser.uiCustomization.autoAdd";
 const kPrefCustomizationDebug        = "browser.uiCustomization.debug";
@@ -371,8 +373,9 @@ let CustomizableUIInternal = {
     let document = aWindow.document;
 
     if (this.isSpecialWidget(aWidgetId)) {
-      return [ CustomizableUI.PROVIDER_SPECIAL,
-               this.createSpecialWidget(aWidgetId, document) ];
+      let widgetNode = document.getElementById(aWidgetId) ||
+                       this.createSpecialWidget(aWidgetId, document);
+      return [ CustomizableUI.PROVIDER_SPECIAL, widgetNode];
     }
 
     let widget = gPalette.get(aWidgetId);
@@ -596,20 +599,29 @@ let CustomizableUIInternal = {
   },
 
   isSpecialWidget: function(aId) {
-    //XXXunf Need to double check these are getting handled correctly
-    //       everywhere, notably save/restore.
-    return (aId.startsWith("separator") ||
+    return (aId.startsWith(kSpecialWidgetPfx) ||
+            aId.startsWith("separator") ||
             aId.startsWith("spring") ||
             aId.startsWith("spacer"));
   },
 
+  ensureSpecialWidgetId: function(aId) {
+    let nodeType = aId.match(/spring|spacer|separator/)[0];
+    // If the ID we were passed isn't a generated one, generate one now:
+    if (nodeType == aId) {
+      // Due to timers resolution Date.now() can be the same for
+      // elements created in small timeframes.  So ids are
+      // differentiated through a unique count suffix.
+      return kSpecialWidgetPfx + aId + Date.now() + (++gNewElementCount);
+    }
+    return aId;
+  },
+
   createSpecialWidget: function(aId, aDocument) {
-    let node = aDocument.createElementNS(kNSXUL, "toolbar" + aId);
-    // Due to timers resolution Date.now() can be the same for
-    // elements created in small timeframes.  So ids are
-    // differentiated through a unique count suffix.
-    node.id = aId + Date.now() + (++gNewElementCount);
-    if (aId == "spring") {
+    let nodeName = "toolbar" + aId.match(/spring|spacer|separator/)[0];
+    let node = aDocument.createElementNS(kNSXUL, nodeName);
+    node.id = this.ensureSpecialWidgetId(aId);
+    if (nodeName == "toolbarspring") {
       node.flex = 1;
     }
     return node;
@@ -822,6 +834,10 @@ let CustomizableUIInternal = {
       return;
     }
 
+    if (this.isSpecialWidget(aWidgetId)) {
+      aWidgetId = this.ensureSpecialWidgetId(aWidgetId);
+    }
+
     let oldPlacement = this.getPlacementOfWidget(aWidgetId);
     if (oldPlacement && oldPlacement.area == aArea) {
       this.moveWidgetWithinArea(aWidgetId, aPosition);

From ff77091ff4b45cb239ebd8c4af01f93dc0b8cc44 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 30 May 2013 23:09:04 +0200
Subject: [PATCH 177/230] Bug 873501 - Add tests for special widgets, r=mconley

--HG--
extra : rebase_source : 828591aa9888641d810ae73c4289aac276e6ab15
---
 browser/components/customizableui/moz.build   |  1 +
 .../customizableui/test/Makefile.in           | 18 ++++
 .../test/browser_873501_handle_specials.js    | 75 +++++++++++++++++
 .../components/customizableui/test/head.js    | 83 +++++++++++++++++++
 .../components/customizableui/test/moz.build  |  0
 5 files changed, 177 insertions(+)
 create mode 100644 browser/components/customizableui/test/Makefile.in
 create mode 100644 browser/components/customizableui/test/browser_873501_handle_specials.js
 create mode 100644 browser/components/customizableui/test/head.js
 create mode 100644 browser/components/customizableui/test/moz.build

diff --git a/browser/components/customizableui/moz.build b/browser/components/customizableui/moz.build
index ecda062b9991..58eac04f873d 100644
--- a/browser/components/customizableui/moz.build
+++ b/browser/components/customizableui/moz.build
@@ -7,4 +7,5 @@
 PARALLEL_DIRS += [
 		'content',
 		'src',
+		'test',
 ]
diff --git a/browser/components/customizableui/test/Makefile.in b/browser/components/customizableui/test/Makefile.in
new file mode 100644
index 000000000000..40f2a0dff198
--- /dev/null
+++ b/browser/components/customizableui/test/Makefile.in
@@ -0,0 +1,18 @@
+# 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@
+relativesrcdir  = @relativesrcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MOCHITEST_BROWSER_FILES = \
+  browser_873501_handle_specials.js \
+  head.js \
+  $(NULL)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/customizableui/test/browser_873501_handle_specials.js b/browser/components/customizableui/test/browser_873501_handle_specials.js
new file mode 100644
index 000000000000..56db541cd859
--- /dev/null
+++ b/browser/components/customizableui/test/browser_873501_handle_specials.js
@@ -0,0 +1,75 @@
+/* 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/. */
+
+const kToolbarName = "test-specials-toolbar";
+
+let gTests = [
+  {
+    desc: "Add a toolbar with two springs and the downloads button.",
+    run: function() {
+      // Create the toolbar with a single spring:
+      createToolbarWithPlacements(kToolbarName, ["spring"]);
+      ok(document.getElementById(kToolbarName), "Toolbar should be created.");
+
+      // Check it's there with a generated ID:
+      assertAreaPlacements(kToolbarName, [/customizableui-special-spring\d+/]);
+      let [springId] = getAreaWidgetIds(kToolbarName);
+
+      // Add a second spring, check if that's there and doesn't share IDs
+      CustomizableUI.addWidgetToArea("spring", kToolbarName);
+      assertAreaPlacements(kToolbarName, [springId,
+                                          /customizableui-special-spring\d+/]);
+      let [, spring2Id] = getAreaWidgetIds(kToolbarName);
+
+      isnot(springId, spring2Id, "Springs shouldn't have identical IDs.");
+
+      // Try moving the downloads button to this new toolbar, between the two springs:
+      CustomizableUI.addWidgetToArea("downloads-button", kToolbarName, 1);
+      assertAreaPlacements(kToolbarName, [springId, "downloads-button", spring2Id]);
+    }
+  },
+  {
+    desc: "Add separators around the downloads button.",
+    run: function() {
+      CustomizableUI.addWidgetToArea("separator", kToolbarName, 1);
+      CustomizableUI.addWidgetToArea("separator", kToolbarName, 3);
+      assertAreaPlacements(kToolbarName,
+                           [/customizableui-special-spring\d+/,
+                            /customizableui-special-separator\d+/,
+                            "downloads-button",
+                            /customizableui-special-separator\d+/,
+                            /customizableui-special-spring\d+/]);
+      let [,separator1Id,,separator2Id,] = getAreaWidgetIds(kToolbarName);
+      isnot(separator1Id, separator2Id, "Separator ids shouldn't be equal.");
+    }
+  },
+  {
+    desc: "Add spacers around the downloads button.",
+    run: function() {
+      CustomizableUI.addWidgetToArea("spacer", kToolbarName, 2);
+      CustomizableUI.addWidgetToArea("spacer", kToolbarName, 4);
+      assertAreaPlacements(kToolbarName,
+                           [/customizableui-special-spring\d+/,
+                            /customizableui-special-separator\d+/,
+                            /customizableui-special-spacer\d+/,
+                            "downloads-button",
+                            /customizableui-special-spacer\d+/,
+                            /customizableui-special-separator\d+/,
+                            /customizableui-special-spring\d+/]);
+      let [,,spacer1Id,,spacer2Id,,] = getAreaWidgetIds(kToolbarName);
+      isnot(spacer1Id, spacer2Id, "Spacer ids shouldn't be equal.");
+    }
+  }
+];
+
+function cleanup() {
+  removeCustomToolbars();
+  resetCustomization();
+}
+
+function test() {
+  waitForExplicitFinish();
+  registerCleanupFunction(cleanup);
+  runTests(gTests);
+}
diff --git a/browser/components/customizableui/test/head.js b/browser/components/customizableui/test/head.js
new file mode 100644
index 000000000000..e163039aeb12
--- /dev/null
+++ b/browser/components/customizableui/test/head.js
@@ -0,0 +1,83 @@
+/* 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/. */
+
+
+// Avoid leaks by using tmp for imports...
+let tmp = {};
+Cu.import("resource://gre/modules/Task.jsm", tmp);
+Cu.import("resource:///modules/CustomizableUI.jsm", tmp);
+let {Task, CustomizableUI} = tmp;
+
+const kNSXUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+
+function createToolbarWithPlacements(id, placements) {
+  let tb = document.createElementNS(kNSXUL, "toolbar");
+  tb.id = id;
+  tb.setAttribute("customizable", "true");
+  document.getElementById("customToolbars").appendChild(tb);
+  CustomizableUI.registerArea(id, {
+    type: CustomizableUI.TYPE_TOOLBAR
+  });
+  for (let p of placements) {
+    CustomizableUI.addWidgetToArea(p, id);
+  }
+}
+
+function removeCustomToolbars() {
+  let customToolbarSet = document.getElementById("customToolbars");
+  while (customToolbarSet.lastChild) {
+    customToolbarSet.lastChild.remove();
+  }
+}
+
+function resetCustomization() {
+  CustomizableUI.reset();
+}
+
+function assertAreaPlacements(areaId, expectedPlacements) {
+  let actualPlacements = getAreaWidgetIds(areaId);
+  is(actualPlacements.length, expectedPlacements.length,
+     "Area " + areaId + " should have the right number of items.");
+  let minItems = Math.min(expectedPlacements.length, actualPlacements.length);
+  for (let i = 0; i < minItems; i++) {
+    if (typeof expectedPlacements[i] == "string") {
+      is(actualPlacements[i], expectedPlacements[i],
+         "Item " + i + " in " + areaId + " should match expectations.");
+    } else if (expectedPlacements[i] instanceof RegExp) {
+      ok(expectedPlacements[i].test(actualPlacements[i]),
+         "Item " + i + " (" + actualPlacements[i] + ") in " +
+         areaId + " should match " + expectedPlacements[i]); 
+    } else {
+      ok(false, "Unknown type of expected placement passed to " +
+                " assertAreaPlacements. Is your test broken?");
+    }
+  }
+}
+
+function getAreaWidgetIds(areaId) {
+  let widgetAry = CustomizableUI.getWidgetsInArea(areaId);
+  return widgetAry.map(x => x.id);
+}
+
+function testRunner(testAry) {
+  for (let test of testAry) {
+    info(test.desc);
+
+    if (test.setup)
+      yield test.setup();
+
+    info("Running test");
+    yield test.run();
+    info("Cleanup");
+    if (test.teardown)
+      yield test.teardown();
+  }
+}
+
+function runTests(testAry) {
+  Task.spawn(testRunner(gTests)).then(finish, ex => {
+    ok(false, "Unexpected exception: " + ex);
+    finish();
+  });
+}
diff --git a/browser/components/customizableui/test/moz.build b/browser/components/customizableui/test/moz.build
new file mode 100644
index 000000000000..e69de29bb2d1

From 3a83e9e855931e720e9e43b8b4c2908438c444b9 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 30 May 2013 23:24:59 +0200
Subject: [PATCH 178/230] Bug 877524 - Add comment to browser.xul about default
 placement arrays, r=mconley

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

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 5e0a1496ab97..a11f007a7f64 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -498,6 +498,12 @@
 #endif
     </toolbar>
 
+    <!--
+           CAVEAT EMPTOR
+           Should you need to add items to the toolbar here, make sure to also add them
+           to the default placements of buttons in CustomizableUI.jsm, so the
+           customization code doesn't get confused.
+      -->
     <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
              aria-label="&navbarCmd.label;"
              fullscreentoolbar="true" mode="icons" customizable="true"

From 0f99b571349ab829d9a27fa1094b08683e0541a1 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 31 May 2013 11:07:36 -0400
Subject: [PATCH 179/230] Bug 873867 - Adjust panelmultiview binding to allow
 easy swapping of mainviews. r=Unfocused.

---
 browser/base/content/browser.css              |  17 +++
 .../customizableui/content/panelUI.css        |   1 +
 .../customizableui/content/panelUI.inc.xul    |  14 +--
 .../customizableui/content/panelUI.js         |  33 ++++--
 .../customizableui/content/panelUI.xml        | 105 +++++++++++++++---
 .../customizableui/src/CustomizeMode.jsm      |   2 +-
 .../customizableui/panelUIOverlay.inc.css     |  34 +-----
 7 files changed, 147 insertions(+), 59 deletions(-)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 244f7734cea6..61b2547b66e9 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -27,6 +27,23 @@ toolbar[customizable="true"]:not([nowindowdrag="true"]) {
   -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-menubar-autohide");
 }
 
+panelmultiview {
+  -moz-binding: url("chrome://browser/content/customizableui/panelUI.xml#panelmultiview");
+}
+
+panelview {
+  -moz-binding: url("chrome://browser/content/customizableui/panelUI.xml#panelview");
+  -moz-box-orient: vertical;
+}
+
+.panel-mainview {
+  transition: transform 150ms;
+}
+
+panelview:not([mainview]):not([current]) {
+  display: none;
+}
+
 tabbrowser {
   -moz-binding: url("chrome://browser/content/tabbrowser.xml#tabbrowser");
 }
diff --git a/browser/components/customizableui/content/panelUI.css b/browser/components/customizableui/content/panelUI.css
index 8d77de102678..2f97a5ee4b0e 100644
--- a/browser/components/customizableui/content/panelUI.css
+++ b/browser/components/customizableui/content/panelUI.css
@@ -6,6 +6,7 @@
   pointer-events: none;
 }
 
+.panel-mainview,
 .panel-viewcontainer,
 .panel-viewstack {
   overflow: hidden;
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index 02358b48345e..36b996016cb3 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -7,8 +7,8 @@
        type="arrow"
        level="top"
        consumeoutsideclicks="true">
-  <panelmultiview id="PanelUI-multiView">
-    <panelmainview id="PanelUI-mainView">
+  <panelmultiview id="PanelUI-multiView" mainViewId="PanelUI-mainView">
+    <panelview id="PanelUI-mainView" flex="1">
       <vbox class="PanelUI-pageControls" pack="center">
         <hbox class="PanelUI-editControls">
           <toolbarbutton id="PanelUI-cut-btn" flex="1"
@@ -58,9 +58,9 @@
         <toolbarbutton id="PanelUI-customize-btn" label="&appMenuCustomize.label;"
                        command="cmd_CustomizeToolbars"/>
       </footer>
-    </panelmainview>
+    </panelview>
 
-    <panelsubview id="PanelUI-history" flex="1">
+    <panelview id="PanelUI-history" flex="1">
       <label value="&appMenuHistory.label;"/>
       <toolbarbutton id="appMenuClearRecentHistory"
                      label="&appMenuHistory.clearRecent.label;"
@@ -73,12 +73,12 @@
              id="PanelUI-historyMore"
              class="text-link"
              onclick="PlacesCommandHook.showPlacesOrganizer('History'); PanelUI.hide();"/>
-    </panelsubview>
+    </panelview>
 
-    <panelsubview id="PanelUI-help" flex="1">
+    <panelview id="PanelUI-help" flex="1">
       <label value="&helpMenu.label;"/>
       <vbox id="PanelUI-helpItems"/>
-    </panelsubview>
+    </panelview>
   </panelmultiview>
 </panel>
 
diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
index 2653cf9af1c9..11206a88150b 100644
--- a/browser/components/customizableui/content/panelUI.js
+++ b/browser/components/customizableui/content/panelUI.js
@@ -70,8 +70,8 @@ const PanelUI = {
    * @param aMainView
    *        The mainView node to put back into place.
    */
-  replaceMainView: function(aMainView) {
-    this.multiView.insertBefore(aMainView, this.multiView.firstChild);
+  setMainView: function(aMainView) {
+    this.multiView.setMainView(aMainView);
   },
 
   /**
@@ -180,17 +180,27 @@ const PanelUI = {
       viewNode.dispatchEvent(evt);
 
       let tempPanel = document.createElement("panel");
-      tempPanel.appendChild(viewNode);
       tempPanel.setAttribute("type", "arrow");
       tempPanel.setAttribute("id", "customizationui-widget-panel");
       document.getElementById(CustomizableUI.AREA_NAVBAR).appendChild(tempPanel);
+
+      let multiView = document.createElement("panelmultiview");
+      tempPanel.appendChild(multiView);
+      multiView.setMainView(viewNode);
+      tempPanel.addEventListener("command", PanelUI._onWidgetPanelCommand);
+
       tempPanel.addEventListener("popuphidden", function panelRemover() {
         tempPanel.removeEventListener("popuphidden", panelRemover);
+        tempPanel.removeEventListener("command", PanelUI._onWidgetPanelCommand);
         this.multiView.appendChild(viewNode);
         tempPanel.parentElement.removeChild(tempPanel);
       }.bind(this));
 
-      tempPanel.openPopup(aAnchor, "bottomcenter topright");
+      let iconAnchor =
+        document.getAnonymousElementByAttribute(aAnchor, "class",
+                                                "toolbarbutton-icon");
+
+      tempPanel.openPopup(iconAnchor || aAnchor, "bottomcenter topright");
     }
   },
 
@@ -208,9 +218,14 @@ const PanelUI = {
       .getFormattedString("zoomReset.label", [Math.floor(ZoomManager.zoom * 100)]));
   },
 
-  // Button onclick handler which hides the whole PanelUI
-  _onHelpViewClick: function(aEvent) {
-    if (aEvent.button == 0 && !aEvent.target.hasAttribute("disabled")) {
+  _onWidgetPanelCommand: function(aEvent) {
+    if (!aEvent.originalTarget.hasAttribute("noautoclose")) {
+      aEvent.currentTarget.hidePopup();
+    }
+  },
+
+  _onHelpViewCommand: function(aEvent) {
+    if (!aEvent.originalTarget.hasAttribute("noautoclose")) {
       PanelUI.hide();
     }
   },
@@ -246,10 +261,10 @@ const PanelUI = {
     }
     items.appendChild(fragment);
 
-    this.addEventListener("click", PanelUI._onHelpViewClick, false);
+    this.addEventListener("command", PanelUI._onHelpViewCommand);
   },
 
   _onHelpViewHide: function(aEvent) {
-    this.removeEventListener("click", PanelUI._onHelpViewClick);
+    this.removeEventListener("command", PanelUI._onHelpViewCommand);
   }
 };
diff --git a/browser/components/customizableui/content/panelUI.xml b/browser/components/customizableui/content/panelUI.xml
index edf9c6efccb1..dcb86ae2bb39 100644
--- a/browser/components/customizableui/content/panelUI.xml
+++ b/browser/components/customizableui/content/panelUI.xml
@@ -45,7 +45,7 @@
     <content>
       <xul:box anonid="viewContainer" class="panel-viewcontainer" xbl:inherits="panelopen">
         <xul:stack anonid="viewStack" view="main" class="panel-viewstack">
-          <children includes="panelmainview"/>
+          <xul:vbox anonid="mainViewContainer" class="panel-mainview"/>
 
           <!-- Used to capture click events over the PanelUI-mainView if we're in
                subview mode. That way, any click on the PanelUI-mainView causes us
@@ -59,7 +59,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. -->
           <xul:vbox anonid="subViews" class="panel-subviews" xbl:inherits="panelopen">
-            <children includes="panelsubview"/>
+            <children includes="panelview"/>
           </xul:vbox>
         </xul:stack>
       </xul:box>
@@ -71,8 +71,8 @@
       <field name="_viewContainer" readonly="true">
         document.getAnonymousElementByAttribute(this, "anonid", "viewContainer");
       </field>
-      <field name="_mainView" readonly="true">
-        this.querySelector("panelmainview");
+      <field name="_mainViewContainer" readonly="true">
+        document.getAnonymousElementByAttribute(this, "anonid", "mainViewContainer");
       </field>
       <field name="_subViews" readonly="true">
         document.getAnonymousElementByAttribute(this, "anonid", "subViews");
@@ -88,28 +88,63 @@
       <field name="_anchorElement">null</field>
       <field name="_mainViewHeight">0</field>
       <field name="_subViewObserver">null</field>
+      <field name="_transitioning">false</field>
 
       <property name="showingSubView" readonly="true"
                 onget="return this._viewStack.getAttribute('view') == 'subview'"/>
+      <property name="_mainViewId" onget="return this.getAttribute('mainViewId');" onset="this.setAttribute('mainViewId', val); return val;"/>
+      <property name="_mainView" readonly="true"
+                onget="return document.getElementById(this._mainViewId);"/>
 
       <constructor><![CDATA[
         this._clickCapturer.addEventListener("click", this);
         this._panel.addEventListener("popupshowing", this);
         this._panel.addEventListener("popuphidden", this);
+        this._subViews.addEventListener("overflow", this);
+        this._mainViewContainer.addEventListener("overflow", this);
+
         // 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(this._syncContainerWithSubView.bind(this));
-        this._subViews.addEventListener("overflow", this);
+        this._mainViewObserver =
+          new MutationObserver(this._syncContainerWithMainView.bind(this));
+
+        this._mainViewContainer.setAttribute("panelid",
+                                             this._panel.id);
+
+        if (this._mainView) {
+          this.setMainView(this._mainView);
+        }
       ]]></constructor>
 
       <destructor><![CDATA[
+        if (this._mainView) {
+          this._mainView.removeAttribute("mainview");
+        }
+        this._mainViewObserver.disconnect();
         this._subViewObserver.disconnect();
         this._panel.removeEventListener("popupshowing", this);
         this._panel.removeEventListener("popuphidden", this);
+        this._subViews.removeEventListener("overflow", this);
+        this._mainViewContainer.removeEventListener("overflow", this);
         this._clickCapturer.removeEventListener("click", this);
       ]]></destructor>
 
+      <method name="setMainView">
+        <parameter name="aNewMainView"/>
+        <body><![CDATA[
+        if (this._mainView) {
+          this._mainViewObserver.disconnect();
+          this._subViews.appendChild(this._mainView);
+          this._mainView.removeAttribute("mainview");
+        }
+        this._mainViewId = aNewMainView.id;
+        aNewMainView.setAttribute("mainview", "true");
+        this._mainViewContainer.appendChild(aNewMainView);
+        ]]></body>
+      </method>
+
       <method name="showMainView">
         <body><![CDATA[
           if (this.showingSubView) {
@@ -121,12 +156,26 @@
             viewNode.removeAttribute("current");
             this._currentSubView = null;
 
-            this._viewContainer.style.height = this._mainViewHeight + "px";
             this._subViewObserver.disconnect();
 
+            this._transitioning = true;
+
+            this._viewContainer.addEventListener("transitionend", function trans() {
+              this._viewContainer.removeEventListener("transitionend", trans);
+              this._transitioning = false;
+            }.bind(this));
+            this._viewContainer.style.height = this._mainViewHeight + "px";
+
             this._viewStack.setAttribute("view", "main");
           }
 
+          this._mainViewObserver.observe(this._mainView, {
+            attributes: true,
+            characterData: true,
+            childList: true,
+            subtree: true
+          });
+
           this._shiftMainView();
         ]]></body>
       </method>
@@ -161,7 +210,14 @@
           this._shiftMainView(aAnchor);
 
           this._mainViewHeight = this._viewStack.clientHeight;
+
+          this._transitioning = true;
+          this._viewContainer.addEventListener("transitionend", function trans() {
+            this._viewContainer.removeEventListener("transitionend", trans);
+            this._transitioning = false;
+          }.bind(this));
           this._viewContainer.style.height = this._subViews.scrollHeight + "px";
+
           this._subViewObserver.observe(viewNode, {
             attributes: true,
             characterData: true,
@@ -179,14 +235,14 @@
             // panel. Then we need to add half the width of the anchor. This is the
             // target that we need to transition to.
             let anchorRect = aAnchor.getBoundingClientRect();
-            let mainViewRect = this._mainView.getBoundingClientRect();
+            let mainViewRect = this._mainViewContainer.getBoundingClientRect();
             let leftEdge = anchorRect.left - mainViewRect.left;
             let center = aAnchor.clientWidth / 2;
             let target = leftEdge + center;
-            this._mainView.style.transform = "translateX(-" + target + "px)";
+            this._mainViewContainer.style.transform = "translateX(-" + target + "px)";
             aAnchor.classList.add("panel-multiview-anchor");
           } else {
-            this._mainView.style.transform = "";
+            this._mainViewContainer.style.transform = "";
             if (this.anchorElement)
               this.anchorElement.classList.remove("panel-multiview-anchor");
           }
@@ -204,8 +260,12 @@
               }
               break;
             case "overflow":
-              // Resize the subview on the next tick.
-              setTimeout(this._syncContainerWithSubView.bind(this), 0);
+              // Resize the right view on the next tick.
+              if (this.showingSubView) {
+                setTimeout(this._syncContainerWithSubView.bind(this), 0);
+              } else if (!this.transitioning) {
+                setTimeout(this._syncContainerWithMainView.bind(this), 0);
+              }
               break;
             case "popupshowing":
               this.setAttribute("panelopen", "true");
@@ -221,16 +281,35 @@
 
       <method name="_syncContainerWithSubView">
         <body><![CDATA[
-          this._viewContainer.style.height = this._subViews.scrollHeight + "px";
+          if (this.showingSubView) {
+            this._viewContainer.style.height =
+              this._subViews.scrollHeight + "px";
+          }
         ]]></body>
       </method>
       <method name="_syncContainerWithMainView">
         <body><![CDATA[
-          this._viewContainer.style.height = this._mainView.scrollHeight + "px";
+          if (!this.showingSubView && !this._transitioning) {
+            this._viewContainer.style.height =
+              this._mainViewContainer.scrollHeight + "px";
+          }
         ]]></body>
       </method>
 
     </implementation>
   </binding>
 
+  <binding id="panelview">
+    <implementation>
+      <property name="panelMultiView" readonly="true">
+        <getter><![CDATA[
+          if (this.parentNode.localName != "panelmultiview") {
+            return document.getBindingParent(this.parentNode);
+          }
+
+          return this.parentNode;
+        ]]></getter>
+      </property>
+    </implementation>
+  </binding>
 </bindings>
diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index 93f25349e145..ccf64d3d68b5 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -198,7 +198,7 @@ CustomizeMode.prototype = {
     // Let everybody in this window know that we're starting to
     // exit customization mode.
     this.dispatchToolboxEvent("customizationending");
-    window.PanelUI.replaceMainView(window.PanelUI.mainView);
+    window.PanelUI.setMainView(window.PanelUI.mainView);
 
     let browser = document.getElementById("browser");
     browser.parentNode.selectedPanel = browser;
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index e7d7e00f57de..ed1e9bd0ae8b 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -2,24 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-panelmultiview {
-  -moz-binding: url("chrome://browser/content/customizableui/panelUI.xml#panelmultiview");
-}
-
-panelmainview,
-panelsubview {
-  display: -moz-box;
-  -moz-box-orient: vertical;
-}
-
-panelmainview {
-  transition: transform 150ms;
-}
-
-panelmultiview > panelsubview:not([current]) {
-  display: none;
-}
-
 .panel-subviews {
   background-image: linear-gradient(to bottom, white 1px, rgba(255, 255, 255, 0) 15px);
   background-color: -moz-dialog;
@@ -79,13 +61,13 @@ panelmultiview > panelsubview:not([current]) {
 .PanelUI-zoomControls,
 #PanelUI-contents,
 .PanelUI-footer,
-#customizationui-widget-panel {
+.panel-mainview:not([panelid="PanelUI-popup"]) {
   max-width: @menuPanelWidth@;
   padding: .5em 1em;
 }
 
 #PanelUI-contents[type="list"] toolbarbutton > .toolbarbutton-text,
-panelsubview toolbarbutton > .toolbarbutton-text,
+panelview:not([mainview]) .toolbarbutton-text,
 #customizationui-widget-panel toolbarbutton > .toolbarbutton-text {
   text-align: start;
   -moz-padding-start: 8px;
@@ -177,9 +159,7 @@ panelsubview toolbarbutton > .toolbarbutton-text,
   display: none;
 }
 
-panelmainview toolbarbutton,
-panelsubview toolbarbutton,
-#customizationui-widget-panel toolbarbutton,
+panelview toolbarbutton,
 #widget-overflow-list > toolbarbutton,
 .customizationmode-button {
   -moz-appearance: none;
@@ -196,9 +176,7 @@ panelsubview toolbarbutton,
   transition-duration: 150ms;
 }
 
-panelmainview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
-panelsubview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
-#customizationui-widget-panel toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
+panelview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #widget-overflow-list > toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #PanelUI-mainView .PanelUI-pageControls toolbarbutton,
 .customizationmode-button,
@@ -210,10 +188,8 @@ panelsubview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:activ
               0 0 2px hsla(210,54%,20%,.1);
 }
 
-panelmainview toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
-panelsubview toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
+panelview toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
 .customizationmode-button:hover:active,
-#customizationui-widget-panel toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
 #widget-overflow-list > toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active) {
   background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
   background-color: hsla(210,54%,20%,.15);

From ba3c45a04f2f7921a07aa7bda7bc5ac70804460a Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 31 May 2013 12:50:01 -0400
Subject: [PATCH 180/230] Backed out changeset aa7f6cd90ff8 (Bug 873867)

---
 browser/base/content/browser.css              |  17 ---
 .../customizableui/content/panelUI.css        |   1 -
 .../customizableui/content/panelUI.inc.xul    |  14 +--
 .../customizableui/content/panelUI.js         |  33 ++----
 .../customizableui/content/panelUI.xml        | 105 +++---------------
 .../customizableui/src/CustomizeMode.jsm      |   2 +-
 .../customizableui/panelUIOverlay.inc.css     |  34 +++++-
 7 files changed, 59 insertions(+), 147 deletions(-)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 61b2547b66e9..244f7734cea6 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -27,23 +27,6 @@ toolbar[customizable="true"]:not([nowindowdrag="true"]) {
   -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-menubar-autohide");
 }
 
-panelmultiview {
-  -moz-binding: url("chrome://browser/content/customizableui/panelUI.xml#panelmultiview");
-}
-
-panelview {
-  -moz-binding: url("chrome://browser/content/customizableui/panelUI.xml#panelview");
-  -moz-box-orient: vertical;
-}
-
-.panel-mainview {
-  transition: transform 150ms;
-}
-
-panelview:not([mainview]):not([current]) {
-  display: none;
-}
-
 tabbrowser {
   -moz-binding: url("chrome://browser/content/tabbrowser.xml#tabbrowser");
 }
diff --git a/browser/components/customizableui/content/panelUI.css b/browser/components/customizableui/content/panelUI.css
index 2f97a5ee4b0e..8d77de102678 100644
--- a/browser/components/customizableui/content/panelUI.css
+++ b/browser/components/customizableui/content/panelUI.css
@@ -6,7 +6,6 @@
   pointer-events: none;
 }
 
-.panel-mainview,
 .panel-viewcontainer,
 .panel-viewstack {
   overflow: hidden;
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index 36b996016cb3..02358b48345e 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -7,8 +7,8 @@
        type="arrow"
        level="top"
        consumeoutsideclicks="true">
-  <panelmultiview id="PanelUI-multiView" mainViewId="PanelUI-mainView">
-    <panelview id="PanelUI-mainView" flex="1">
+  <panelmultiview id="PanelUI-multiView">
+    <panelmainview id="PanelUI-mainView">
       <vbox class="PanelUI-pageControls" pack="center">
         <hbox class="PanelUI-editControls">
           <toolbarbutton id="PanelUI-cut-btn" flex="1"
@@ -58,9 +58,9 @@
         <toolbarbutton id="PanelUI-customize-btn" label="&appMenuCustomize.label;"
                        command="cmd_CustomizeToolbars"/>
       </footer>
-    </panelview>
+    </panelmainview>
 
-    <panelview id="PanelUI-history" flex="1">
+    <panelsubview id="PanelUI-history" flex="1">
       <label value="&appMenuHistory.label;"/>
       <toolbarbutton id="appMenuClearRecentHistory"
                      label="&appMenuHistory.clearRecent.label;"
@@ -73,12 +73,12 @@
              id="PanelUI-historyMore"
              class="text-link"
              onclick="PlacesCommandHook.showPlacesOrganizer('History'); PanelUI.hide();"/>
-    </panelview>
+    </panelsubview>
 
-    <panelview id="PanelUI-help" flex="1">
+    <panelsubview id="PanelUI-help" flex="1">
       <label value="&helpMenu.label;"/>
       <vbox id="PanelUI-helpItems"/>
-    </panelview>
+    </panelsubview>
   </panelmultiview>
 </panel>
 
diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
index 11206a88150b..2653cf9af1c9 100644
--- a/browser/components/customizableui/content/panelUI.js
+++ b/browser/components/customizableui/content/panelUI.js
@@ -70,8 +70,8 @@ const PanelUI = {
    * @param aMainView
    *        The mainView node to put back into place.
    */
-  setMainView: function(aMainView) {
-    this.multiView.setMainView(aMainView);
+  replaceMainView: function(aMainView) {
+    this.multiView.insertBefore(aMainView, this.multiView.firstChild);
   },
 
   /**
@@ -180,27 +180,17 @@ const PanelUI = {
       viewNode.dispatchEvent(evt);
 
       let tempPanel = document.createElement("panel");
+      tempPanel.appendChild(viewNode);
       tempPanel.setAttribute("type", "arrow");
       tempPanel.setAttribute("id", "customizationui-widget-panel");
       document.getElementById(CustomizableUI.AREA_NAVBAR).appendChild(tempPanel);
-
-      let multiView = document.createElement("panelmultiview");
-      tempPanel.appendChild(multiView);
-      multiView.setMainView(viewNode);
-      tempPanel.addEventListener("command", PanelUI._onWidgetPanelCommand);
-
       tempPanel.addEventListener("popuphidden", function panelRemover() {
         tempPanel.removeEventListener("popuphidden", panelRemover);
-        tempPanel.removeEventListener("command", PanelUI._onWidgetPanelCommand);
         this.multiView.appendChild(viewNode);
         tempPanel.parentElement.removeChild(tempPanel);
       }.bind(this));
 
-      let iconAnchor =
-        document.getAnonymousElementByAttribute(aAnchor, "class",
-                                                "toolbarbutton-icon");
-
-      tempPanel.openPopup(iconAnchor || aAnchor, "bottomcenter topright");
+      tempPanel.openPopup(aAnchor, "bottomcenter topright");
     }
   },
 
@@ -218,14 +208,9 @@ const PanelUI = {
       .getFormattedString("zoomReset.label", [Math.floor(ZoomManager.zoom * 100)]));
   },
 
-  _onWidgetPanelCommand: function(aEvent) {
-    if (!aEvent.originalTarget.hasAttribute("noautoclose")) {
-      aEvent.currentTarget.hidePopup();
-    }
-  },
-
-  _onHelpViewCommand: function(aEvent) {
-    if (!aEvent.originalTarget.hasAttribute("noautoclose")) {
+  // Button onclick handler which hides the whole PanelUI
+  _onHelpViewClick: function(aEvent) {
+    if (aEvent.button == 0 && !aEvent.target.hasAttribute("disabled")) {
       PanelUI.hide();
     }
   },
@@ -261,10 +246,10 @@ const PanelUI = {
     }
     items.appendChild(fragment);
 
-    this.addEventListener("command", PanelUI._onHelpViewCommand);
+    this.addEventListener("click", PanelUI._onHelpViewClick, false);
   },
 
   _onHelpViewHide: function(aEvent) {
-    this.removeEventListener("command", PanelUI._onHelpViewCommand);
+    this.removeEventListener("click", PanelUI._onHelpViewClick);
   }
 };
diff --git a/browser/components/customizableui/content/panelUI.xml b/browser/components/customizableui/content/panelUI.xml
index dcb86ae2bb39..edf9c6efccb1 100644
--- a/browser/components/customizableui/content/panelUI.xml
+++ b/browser/components/customizableui/content/panelUI.xml
@@ -45,7 +45,7 @@
     <content>
       <xul:box anonid="viewContainer" class="panel-viewcontainer" xbl:inherits="panelopen">
         <xul:stack anonid="viewStack" view="main" class="panel-viewstack">
-          <xul:vbox anonid="mainViewContainer" class="panel-mainview"/>
+          <children includes="panelmainview"/>
 
           <!-- Used to capture click events over the PanelUI-mainView if we're in
                subview mode. That way, any click on the PanelUI-mainView causes us
@@ -59,7 +59,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. -->
           <xul:vbox anonid="subViews" class="panel-subviews" xbl:inherits="panelopen">
-            <children includes="panelview"/>
+            <children includes="panelsubview"/>
           </xul:vbox>
         </xul:stack>
       </xul:box>
@@ -71,8 +71,8 @@
       <field name="_viewContainer" readonly="true">
         document.getAnonymousElementByAttribute(this, "anonid", "viewContainer");
       </field>
-      <field name="_mainViewContainer" readonly="true">
-        document.getAnonymousElementByAttribute(this, "anonid", "mainViewContainer");
+      <field name="_mainView" readonly="true">
+        this.querySelector("panelmainview");
       </field>
       <field name="_subViews" readonly="true">
         document.getAnonymousElementByAttribute(this, "anonid", "subViews");
@@ -88,63 +88,28 @@
       <field name="_anchorElement">null</field>
       <field name="_mainViewHeight">0</field>
       <field name="_subViewObserver">null</field>
-      <field name="_transitioning">false</field>
 
       <property name="showingSubView" readonly="true"
                 onget="return this._viewStack.getAttribute('view') == 'subview'"/>
-      <property name="_mainViewId" onget="return this.getAttribute('mainViewId');" onset="this.setAttribute('mainViewId', val); return val;"/>
-      <property name="_mainView" readonly="true"
-                onget="return document.getElementById(this._mainViewId);"/>
 
       <constructor><![CDATA[
         this._clickCapturer.addEventListener("click", this);
         this._panel.addEventListener("popupshowing", this);
         this._panel.addEventListener("popuphidden", this);
-        this._subViews.addEventListener("overflow", this);
-        this._mainViewContainer.addEventListener("overflow", this);
-
         // 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(this._syncContainerWithSubView.bind(this));
-        this._mainViewObserver =
-          new MutationObserver(this._syncContainerWithMainView.bind(this));
-
-        this._mainViewContainer.setAttribute("panelid",
-                                             this._panel.id);
-
-        if (this._mainView) {
-          this.setMainView(this._mainView);
-        }
+        this._subViews.addEventListener("overflow", this);
       ]]></constructor>
 
       <destructor><![CDATA[
-        if (this._mainView) {
-          this._mainView.removeAttribute("mainview");
-        }
-        this._mainViewObserver.disconnect();
         this._subViewObserver.disconnect();
         this._panel.removeEventListener("popupshowing", this);
         this._panel.removeEventListener("popuphidden", this);
-        this._subViews.removeEventListener("overflow", this);
-        this._mainViewContainer.removeEventListener("overflow", this);
         this._clickCapturer.removeEventListener("click", this);
       ]]></destructor>
 
-      <method name="setMainView">
-        <parameter name="aNewMainView"/>
-        <body><![CDATA[
-        if (this._mainView) {
-          this._mainViewObserver.disconnect();
-          this._subViews.appendChild(this._mainView);
-          this._mainView.removeAttribute("mainview");
-        }
-        this._mainViewId = aNewMainView.id;
-        aNewMainView.setAttribute("mainview", "true");
-        this._mainViewContainer.appendChild(aNewMainView);
-        ]]></body>
-      </method>
-
       <method name="showMainView">
         <body><![CDATA[
           if (this.showingSubView) {
@@ -156,26 +121,12 @@
             viewNode.removeAttribute("current");
             this._currentSubView = null;
 
-            this._subViewObserver.disconnect();
-
-            this._transitioning = true;
-
-            this._viewContainer.addEventListener("transitionend", function trans() {
-              this._viewContainer.removeEventListener("transitionend", trans);
-              this._transitioning = false;
-            }.bind(this));
             this._viewContainer.style.height = this._mainViewHeight + "px";
+            this._subViewObserver.disconnect();
 
             this._viewStack.setAttribute("view", "main");
           }
 
-          this._mainViewObserver.observe(this._mainView, {
-            attributes: true,
-            characterData: true,
-            childList: true,
-            subtree: true
-          });
-
           this._shiftMainView();
         ]]></body>
       </method>
@@ -210,14 +161,7 @@
           this._shiftMainView(aAnchor);
 
           this._mainViewHeight = this._viewStack.clientHeight;
-
-          this._transitioning = true;
-          this._viewContainer.addEventListener("transitionend", function trans() {
-            this._viewContainer.removeEventListener("transitionend", trans);
-            this._transitioning = false;
-          }.bind(this));
           this._viewContainer.style.height = this._subViews.scrollHeight + "px";
-
           this._subViewObserver.observe(viewNode, {
             attributes: true,
             characterData: true,
@@ -235,14 +179,14 @@
             // panel. Then we need to add half the width of the anchor. This is the
             // target that we need to transition to.
             let anchorRect = aAnchor.getBoundingClientRect();
-            let mainViewRect = this._mainViewContainer.getBoundingClientRect();
+            let mainViewRect = this._mainView.getBoundingClientRect();
             let leftEdge = anchorRect.left - mainViewRect.left;
             let center = aAnchor.clientWidth / 2;
             let target = leftEdge + center;
-            this._mainViewContainer.style.transform = "translateX(-" + target + "px)";
+            this._mainView.style.transform = "translateX(-" + target + "px)";
             aAnchor.classList.add("panel-multiview-anchor");
           } else {
-            this._mainViewContainer.style.transform = "";
+            this._mainView.style.transform = "";
             if (this.anchorElement)
               this.anchorElement.classList.remove("panel-multiview-anchor");
           }
@@ -260,12 +204,8 @@
               }
               break;
             case "overflow":
-              // Resize the right view on the next tick.
-              if (this.showingSubView) {
-                setTimeout(this._syncContainerWithSubView.bind(this), 0);
-              } else if (!this.transitioning) {
-                setTimeout(this._syncContainerWithMainView.bind(this), 0);
-              }
+              // Resize the subview on the next tick.
+              setTimeout(this._syncContainerWithSubView.bind(this), 0);
               break;
             case "popupshowing":
               this.setAttribute("panelopen", "true");
@@ -281,35 +221,16 @@
 
       <method name="_syncContainerWithSubView">
         <body><![CDATA[
-          if (this.showingSubView) {
-            this._viewContainer.style.height =
-              this._subViews.scrollHeight + "px";
-          }
+          this._viewContainer.style.height = this._subViews.scrollHeight + "px";
         ]]></body>
       </method>
       <method name="_syncContainerWithMainView">
         <body><![CDATA[
-          if (!this.showingSubView && !this._transitioning) {
-            this._viewContainer.style.height =
-              this._mainViewContainer.scrollHeight + "px";
-          }
+          this._viewContainer.style.height = this._mainView.scrollHeight + "px";
         ]]></body>
       </method>
 
     </implementation>
   </binding>
 
-  <binding id="panelview">
-    <implementation>
-      <property name="panelMultiView" readonly="true">
-        <getter><![CDATA[
-          if (this.parentNode.localName != "panelmultiview") {
-            return document.getBindingParent(this.parentNode);
-          }
-
-          return this.parentNode;
-        ]]></getter>
-      </property>
-    </implementation>
-  </binding>
 </bindings>
diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index ccf64d3d68b5..93f25349e145 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -198,7 +198,7 @@ CustomizeMode.prototype = {
     // Let everybody in this window know that we're starting to
     // exit customization mode.
     this.dispatchToolboxEvent("customizationending");
-    window.PanelUI.setMainView(window.PanelUI.mainView);
+    window.PanelUI.replaceMainView(window.PanelUI.mainView);
 
     let browser = document.getElementById("browser");
     browser.parentNode.selectedPanel = browser;
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index ed1e9bd0ae8b..e7d7e00f57de 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -2,6 +2,24 @@
  * 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/. */
 
+panelmultiview {
+  -moz-binding: url("chrome://browser/content/customizableui/panelUI.xml#panelmultiview");
+}
+
+panelmainview,
+panelsubview {
+  display: -moz-box;
+  -moz-box-orient: vertical;
+}
+
+panelmainview {
+  transition: transform 150ms;
+}
+
+panelmultiview > panelsubview:not([current]) {
+  display: none;
+}
+
 .panel-subviews {
   background-image: linear-gradient(to bottom, white 1px, rgba(255, 255, 255, 0) 15px);
   background-color: -moz-dialog;
@@ -61,13 +79,13 @@
 .PanelUI-zoomControls,
 #PanelUI-contents,
 .PanelUI-footer,
-.panel-mainview:not([panelid="PanelUI-popup"]) {
+#customizationui-widget-panel {
   max-width: @menuPanelWidth@;
   padding: .5em 1em;
 }
 
 #PanelUI-contents[type="list"] toolbarbutton > .toolbarbutton-text,
-panelview:not([mainview]) .toolbarbutton-text,
+panelsubview toolbarbutton > .toolbarbutton-text,
 #customizationui-widget-panel toolbarbutton > .toolbarbutton-text {
   text-align: start;
   -moz-padding-start: 8px;
@@ -159,7 +177,9 @@ panelview:not([mainview]) .toolbarbutton-text,
   display: none;
 }
 
-panelview toolbarbutton,
+panelmainview toolbarbutton,
+panelsubview toolbarbutton,
+#customizationui-widget-panel toolbarbutton,
 #widget-overflow-list > toolbarbutton,
 .customizationmode-button {
   -moz-appearance: none;
@@ -176,7 +196,9 @@ panelview toolbarbutton,
   transition-duration: 150ms;
 }
 
-panelview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
+panelmainview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
+panelsubview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
+#customizationui-widget-panel toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #widget-overflow-list > toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #PanelUI-mainView .PanelUI-pageControls toolbarbutton,
 .customizationmode-button,
@@ -188,8 +210,10 @@ panelview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):
               0 0 2px hsla(210,54%,20%,.1);
 }
 
-panelview toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
+panelmainview toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
+panelsubview toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
 .customizationmode-button:hover:active,
+#customizationui-widget-panel toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
 #widget-overflow-list > toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active) {
   background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
   background-color: hsla(210,54%,20%,.15);

From ac01cf3757577de083f907ba336c7f5d38eef09e Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Fri, 31 May 2013 16:39:13 -0400
Subject: [PATCH 181/230] Bug 878102 - Incorrectly sized icons in the History
 subview. r=mconley

---
 .../shared/customizableui/panelUIOverlay.inc.css     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index e7d7e00f57de..4216a343b7cf 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -230,6 +230,18 @@ panelsubview toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:acti
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
+#PanelUI-historyItems > toolbarbutton > .toolbarbutton-icon {
+  width: 16px;
+  height: 16px;
+}
+
+@media (min-resolution: 2dppx) {
+  #PanelUI-historyItems > toolbarbutton > .toolbarbutton-icon {
+    width: 32px;
+    height: 32px;
+  }
+}
+
 .PanelUI-footer.panel-multiview-anchor,
 .PanelUI-footer.panel-multiview-anchor > #PanelUI-help-btn,
 toolbarbutton.panel-multiview-anchor {

From 617f20c1eff49b73f5c47e88833dff0e8d2dcfa3 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 31 May 2013 16:10:10 -0400
Subject: [PATCH 182/230] Re-landing Bug 873867 - Adjust panelmultiview binding
 to allow easy swapping of mainviews. r=Unfocused.

---
 browser/base/content/browser.css              |  17 +++
 .../customizableui/content/panelUI.css        |   1 +
 .../customizableui/content/panelUI.inc.xul    |  14 +--
 .../customizableui/content/panelUI.js         |  33 ++++--
 .../customizableui/content/panelUI.xml        | 105 +++++++++++++++---
 .../customizableui/src/CustomizeMode.jsm      |   2 +-
 .../customizableui/panelUIOverlay.inc.css     |  34 +-----
 7 files changed, 147 insertions(+), 59 deletions(-)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 244f7734cea6..61b2547b66e9 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -27,6 +27,23 @@ toolbar[customizable="true"]:not([nowindowdrag="true"]) {
   -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-menubar-autohide");
 }
 
+panelmultiview {
+  -moz-binding: url("chrome://browser/content/customizableui/panelUI.xml#panelmultiview");
+}
+
+panelview {
+  -moz-binding: url("chrome://browser/content/customizableui/panelUI.xml#panelview");
+  -moz-box-orient: vertical;
+}
+
+.panel-mainview {
+  transition: transform 150ms;
+}
+
+panelview:not([mainview]):not([current]) {
+  display: none;
+}
+
 tabbrowser {
   -moz-binding: url("chrome://browser/content/tabbrowser.xml#tabbrowser");
 }
diff --git a/browser/components/customizableui/content/panelUI.css b/browser/components/customizableui/content/panelUI.css
index 8d77de102678..2f97a5ee4b0e 100644
--- a/browser/components/customizableui/content/panelUI.css
+++ b/browser/components/customizableui/content/panelUI.css
@@ -6,6 +6,7 @@
   pointer-events: none;
 }
 
+.panel-mainview,
 .panel-viewcontainer,
 .panel-viewstack {
   overflow: hidden;
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index 02358b48345e..36b996016cb3 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -7,8 +7,8 @@
        type="arrow"
        level="top"
        consumeoutsideclicks="true">
-  <panelmultiview id="PanelUI-multiView">
-    <panelmainview id="PanelUI-mainView">
+  <panelmultiview id="PanelUI-multiView" mainViewId="PanelUI-mainView">
+    <panelview id="PanelUI-mainView" flex="1">
       <vbox class="PanelUI-pageControls" pack="center">
         <hbox class="PanelUI-editControls">
           <toolbarbutton id="PanelUI-cut-btn" flex="1"
@@ -58,9 +58,9 @@
         <toolbarbutton id="PanelUI-customize-btn" label="&appMenuCustomize.label;"
                        command="cmd_CustomizeToolbars"/>
       </footer>
-    </panelmainview>
+    </panelview>
 
-    <panelsubview id="PanelUI-history" flex="1">
+    <panelview id="PanelUI-history" flex="1">
       <label value="&appMenuHistory.label;"/>
       <toolbarbutton id="appMenuClearRecentHistory"
                      label="&appMenuHistory.clearRecent.label;"
@@ -73,12 +73,12 @@
              id="PanelUI-historyMore"
              class="text-link"
              onclick="PlacesCommandHook.showPlacesOrganizer('History'); PanelUI.hide();"/>
-    </panelsubview>
+    </panelview>
 
-    <panelsubview id="PanelUI-help" flex="1">
+    <panelview id="PanelUI-help" flex="1">
       <label value="&helpMenu.label;"/>
       <vbox id="PanelUI-helpItems"/>
-    </panelsubview>
+    </panelview>
   </panelmultiview>
 </panel>
 
diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
index 2653cf9af1c9..11206a88150b 100644
--- a/browser/components/customizableui/content/panelUI.js
+++ b/browser/components/customizableui/content/panelUI.js
@@ -70,8 +70,8 @@ const PanelUI = {
    * @param aMainView
    *        The mainView node to put back into place.
    */
-  replaceMainView: function(aMainView) {
-    this.multiView.insertBefore(aMainView, this.multiView.firstChild);
+  setMainView: function(aMainView) {
+    this.multiView.setMainView(aMainView);
   },
 
   /**
@@ -180,17 +180,27 @@ const PanelUI = {
       viewNode.dispatchEvent(evt);
 
       let tempPanel = document.createElement("panel");
-      tempPanel.appendChild(viewNode);
       tempPanel.setAttribute("type", "arrow");
       tempPanel.setAttribute("id", "customizationui-widget-panel");
       document.getElementById(CustomizableUI.AREA_NAVBAR).appendChild(tempPanel);
+
+      let multiView = document.createElement("panelmultiview");
+      tempPanel.appendChild(multiView);
+      multiView.setMainView(viewNode);
+      tempPanel.addEventListener("command", PanelUI._onWidgetPanelCommand);
+
       tempPanel.addEventListener("popuphidden", function panelRemover() {
         tempPanel.removeEventListener("popuphidden", panelRemover);
+        tempPanel.removeEventListener("command", PanelUI._onWidgetPanelCommand);
         this.multiView.appendChild(viewNode);
         tempPanel.parentElement.removeChild(tempPanel);
       }.bind(this));
 
-      tempPanel.openPopup(aAnchor, "bottomcenter topright");
+      let iconAnchor =
+        document.getAnonymousElementByAttribute(aAnchor, "class",
+                                                "toolbarbutton-icon");
+
+      tempPanel.openPopup(iconAnchor || aAnchor, "bottomcenter topright");
     }
   },
 
@@ -208,9 +218,14 @@ const PanelUI = {
       .getFormattedString("zoomReset.label", [Math.floor(ZoomManager.zoom * 100)]));
   },
 
-  // Button onclick handler which hides the whole PanelUI
-  _onHelpViewClick: function(aEvent) {
-    if (aEvent.button == 0 && !aEvent.target.hasAttribute("disabled")) {
+  _onWidgetPanelCommand: function(aEvent) {
+    if (!aEvent.originalTarget.hasAttribute("noautoclose")) {
+      aEvent.currentTarget.hidePopup();
+    }
+  },
+
+  _onHelpViewCommand: function(aEvent) {
+    if (!aEvent.originalTarget.hasAttribute("noautoclose")) {
       PanelUI.hide();
     }
   },
@@ -246,10 +261,10 @@ const PanelUI = {
     }
     items.appendChild(fragment);
 
-    this.addEventListener("click", PanelUI._onHelpViewClick, false);
+    this.addEventListener("command", PanelUI._onHelpViewCommand);
   },
 
   _onHelpViewHide: function(aEvent) {
-    this.removeEventListener("click", PanelUI._onHelpViewClick);
+    this.removeEventListener("command", PanelUI._onHelpViewCommand);
   }
 };
diff --git a/browser/components/customizableui/content/panelUI.xml b/browser/components/customizableui/content/panelUI.xml
index edf9c6efccb1..dcb86ae2bb39 100644
--- a/browser/components/customizableui/content/panelUI.xml
+++ b/browser/components/customizableui/content/panelUI.xml
@@ -45,7 +45,7 @@
     <content>
       <xul:box anonid="viewContainer" class="panel-viewcontainer" xbl:inherits="panelopen">
         <xul:stack anonid="viewStack" view="main" class="panel-viewstack">
-          <children includes="panelmainview"/>
+          <xul:vbox anonid="mainViewContainer" class="panel-mainview"/>
 
           <!-- Used to capture click events over the PanelUI-mainView if we're in
                subview mode. That way, any click on the PanelUI-mainView causes us
@@ -59,7 +59,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. -->
           <xul:vbox anonid="subViews" class="panel-subviews" xbl:inherits="panelopen">
-            <children includes="panelsubview"/>
+            <children includes="panelview"/>
           </xul:vbox>
         </xul:stack>
       </xul:box>
@@ -71,8 +71,8 @@
       <field name="_viewContainer" readonly="true">
         document.getAnonymousElementByAttribute(this, "anonid", "viewContainer");
       </field>
-      <field name="_mainView" readonly="true">
-        this.querySelector("panelmainview");
+      <field name="_mainViewContainer" readonly="true">
+        document.getAnonymousElementByAttribute(this, "anonid", "mainViewContainer");
       </field>
       <field name="_subViews" readonly="true">
         document.getAnonymousElementByAttribute(this, "anonid", "subViews");
@@ -88,28 +88,63 @@
       <field name="_anchorElement">null</field>
       <field name="_mainViewHeight">0</field>
       <field name="_subViewObserver">null</field>
+      <field name="_transitioning">false</field>
 
       <property name="showingSubView" readonly="true"
                 onget="return this._viewStack.getAttribute('view') == 'subview'"/>
+      <property name="_mainViewId" onget="return this.getAttribute('mainViewId');" onset="this.setAttribute('mainViewId', val); return val;"/>
+      <property name="_mainView" readonly="true"
+                onget="return document.getElementById(this._mainViewId);"/>
 
       <constructor><![CDATA[
         this._clickCapturer.addEventListener("click", this);
         this._panel.addEventListener("popupshowing", this);
         this._panel.addEventListener("popuphidden", this);
+        this._subViews.addEventListener("overflow", this);
+        this._mainViewContainer.addEventListener("overflow", this);
+
         // 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(this._syncContainerWithSubView.bind(this));
-        this._subViews.addEventListener("overflow", this);
+        this._mainViewObserver =
+          new MutationObserver(this._syncContainerWithMainView.bind(this));
+
+        this._mainViewContainer.setAttribute("panelid",
+                                             this._panel.id);
+
+        if (this._mainView) {
+          this.setMainView(this._mainView);
+        }
       ]]></constructor>
 
       <destructor><![CDATA[
+        if (this._mainView) {
+          this._mainView.removeAttribute("mainview");
+        }
+        this._mainViewObserver.disconnect();
         this._subViewObserver.disconnect();
         this._panel.removeEventListener("popupshowing", this);
         this._panel.removeEventListener("popuphidden", this);
+        this._subViews.removeEventListener("overflow", this);
+        this._mainViewContainer.removeEventListener("overflow", this);
         this._clickCapturer.removeEventListener("click", this);
       ]]></destructor>
 
+      <method name="setMainView">
+        <parameter name="aNewMainView"/>
+        <body><![CDATA[
+        if (this._mainView) {
+          this._mainViewObserver.disconnect();
+          this._subViews.appendChild(this._mainView);
+          this._mainView.removeAttribute("mainview");
+        }
+        this._mainViewId = aNewMainView.id;
+        aNewMainView.setAttribute("mainview", "true");
+        this._mainViewContainer.appendChild(aNewMainView);
+        ]]></body>
+      </method>
+
       <method name="showMainView">
         <body><![CDATA[
           if (this.showingSubView) {
@@ -121,12 +156,26 @@
             viewNode.removeAttribute("current");
             this._currentSubView = null;
 
-            this._viewContainer.style.height = this._mainViewHeight + "px";
             this._subViewObserver.disconnect();
 
+            this._transitioning = true;
+
+            this._viewContainer.addEventListener("transitionend", function trans() {
+              this._viewContainer.removeEventListener("transitionend", trans);
+              this._transitioning = false;
+            }.bind(this));
+            this._viewContainer.style.height = this._mainViewHeight + "px";
+
             this._viewStack.setAttribute("view", "main");
           }
 
+          this._mainViewObserver.observe(this._mainView, {
+            attributes: true,
+            characterData: true,
+            childList: true,
+            subtree: true
+          });
+
           this._shiftMainView();
         ]]></body>
       </method>
@@ -161,7 +210,14 @@
           this._shiftMainView(aAnchor);
 
           this._mainViewHeight = this._viewStack.clientHeight;
+
+          this._transitioning = true;
+          this._viewContainer.addEventListener("transitionend", function trans() {
+            this._viewContainer.removeEventListener("transitionend", trans);
+            this._transitioning = false;
+          }.bind(this));
           this._viewContainer.style.height = this._subViews.scrollHeight + "px";
+
           this._subViewObserver.observe(viewNode, {
             attributes: true,
             characterData: true,
@@ -179,14 +235,14 @@
             // panel. Then we need to add half the width of the anchor. This is the
             // target that we need to transition to.
             let anchorRect = aAnchor.getBoundingClientRect();
-            let mainViewRect = this._mainView.getBoundingClientRect();
+            let mainViewRect = this._mainViewContainer.getBoundingClientRect();
             let leftEdge = anchorRect.left - mainViewRect.left;
             let center = aAnchor.clientWidth / 2;
             let target = leftEdge + center;
-            this._mainView.style.transform = "translateX(-" + target + "px)";
+            this._mainViewContainer.style.transform = "translateX(-" + target + "px)";
             aAnchor.classList.add("panel-multiview-anchor");
           } else {
-            this._mainView.style.transform = "";
+            this._mainViewContainer.style.transform = "";
             if (this.anchorElement)
               this.anchorElement.classList.remove("panel-multiview-anchor");
           }
@@ -204,8 +260,12 @@
               }
               break;
             case "overflow":
-              // Resize the subview on the next tick.
-              setTimeout(this._syncContainerWithSubView.bind(this), 0);
+              // Resize the right view on the next tick.
+              if (this.showingSubView) {
+                setTimeout(this._syncContainerWithSubView.bind(this), 0);
+              } else if (!this.transitioning) {
+                setTimeout(this._syncContainerWithMainView.bind(this), 0);
+              }
               break;
             case "popupshowing":
               this.setAttribute("panelopen", "true");
@@ -221,16 +281,35 @@
 
       <method name="_syncContainerWithSubView">
         <body><![CDATA[
-          this._viewContainer.style.height = this._subViews.scrollHeight + "px";
+          if (this.showingSubView) {
+            this._viewContainer.style.height =
+              this._subViews.scrollHeight + "px";
+          }
         ]]></body>
       </method>
       <method name="_syncContainerWithMainView">
         <body><![CDATA[
-          this._viewContainer.style.height = this._mainView.scrollHeight + "px";
+          if (!this.showingSubView && !this._transitioning) {
+            this._viewContainer.style.height =
+              this._mainViewContainer.scrollHeight + "px";
+          }
         ]]></body>
       </method>
 
     </implementation>
   </binding>
 
+  <binding id="panelview">
+    <implementation>
+      <property name="panelMultiView" readonly="true">
+        <getter><![CDATA[
+          if (this.parentNode.localName != "panelmultiview") {
+            return document.getBindingParent(this.parentNode);
+          }
+
+          return this.parentNode;
+        ]]></getter>
+      </property>
+    </implementation>
+  </binding>
 </bindings>
diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index 93f25349e145..ccf64d3d68b5 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -198,7 +198,7 @@ CustomizeMode.prototype = {
     // Let everybody in this window know that we're starting to
     // exit customization mode.
     this.dispatchToolboxEvent("customizationending");
-    window.PanelUI.replaceMainView(window.PanelUI.mainView);
+    window.PanelUI.setMainView(window.PanelUI.mainView);
 
     let browser = document.getElementById("browser");
     browser.parentNode.selectedPanel = browser;
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index 4216a343b7cf..8154440c4456 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -2,24 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-panelmultiview {
-  -moz-binding: url("chrome://browser/content/customizableui/panelUI.xml#panelmultiview");
-}
-
-panelmainview,
-panelsubview {
-  display: -moz-box;
-  -moz-box-orient: vertical;
-}
-
-panelmainview {
-  transition: transform 150ms;
-}
-
-panelmultiview > panelsubview:not([current]) {
-  display: none;
-}
-
 .panel-subviews {
   background-image: linear-gradient(to bottom, white 1px, rgba(255, 255, 255, 0) 15px);
   background-color: -moz-dialog;
@@ -79,13 +61,13 @@ panelmultiview > panelsubview:not([current]) {
 .PanelUI-zoomControls,
 #PanelUI-contents,
 .PanelUI-footer,
-#customizationui-widget-panel {
+.panel-mainview:not([panelid="PanelUI-popup"]) {
   max-width: @menuPanelWidth@;
   padding: .5em 1em;
 }
 
 #PanelUI-contents[type="list"] toolbarbutton > .toolbarbutton-text,
-panelsubview toolbarbutton > .toolbarbutton-text,
+panelview:not([mainview]) .toolbarbutton-text,
 #customizationui-widget-panel toolbarbutton > .toolbarbutton-text {
   text-align: start;
   -moz-padding-start: 8px;
@@ -177,9 +159,7 @@ panelsubview toolbarbutton > .toolbarbutton-text,
   display: none;
 }
 
-panelmainview toolbarbutton,
-panelsubview toolbarbutton,
-#customizationui-widget-panel toolbarbutton,
+panelview toolbarbutton,
 #widget-overflow-list > toolbarbutton,
 .customizationmode-button {
   -moz-appearance: none;
@@ -196,9 +176,7 @@ panelsubview toolbarbutton,
   transition-duration: 150ms;
 }
 
-panelmainview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
-panelsubview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
-#customizationui-widget-panel toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
+panelview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #widget-overflow-list > toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #PanelUI-mainView .PanelUI-pageControls toolbarbutton,
 .customizationmode-button,
@@ -210,10 +188,8 @@ panelsubview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:activ
               0 0 2px hsla(210,54%,20%,.1);
 }
 
-panelmainview toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
-panelsubview toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
+panelview toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
 .customizationmode-button:hover:active,
-#customizationui-widget-panel toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
 #widget-overflow-list > toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active) {
   background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
   background-color: hsla(210,54%,20%,.15);

From f2355db49db2b90641c767c170a905c51a85eb40 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Fri, 31 May 2013 23:47:11 +0200
Subject: [PATCH 183/230] Bug 853415 - Shuffle before/after around and set an
 ordinal value on :after to avoid overflow bug, r=MattN

--HG--
extra : rebase_source : 35ee222868c5ed8af0886d67d8dfc6c04514139a
---
 browser/themes/osx/browser.css     | 6 ++++++
 browser/themes/shared/tabs.inc.css | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 57111c476cca..88e4e3494568 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -2243,6 +2243,12 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
  */
 #TabsToolbar::after {
   content: '';
+  /* Because we use placeholders for window controls etc. in the tabstrip,
+   * and position those with ordinal attributes, and because our layout code
+   * expects :before/:after nodes to come first/last in the frame list,
+   * we have to reorder this element to come last, hence the
+   * ordinal group value (see bug 853415). */
+  -moz-box-ordinal-group: 1001;
   position: absolute;
   bottom: 1px;
   left: 0;
diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
index bf989a165d31..cc8fb778a607 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -10,6 +10,8 @@
 
 /* image preloading hack */
 #TabsToolbar::before {
+  /* Because of bug 853415, we need to ordinal this to the first position: */
+  -moz-box-ordinal-group: 0;
   content: '';
   display: block;
   background-image:

From 0297781be2e412e0be788e8c353f3bf9e8dec759 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Sat, 1 Jun 2013 00:00:58 +0200
Subject: [PATCH 184/230] Bug 877603 - registerArea should let non-legacy
 consumers specify defaults as part of the options, r=jaws

---
 .../customizableui/src/CustomizableUI.jsm     | 128 ++++++++++--------
 1 file changed, 70 insertions(+), 58 deletions(-)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index d5c68d371272..1e8b39343d8f 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -60,49 +60,6 @@ let gPlacements = new Map();
  */
 let gFuturePlacements = new Map();
 
-/**
- * If the user does not have any state saved, this is the default set of
- * placements to use.
- */
-let gDefaultPlacements = new Map([
-  ["toolbar-menubar", [
-    "menubar-items",
-  ]],
-  ["TabsToolbar", [
-    "tabbrowser-tabs",
-    "new-tab-button",
-    "alltabs-button",
-    "tabs-closebutton"
-  ]],
-  ["nav-bar", [
-    "unified-back-forward-button",
-    "urlbar-container",
-    "reload-button",
-    "stop-button",
-    "search-container",
-    "webrtc-status-button",
-    "bookmarks-menu-button",
-    "downloads-button",
-    "home-button",
-    "social-share-button",
-    "social-toolbar-item",
-  ]],
-  ["PersonalToolbar", [
-    "personal-bookmarks",
-  ]],
-  ["PanelUI-contents", [
-    "new-window-button",
-    "privatebrowsing-button",
-    "save-page-button",
-    "print-button",
-    "history-panelmenu",
-    "fullscreen-button",
-    "find-button",
-    "preferences-button",
-    "add-ons-button"
-  ]]
-]);
-
 //XXXunf Temporary. Need a nice way to abstract functions to build widgets
 //       of these types.
 let gSupportedWidgetTypes = new Set(["button", "view"]);
@@ -158,24 +115,61 @@ let CustomizableUIInternal = {
 
     this.registerArea(CustomizableUI.AREA_PANEL, {
       anchor: "PanelUI-menu-button",
-      type: CustomizableUI.TYPE_MENU_PANEL
+      type: CustomizableUI.TYPE_MENU_PANEL,
+      defaultPlacements: [
+        "new-window-button",
+        "privatebrowsing-button",
+        "save-page-button",
+        "print-button",
+        "history-panelmenu",
+        "fullscreen-button",
+        "find-button",
+        "preferences-button",
+        "add-ons-button",
+      ]
     });
     this.registerArea(CustomizableUI.AREA_NAVBAR, {
       legacy: true,
       type: CustomizableUI.TYPE_TOOLBAR,
-      overflowable: true
+      overflowable: true,
+      defaultPlacements: [
+        "unified-back-forward-button",
+        "urlbar-container",
+        "reload-button",
+        "stop-button",
+        "urlbar-search-splitter",
+        "search-container",
+        "webrtc-status-button",
+        "bookmarks-menu-button",
+        "downloads-button",
+        "home-button",
+        "social-share-button",
+        "social-toolbar-item",
+      ]
     });
     this.registerArea(CustomizableUI.AREA_MENUBAR, {
       legacy: true,
-      type: CustomizableUI.TYPE_TOOLBAR
+      type: CustomizableUI.TYPE_TOOLBAR,
+      defaultPlacements: [
+        "menubar-items",
+      ]
     });
     this.registerArea(CustomizableUI.AREA_TABSTRIP, {
       legacy: true,
-      type: CustomizableUI.TYPE_TOOLBAR
+      type: CustomizableUI.TYPE_TOOLBAR,
+      defaultPlacements: [
+        "tabbrowser-tabs",
+        "new-tab-button",
+        "alltabs-button",
+        "tabs-closebutton",
+      ]
     });
     this.registerArea(CustomizableUI.AREA_BOOKMARKS, {
       legacy: true,
-      type: CustomizableUI.TYPE_TOOLBAR
+      type: CustomizableUI.TYPE_TOOLBAR,
+      defaultPlacements: [
+        "personal-bookmarks",
+      ]
     });
   },
 
@@ -215,7 +209,13 @@ let CustomizableUIInternal = {
 
     let props = new Map();
     for (let key in aProperties) {
-      props.set(key, aProperties[key]);
+      //XXXgijs for special items, we need to make sure they have an appropriate ID
+      // so we aren't perpetually in a non-default state:
+      if (key == "defaultPlacements" && Array.isArray(aProperties[key])) {
+        props.set(key, aProperties[key].map(x => this.isSpecialWidget(x) ? this.ensureSpecialWidgetId(x) : x ));
+      } else {
+        props.set(key, aProperties[key]);
+      }
     }
     gAreas.set(aName, props);
 
@@ -1011,8 +1011,8 @@ let CustomizableUIInternal = {
 
     if (!restored) {
       LOG("Restoring " + aArea + " from default state");
-      if (gDefaultPlacements.has(aArea)) {
-        let defaults = gDefaultPlacements.get(aArea);
+      let defaults = gAreas.get(aArea).get("defaultPlacements");
+      if (defaults) {
         for (let id of defaults)
           this.addWidgetToArea(id, aArea);
       }
@@ -1113,11 +1113,13 @@ let CustomizableUIInternal = {
     this.notifyListeners("onWidgetCreated", widget.id);
 
     if (widget.defaultArea) {
-      let area = widget.defaultArea;
-      if (gDefaultPlacements.has(area)) {
-        gDefaultPlacements.get(area).push(widget.id);
+      let area = gAreas.get(widget.defaultArea);
+      //XXXgijs this won't have any effect for legacy items. Sort of OK because
+      // consumers can modify currentset? Maybe?
+      if (area.has("defaultPlacements")) {
+        area.get("defaultPlacements").push(widget.id);
       } else {
-        gDefaultPlacements.set(area, [widget.id]);
+        area.set("defaultPlacements", [widget.id]);
       }
     }
 
@@ -1452,8 +1454,8 @@ let CustomizableUIInternal = {
     // Clear the saved state to ensure that defaults will be used.
     gSavedState = null;
     // Restore the state for each area to its defaults
-    for (let [area, defaultPlacements] of gDefaultPlacements) {
-      this.restoreStateForArea(area);
+    for (let [areaId,] of gAreas) {
+      this.restoreStateForArea(areaId);
     }
 
     // Rebuild each registered area (across windows) to reflect the state that
@@ -1519,8 +1521,16 @@ let CustomizableUIInternal = {
   },
 
   get inDefaultState() {
-    for (let [areaId, defaultPlacements] of gDefaultPlacements) {
+    for (let [areaId, props] of gAreas) {
+      let defaultPlacements = props.get("defaultPlacements");
+      // Areas without default placements (like legacy ones?) get skipped
+      if (!defaultPlacements) {
+        continue;
+      }
+
       let currentPlacements = gPlacements.get(areaId);
+      LOG("Checking default state for " + areaId + ":\n" + currentPlacements.join("\n") +
+          " vs. " + defaultPlacements.join("\n"));
 
       if (currentPlacements.length != defaultPlacements.length) {
         return false;
@@ -1528,6 +1538,8 @@ let CustomizableUIInternal = {
 
       for (let i = 0; i < currentPlacements.length; ++i) {
         if (currentPlacements[i] != defaultPlacements[i]) {
+          LOG("Found " + currentPlacements[i] + " in " + areaId + " where " +
+              defaultPlacements[i] + " was expected!");
           return false;
         }
       }

From 7d6a7b8c5754ace79abebb7a04448ab2fdcbf0c5 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Sat, 1 Jun 2013 00:02:28 +0200
Subject: [PATCH 185/230] Bug 877178 - Allow add-ons/code to unregister an
 area, r=jaws

---
 .../customizableui/src/CustomizableUI.jsm     | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 1e8b39343d8f..55c11533524f 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -228,6 +228,26 @@ let CustomizableUIInternal = {
     }
   },
 
+  unregisterArea: function(aName) {
+    if (typeof aName != "string" || !/^[a-z0-9-_]{1,}$/i.test(aName)) {
+      throw new Error("Invalid area name");
+    }
+    if (!gAreas.has(aName)) {
+      throw new Error("Area not registered");
+    }
+
+    // Move all the widgets out
+    this.beginBatchUpdate();
+    let placements = gPlacements.get(aName);
+    placements.forEach(this.removeWidgetFromArea, this);
+
+    // Delete all remaining traces.
+    gAreas.delete(aName);
+    gPlacements.delete(aName);
+    gFuturePlacements.delete(aName);
+    this.endBatchUpdate(true);
+  },
+
   registerToolbar: function(aToolbar) {
     let document = aToolbar.ownerDocument;
     let area = aToolbar.id;
@@ -1584,6 +1604,9 @@ this.CustomizableUI = {
   registerMenuPanel: function(aPanel) {
     CustomizableUIInternal.registerMenuPanel(aPanel);
   },
+  unregisterArea: function(aName) {
+    CustomizableUIInternal.unregisterArea(aName);
+  },
   addWidgetToArea: function(aWidgetId, aArea, aPosition) {
     CustomizableUIInternal.addWidgetToArea(aWidgetId, aArea, aPosition);
   },

From 82682690f745e673a54904ce0bd942d0e9b09f9b Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Wed, 29 May 2013 15:16:48 -0700
Subject: [PATCH 186/230] Bug 875326 - Improved tab stroke images with an inner
 highlight and fixed layering. r=mconley ui-r=shorlander

--HG--
extra : rebase_source : 3192812e43eb5c69d76707160d8eaef26a843c6f
---
 browser/base/content/browser.xul              |   4 ++--
 browser/themes/linux/browser.css              |   5 -----
 browser/themes/linux/linuxShared.inc          |   2 +-
 .../linux/tabbrowser/tab-active-middle.png    | Bin 96 -> 388 bytes
 .../linux/tabbrowser/tab-background-end.png   | Bin 721 -> 1047 bytes
 .../tabbrowser/tab-background-middle.png      | Bin 161 -> 308 bytes
 .../linux/tabbrowser/tab-background-start.png | Bin 705 -> 1019 bytes
 .../linux/tabbrowser/tab-stroke-end.png       | Bin 473 -> 1215 bytes
 .../linux/tabbrowser/tab-stroke-start.png     | Bin 483 -> 1219 bytes
 .../themes/osx/browser-lightweightTheme.css   |   2 +-
 browser/themes/osx/jar.mn                     |   1 -
 browser/themes/osx/shared.inc                 |   4 ++--
 .../tabbrowser/tab-active-middle-lwtheme.png  | Bin 148 -> 0 bytes
 .../osx/tabbrowser/tab-active-middle.png      | Bin 227 -> 388 bytes
 .../osx/tabbrowser/tab-active-middle@2x.png   | Bin 1032 -> 650 bytes
 .../osx/tabbrowser/tab-background-end.png     | Bin 677 -> 1047 bytes
 .../osx/tabbrowser/tab-background-middle.png  | Bin 153 -> 308 bytes
 .../osx/tabbrowser/tab-background-start.png   | Bin 657 -> 1019 bytes
 .../themes/osx/tabbrowser/tab-stroke-end.png  | Bin 3073 -> 1215 bytes
 .../osx/tabbrowser/tab-stroke-end@2x.png      | Bin 2456 -> 4991 bytes
 .../osx/tabbrowser/tab-stroke-start.png       | Bin 433 -> 1219 bytes
 .../osx/tabbrowser/tab-stroke-start@2x.png    | Bin 2463 -> 4792 bytes
 browser/themes/shared/tabs.inc.css            |   9 +++++----
 browser/themes/windows/browser-aero.css       |   1 +
 .../windows/browser-lightweightTheme.css      |   2 +-
 browser/themes/windows/browser.css            |   8 ++++----
 browser/themes/windows/jar.mn                 |   2 --
 .../tabbrowser/tab-active-middle-lwtheme.png  | Bin 226 -> 0 bytes
 .../windows/tabbrowser/tab-active-middle.png  | Bin 438 -> 612 bytes
 .../windows/tabbrowser/tab-background-end.png | Bin 837 -> 992 bytes
 .../tabbrowser/tab-background-middle.png      | Bin 157 -> 170 bytes
 .../tabbrowser/tab-background-start.png       | Bin 811 -> 967 bytes
 .../windows/tabbrowser/tab-stroke-end.png     | Bin 473 -> 1283 bytes
 .../windows/tabbrowser/tab-stroke-start.png   | Bin 483 -> 1287 bytes
 34 files changed, 17 insertions(+), 23 deletions(-)
 delete mode 100644 browser/themes/osx/tabbrowser/tab-active-middle-lwtheme.png
 delete mode 100644 browser/themes/windows/tabbrowser/tab-active-middle-lwtheme.png

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index a11f007a7f64..49d1e5501881 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1163,10 +1163,10 @@
 
   <svg:svg height="0">
     <svg:clipPath id="tab-curve-clip-path-start" clipPathUnits="objectBoundingBox">
-      <svg:path d="M 1,0.0645 C 0.5683,0.0679,0.51693,0.3764,0.4837,0.5484 c -0.0522,0.2702,-0.1425,0.4194,-0.4333,0.4194 L 0,1 H 1.0333 V 0.0645 z"/>
+      <svg:path d="m 1,0.0625 0.05,0 0,0.938 -1,0 0,-0.028 C 0.32082458,0.95840561 0.4353096,0.81970962 0.48499998,0.5625 0.51819998,0.3905 0.535,0.0659 1,0.0625 z"/>
     </svg:clipPath>
     <svg:clipPath id="tab-curve-clip-path-end" clipPathUnits="objectBoundingBox">
-      <svg:path d="M -0.0333,0.0645 C 0.4317,0.0679,0.4831,0.3764,0.5163,0.5484 c 0.0522,0.2702,+0.1425,0.4194,0.4333,0.4194 L 1,1 H -0.033 V 0.0645 z"/>
+      <svg:path d="m 0,0.0625 -0.05,0 0,0.938 1,0 0,-0.028 C 0.67917542,0.95840561 0.56569036,0.81970962 0.51599998,0.5625 0.48279998,0.3905 0.465,0.0659 0,0.0625 z"/>
     </svg:clipPath>
     <svg:clipPath id="tab-clip-path-outer" clipPathUnits="objectBoundingBox">
       <svg:path d="m 0.2197,0 0,0.4264 c -0.0156,0.1238 -0.0201,0.2548 -0.0492,0.3730 C 0.1464,0.9030 0.0889,0.9397 0.0379,0.9355 L 0,1 1,1 0.9621,0.9355 c -0.0511,0.0042 -0.1085,-0.0322 -0.1326,-0.1361 -0.0292,-0.1152 -0.0334,-0.2486 -0.0492,-0.3730 L 0.7803,0 z"/>
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 74fda3d4cdc3..f29d017a4229 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -1605,11 +1605,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   background-image: linear-gradient(to top, rgba(0,0,0,.3) 1px, rgba(0,0,0,.05) 1px, transparent 50%);
 }
 
-.tab-background-middle[selected=true]:-moz-lwtheme {
-  background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png),
-                    @fgTabTexture@;
-}
-
 .tabbrowser-tab:-moz-lwtheme {
   color: inherit;
 }
diff --git a/browser/themes/linux/linuxShared.inc b/browser/themes/linux/linuxShared.inc
index 1ab7eb8c1aee..6f937ae81de3 100644
--- a/browser/themes/linux/linuxShared.inc
+++ b/browser/themes/linux/linuxShared.inc
@@ -7,4 +7,4 @@
 %define toolbarHighlight rgba(255,255,255,.3)
 %define fgTabTexture linear-gradient(transparent 0px, transparent 2px, hsla(0,0%,100%,0.35) 2px, hsla(0,0%,100%,0.35) 3px, hsla(0,0%,100%,0.65) 3px, hsla(0,0%,100%,0.65) 4px, @toolbarHighlight@)
 %define fgTabTextureLWT @fgTabTexture@
-%define fgTabBackgroundMiddle @fgTabTexture@, linear-gradient(transparent 0px, transparent 2px, -moz-dialog 2px, -moz-dialog)
+%define fgTabBackgroundMiddle linear-gradient(transparent 0px, transparent 2px, -moz-dialog 2px, -moz-dialog)
diff --git a/browser/themes/linux/tabbrowser/tab-active-middle.png b/browser/themes/linux/tabbrowser/tab-active-middle.png
index 6c903ae15688e88e50e9ce817afdc0cbab17ea24..c3e5e18ba3ceddcf098a5b98a5f40c784a7e3d52 100644
GIT binary patch
literal 388
zcmV-~0ek+5P)<h;3K|Lk000e1NJLTq000I60018d1ONa4ZX9%w0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzCP_p=R2Ufr!8>b{VHg0=^F8mYl4?vv
zB*mg7UJ4bf@dkoR!3sJQw+;pWkAtp)f~$jzb62xDiy*1RLSqu5gRyB6Z4%EZ;us3d
z$kWFF<jGxTX2MMIJXMV}oY#>q#mK&=dj5!OZfbdDY9u|0E9xpXl%!KJQ8DmFS@AOM
zIdaR`Z!z)6p$oE(SktxZleTlxVXXV=n*~F~+tiTFD_Islol$bueedO|iMD-R599+S
zTUwgRQaSFK%C4(PYtgi0Xeh*rO@$3pFBI#kukOg6n!M_?x_6dU<-UQ>Y8IT7=NxxY
z*SsBhQ%m13Q*&b5k`E44e38acb=8utJJRde_ScHGrgS1MyY0JdS1juJVO7UN`G$^<
idj4q$7CkdIu;o7^-(7^+Pl!<f0000<MNUMnLSTYmn5(M*

literal 96
zcmeAS@N?(olHy`uVBq!ia0vp^j6f{U!3HGNPA*RZQtF;Ajv*Dd&K}>$$-uzDd~iL>
u_6>e-W!~-gWm&$#(jvz>jNhZM_7GE+SNM9@YkC<#EexKnelF{r5}E*7of}&K

diff --git a/browser/themes/linux/tabbrowser/tab-background-end.png b/browser/themes/linux/tabbrowser/tab-background-end.png
index 78a4f1f1cbb8d9395750d1e2cef78ae9e82838b9..2e515a39efeaafc71c8ee00bc29baa7ca952ce0f 100644
GIT binary patch
delta 1026
zcmV+d1pWKb1(yhrBYy+lNkl<Zc-pO(O;2P+6o#3x8)GJlECfHpLPv}-1R_E+j5E-D
z$mcMCWHMuhAQ}w|Lih#z0Qd)N2>(Le2pQRtuw=mo`3P|~Y@9LaI`8qVbL(>Zb~?n{
zP9;y?x6Z9Pr|R5pNY`=XtB@nFk(+@V#w#9Qk`B^NJ|~}$cYn#PDu=iskUEG5b)Xj^
z)XW2dpZ|XG;>XL&%O8%8j-KxB?mk*yUmtC2Yb)?^D|sh5KyrHkb^tMuy|8m`l1zz{
zhfFd{eMFrvl}bPD@9%&2bbh{{%Wjj#<n~E%V#PBL7MgHEoSQHYD!nVoq!TyCq~AY#
z_Q&Jq=H_lL|9^nws}!%Lup4Lc@kC{u1xXaML$M2IXJ-rT?d`qX@?m+~?Ol`1!wMLV
zg}he9cVXt@;$oqtrR9#j_p;)GnhLuyDan|CDq=WKi8u){N30{$2L}gF!l(cBxaBpr
zT1G`GajCiUFcuCnx3;!6!mS^b-#U9?k&zT7(=^Vji+|^1=jZ27^7(urzICmIzsZIb
zpI%;G9_IF@ns3b{!`A@=mGQBiot<yPyUy2Ict`{W%qPHzpG!Hz|Ga!T*Vx#2mnq(;
zsof$Ngot5Yy%Lc4nfU}nI<dI8m~MBL0nq^_A&7wY5wJPDw>UHqJs;WH+L~gDk85hT
z2#Np^DSrxtN*`iOP7Pkg=BBXt(B9tO3{$j`eCBoo(l0<ih$y|I7kY`~R0&Fu#EO4C
ze?H9=J)}N!VS)6)Kp%_siJDK42th);9wOtdt*u3-d6VQa-Wd0xVu<(E5CT4rlptO^
zytK45$~5n1{(u3v_dgie-rjz|G@oVufC2bAjeiEcKBkf0KRi5q$TVG<-?J+20_EtH
zS5r+q5s@oz#TBC+9UX&A^>(IqL$nu)UPYvUM<Z49h5~`~8ddGv*x2yxzMbi7#f^6q
zFi?&L;NcqYMdNi;r4n}R`1p7#m&+CH&*y*rrvacxiK)gK$23wUrpcVpYlvfDb#-+z
z+<!WG*Vh$Spa9hZpaptDZ!r?)w#KV^K$11)*^SfF)2XJWrXi+$FK+p@KL%9M&CMy`
z6+u<H0S$01vAFk25cUA~c6NTBVao?Y@%qXi1L;;Px|ATG@Ty%(0Mkn1b<tcx%npF!
zufO~@+tAQ3%+#NTcV3_VMG_7G=vN95s(TUy)PqPRj@vwdv=YD{Nc&Ds|D0V}S$V+Q
z4}}9XlefsNtFK#<C=F2NE1$y%9!ACf9x`%rax%NQxjD43u+ZJv+4)5iNBF+q^o2VO
wc!hZ=I;hz|(6YVZ@I^8T)k*3g=_a{<0TE*<##epET>t<807*qoM6N<$f;{c}b^rhX

delta 698
zcmV;r0!96o2+;+QBYy&zNkl<Zc-pns+e?#i9LMoTx4DCdG`CrsJGi+y+M3!<Z93;{
zt5!Ol;*t@RL_!1+6?oxAH{Apg1YPtWL_r6lf-nk-4&+4?SW=NmRQ3-Tj2-%X;dx*e
zq3-uQUA%smdq2PL@8P$NlW7bZo(hzp06En1YIvNKXz_s;+<)Kz12ljN6d)5Gpj0Yx
zQlaJWuhrjEpTB&~K7R6SY<BL#o<^-bfKV6cK?QOlP9zBz3WY&PKoW+F#p1-;+MnF>
z7q2s!>~xf$LNnA!8Rrlh_=h;8^7;Iso44+z8(M8a#7sh5s&I52F&O!_@;&Qtha(8K
zOBJVZ{|2Iv#D6<5+0xdvn?HAj*f@nFo6rY|m#-Ewh<QK_a<Sp?CPg4MbMjmQL5tXt
zQ#e$G2u41tY%<e%*MnS4I8cQk#HVLYClNG?Icp00sua5aaQ+~F+o{BacU8%U3nsZm
z=ZNuFtBf_=!yr61d6dR&5XQ|C_A>BazH;pVf-X?9jDMTL9tPcy=AY7z1FYvv%MJ#f
zA3s;4hz)`UWGrD9Bfr(@--loeC|JS{Mmw{)<0%BKEH4->c1Es?m#)%|yIEc^S~?hY
zzFBxXfLNU6oN2KzvVzy<3eqj6t#;hBm_)FjIy0BzuTQ10>vFlwZG^%`5zHT#K85QV
zO=$!hD}TQ<HWN08)R{YSg2vqoYGK!8qwqG7jLXX_A$_}h6fs-H$ZOYo09y1CFkQcK
zXGq;_8Ar$g>dHR@yc&TJ)=EGJ*4uX<#PL&@;yus+YEV`_gb=52t3<S5dG~&?e`4y`
zFg|<)0?-LYXsS4Wj>0VxYXj%vho!!=v*-5@?lT=vdwOG;?H2D4f^Mi6!p;AQ4m!XE
g9&myg(XABz3#q93f-+Nb5C8xG07*qoM6N<$f{H&yhyVZp

diff --git a/browser/themes/linux/tabbrowser/tab-background-middle.png b/browser/themes/linux/tabbrowser/tab-background-middle.png
index c0b65dad63471961c4aa942a69f4733372c2c7cf..addb64b13f422a34d6b87e4e75488f9fa2e35ba3 100644
GIT binary patch
delta 281
zcmV+!0p|Xp0ki^;B!Bx!L_t(|+HJ{OQUXy7gyFpCh7=e;1-YmQtb_f(r#t>NXP^q1
zQ}uN^Il+4xJU6#JUPf8E*uKcRNCKTblsYG*JS&q9_DJc(;Us1%>1_swqteG@W{M7a
z^u@^sGC8)-Na^=ViJ^y_2bO>G5R{)WL41!1;;S)QH-gx^w14LS?+qb1>}>7&2@OKl
z*7BAGt=ry)<c(lAbZ8SSpMs?}&7=phw!OYh7(uKaX%&=@F+sfB1>Xtc?WW)+h-FjD
zDx>vqc~P!~LGNcFY|m@ps)6T0>FnyNAaxwOLU5Q}ab&_Z3u4+U*i#$yASU&|le-U>
fnV<*pI_3|XuM#tIM_omQ00000NkvXXu0mjf>mr3z

delta 132
zcmV-~0DJ$m0-*trBz+llMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0000(
zNkl<ZD9>YI=91!Kzyer+SQD$n?=MfVOZ@xy?=e;hMn=Z}xa=TZ;ve;N{2P3B0K<xO
mqyEyt=QIy1vV2aZR004M$RdiPpd-Ej0000<MNUMnLSTXo)i;X(

diff --git a/browser/themes/linux/tabbrowser/tab-background-start.png b/browser/themes/linux/tabbrowser/tab-background-start.png
index 300dc1d757171af84e84267853aba9c450388b8f..243bf0099ffe7760843fc75b98d1029d9c9efbef 100644
GIT binary patch
delta 998
zcmV<C0~!3m1^Wk(BYy+JNkl<ZcwV)YO;0075Qh8hS(~*So3-PQWY*Z^12`-~phzYQ
z5(iEkvl7k$!CpBa<VcXqMuNY<Z{WCOBXL0DKP6GJo3N~baiw~?JUz6Cc85(`Dyq82
zQxDbkF;M^Qg0B<tR%UQCjFciK7zD+CVioAXL7e1SN-Up<oqrdmevlO`FxD2K4bTOl
zML%Mx&dtqLwzjq^i;IipFbwmxS}mW;=TR7Y7-Ww)iWFd3T5D?vP@=1CJ%8T%q2CV~
zT+~{>Q=|q8>V|bhiiiQjtP$S{6=^h^&DN_|zkK=h>9-FV@V6S`jUrzB6hkPI9D&t6
zuKLyvBF*{v`G3yY+1XUH`Pn7={S~BQASnw~U`@_RR<IP3Mk=S3PN&m8KR=(U*J^JV
za20z7q;f4(YC?P<I~cdkfTezVdOBIJ*IzS_p+ts2Brq*Jh(s)!*v!7t(SCk-c=+Vt
z;Go2y3k3^>pBo>OImceKxm@n?_V#v_?LPrEyqg0RKY!7;kMI%ER(E%I=Z}t#ifmuT
z$PDXaBCf5kua{ZBWf{5$GR^)6FwA?EN~OBk?Hc=rh5U>neVFW#{3^%@)gq5JHZ~@{
zd-jYNaGiDli0f1$p?ObGNYL5Z2`OD#Sy?Ht9<UI!z{rTDLu_77CviJ)R(NrGdO83w
zn!QrFl7C~#G5}-5Lg2mpQ$%#{92dWynlkT4fMFnUOe_E;0E~u-wy#<?-7Dg;nVFeF
zty;ZO(z~QmPGznFsf25?Hv)_1-Mw;LT3uZoQ@}M@gmo6f=+5Z?VjN;4*&_pVG@HLV
zK0cn_+}ylSUPWgfAQ|E1Znvvh-@p~D-?8sK3x6{9Z*gH^;fohPy&#4T7;3aFBBZa+
zyGnnD4+A3we!RcGA1*B|T`)8nIn*B1Dlb|XOY%Q_e;*?y4|q-VdOeV$8wQZOK$%RM
z<bYC4vE>}nTEPcYv6hsy`~7~{`@VO<w5zz5L9U23l0gljraKDm@xQhc?)U_L+GsQ;
z_kZ^GjC~1!NZIHBLrM)pa_%Wsl5sgVXYeMMgLzQC;wL93FH2z<{sx7}0^JRQSX;}&
z5zkM14(B>$3fMv5_3Xs>`1s_>%b(3h;SVAVRKkE@DYoG^0i}{f61@P(%VWX7M2~Zn
zot>SX!v2qYxmGywJJa3*aFyb_AhDCV>|gedn0!8xNXwkVe7oIl%+AghmzS5zYin!e
zR;y*E(`)(IJAkVeuXX%DT}pfb5t%%H!%`xS78WufQhxyg6nCOBEr~CXZ)5WQKX?LG
U%ed<84FCWD07*qoM6N<$f;;8hdH?_b

delta 682
zcmV;b0#*I{2f+o9BYy&jNkl<Zc-pns-Ahwp90%~VIp^kPTh3XVdvSVnv~|?nW}D7!
zwq<KN-NYp$D2ap!A}a90i*C9JA_%(ZKZt@}hzi0;D0(3;qQH`hOd_>^z+mj9ukgrO
zLT%?cr;E?U9?tW8&+qqp7@I_<GKy^*AtkCn4hpCN)doqSP=63jNuUhmBuEWLV8971
zbc+}Wq(TyCfOd_(#WOu~asQL2&qhCg`I=r``#FI<N5l@T1}!kj^km@qi`U8Z^<SBM
zK0lVr<%S>%5eSJB%!QiO^>**A+xHXMZ1yk$V-SY^t;7s%Vw^tzx8?6?96Ss`2>gv0
zp>i<j8r%0_hJWKYG)fNd`xl|XRiFgd%UAPB92kLK@RuV-i>*_q&PT{R{ot#F&}wTH
zbrwHbJVHWyDkXHbrpc)@QF3#=;Hi|5;2K~bJerM@D!Tcg4VHm=djk{17etgCwwDk7
z!Cae-qvOY-<g#?~McZZtIIdj1eh7!Sf#plcd_9k6=YKXT?f@5GwDVO#=*P-h0P8N;
z%@<9u9CWre_aN5X;GjW!v25wgi5S-Q07HZJVs%`)d~J}teG3iR`G()jzwO6*D>T!f
zX|vw$@W!#mf(@)RB*kK}oYHC)z@9!k6C*7%)2b|#t5#F3F(*DQe)3_n1x&QchjP^_
zp(}IrWPhB@)+j`|Kxs*f?S>}j$kNhs4|(gILU2JG>6RbmN??>)YwE_$y90RM3<jaN
z&_BZzBv1{V_{o~ObMIjo8*I=3dZ9}H@5rDIOwbA*7#^EAKJ@PWLLVNsl1=qu*bJ@(
z=PoNd;OYt{LkCicbJG_NE__(*#Y1h-2s$xs1|#pl2MY;tfdiUJTebhgZ=$*Sf*W(B
QP5=M^07*qoM6N<$f=N|LqyPW_

diff --git a/browser/themes/linux/tabbrowser/tab-stroke-end.png b/browser/themes/linux/tabbrowser/tab-stroke-end.png
index 6d9e07ddfdb2012daaac0159b313dd4cc32fcc36..099978580391777f4fdd196fc9aa160ebf4123a7 100644
GIT binary patch
literal 1215
zcmeAS@N?(olHy`uVBq!ia0vp^azHH4!3-piZ|XG#Qj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07#P<E_=LCu6$1ei6B9EtGmwNZAR-D13Z|x}o}QkOk&)@?
z>7}KmEiEk*Cr+F<Z{Dg^tF~?1cJScAvuDrVym|BS<Hzsbz5DUw$N&HTfhM%JwgSmx
z$BqF>Mn*;mdFap~Ap7p!yFg_?^MULSA3of=bqm7&^5x5uCr^Ovd-v|WdGqGu$B);p
zT?2A~;M=!v5C%kJVqzkY3snF4^JkzkAmjM);}8Wv66g{j`ThHMhzLXrTo%Xx>H?Bm
zw{C?9E?&I&{Q2{61;WC@z;Iw?WtEhaR8>{|_wS#&y87$aumAk{12l@CpC73B>eZ`(
zfq_6ju2``Gr~nuyDk>^KT@euxadC0KfB!BnF0QDk(9zKWniCxz4b&wfA_5ezt*r&x
zo1LA#fB$}<#+;m-UAuNYeE1L;P<!|8y?pud{rmTS{ra_I#|~gnyn6Kt=)3OjZlK0V
zlO}E7zWwRbr=Ma3z5w0YUlQaO3<^PDq_JQDtgLKo>>M1NoIJd|{QQDKKwpW9iHS={
zO3BD5C@HI|scUNK=;#_48W|ZIo0yqdSXx=z*g848d3gBv`UM6C1qBBOhlGTLhDSt1
z0(}r0p8y1jiAl-HDJf~`Ik~yHdHMN8#igZX<&`yc4NV>W(~ekM-T|f~UQZXt5RLP>
zlS9j;9eG+~kFP6pFkajkTfIH+)EN=+%gfGy!H3z_nolZ{&%ZVY27&u370*Bs&%I%*
z!?bPhJ!Jk}o-Z-O=+9#D|Np+8{+<5aFE>6&WiQK@E0L$S&;9@7+ox$iJ@?MG_H8`;
z<DmNb{<Rvrc3yOpIyURES-r((t(UL(4;3{gFzeM77iEh3Z_SN(CZf6Z!_jqNwIctt
zdzV=7XTK{u$*svK!Oyg0QTOrR$ER&H@o*}b?saubcV7RybyJn~i(~^BJ6BtG8L?fO
z#L2mhQ}R}?xZ2dSiVhd1Eje#-s^rt!756$rFIygrbWVKMvFWvQ>Q@_PcfJ;bB`KHX
z??g|zV*HG0*NH6~5AG;+KYj9t4#STrCp1>G&aO;$yVR*D%oo!v&9GKuM*G`I=BXlF
zHw_M)$kM+ub**atIrhx0pA<wCr1rh{Sh;h{OmAJ`nO6?7rcJ*)|MJSbEj%tVy$nh$
zi|6r`_NkeCXX7nqGr6oe)7e~IZR@^?uO4RZJ(CnWFDkY0;Ah{pRq>@qq&V_UPUdc7
zka^|Zf7|u%|Da~pGqoOzUpEw1bQa&YmB{$Jb9TqhPkP3d&kf5aw767#UGDz+_y4)Q
zOv2)#Qeg_8<(53Zwf66yS4Yl$d&61i;Cv!!g_n}ce*xPF(PwjifBk%X`_#+FLn`jL
uJTSbm>_ls?pu_~5()8~!)s@e`Y`Nbp=`8$Dd`c@Qe|ft4xvX<aXaWH8Z3;mE

delta 458
zcmV;*0X6==3E2aX8Gi-<008i8eFp#l0ia1lK~#9!y_VZf!axv)fgZM743;3$g|=vo
zu^h^w)f+Kr;Et&8|2FtHnWkjD(2I7Oe7ztf-^~2G-EDO`9YNTHMVP<<#nUEQe{nva
z|3%B4<{$1fdvl}g)s42f4Au)r%>&z0S5(Na0%{TCRme>sfPV)Rn1P)PH*3d#8fgWP
zyaurj71IVokjrqrbZ#F96hYN}&0@WP0tNPRvb-aC)p-MAy?`#*L4IG#S;QoF!QN4c
zPnpxm8y1uN28%AE1!u5{NuFZlF^!zM<`KK#XqdL3u6e{H-(rs|t!oys!v5ZrS#ydF
za5UX(38Bd*CV%-e#$9bKM)89T(&RE{F7eO}H!oVwEMkEp^+4yj$tEWG!S=?zGG|V4
z?x-Zxa%K_7GFYWr&Me{{u1xP`&P?JeXEBKS+UJu+JjZF3l;h?UcfproT2i|pG%F@~
zCMW3vGX1D*Tr9!K@smg&Inj)m<UaVu!7<V07t}8%`9m0d7K_cWgwQi5Y8C5OqYRwz
zaY-CC>x*G5tlo$UsKiYc5Q7y6fJeWX^e29P00HI&78U_z)Bpeg07*qoM6N<$g3Gnm
A^8f$<

diff --git a/browser/themes/linux/tabbrowser/tab-stroke-start.png b/browser/themes/linux/tabbrowser/tab-stroke-start.png
index a741942ac8db0dc46bf22ccfe20b81c8df7456f5..e5a7b5ee9aecb73410b5cacdd4951b2520b54bca 100644
GIT binary patch
literal 1219
zcmeAS@N?(olHy`uVBq!ia0vp^azHH4!3-piZ|XG#Qj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07#KGM_=LCu6$1ei3_#e-%*+Z33Z|x}o}QkOk&)@?>7}Km
zEiEk*Cr+F@ckaA-^H!}|wQbwBg9i_uJ$v@%&6|%OKYsV_-H#tX{{R0EG$}VX7f1pP
zS-W;Ekip2v2qDj%I|pQ+IdkUs@83X+fb1(*t{gjd48s2O=@ZZdAp6_5Z%>~-ee>qc
z`}gmGTp)P#=n;egQIMFJ2;u(x`4g!4?c2AXKY!l6dpAT7NCLG3$zQ*I0ZE`5xHyCX
zv3=LBT@dd4`SXDegR2o176!VUm6cUeQc_J#?ccwD8X6j}U%v*L_Vw#met!Pz*RKP;
z92gkb+1a^b#R{NcS67#^vNBLtSXda)aG>*QYHD<Kb&HCMfab)+!~k`Ph=>49sI9Hd
z&dvr}{rB%*U??3rbZEzp9ry0tJAC-?-o1M-U%vd{!2_Tlfnf^_QlO>45a{mi26_P)
z@<3fce?6OUn-%ER2_->(!N3q?VrIb#SXtTF*w{HZI5~NEdHMMTg@E1?6%!K|mz0u`
zQBYD=Ra4i{)Y8$>H83<XGB!3bHM6j^vaxk^cJuJ`@%0M~3<?Sk4h{(k2@MaAh>VVo
zj*U-9NJvafN=i;nNl8lwIzBHiKfkEBw6v_evZk(~siS`yvzMVeFfH+Vx;TbtoX?#c
zS}tSA)4JSx@k+;S+BfH&d}oq->P+seDT=9HGeO|?{yWp3l%$(i{XMt$($=LaFW0##
z`)=N|YL$(A_p->ivl2I~YF>QUxN%A4)}-?{+1K0E{{OgocG}NJbFbUg?A(%lb<fO&
zv%^;V@2lQdxaq<fm0iD{WuLFVXBar;S|;PV?r-xe_umm<zi{Bn<;KmPhx4b4o}G4$
zN!jYYX59A-=YYl6!b&@S`^6@f^l>^^UetQ^=;Pn-(-)O`JTaL*uSPb!I^TmK<XWeM
z16$<xd1aNezsW=`-M(Z^dfxHOd-dg2JSrs*x3C(Byt?PSU8m8#wc*L!&#q^8TNNC6
z<)Ly>Q{m99)ux;73C|YwZapB_$WU7S&du)mw-^mBwkh|f^MobmZaS#GRQTXT*1KDd
zWjwf*vU|O<No)U$lbOP^{jNvJ+iRFcDqU(*>X2A?xBB4WsbVbd`74h{%FfyNc4J#y
z1=p%nWhsT!i>o)i)n9(k@|LhItC3Zd{Gzn%fA1sSf1B>@c1cQI&@m#qM=w8&*KW7g
zMhz~OhdomnWDM0jFL_+nc`sY>r*Pqx7h98(M0-`_1NvlK?@wDEe_h!%;qeL9kVZ+7
z6Dpp|&&b~?|8;h|uR=?K)C?90#jV?~6&mGzn>By`|37<oXozunE2v#^%hIbo=%l*&
u+}-Nh;{U8)7<-mJxS8qPlF@L8<u5<u3n#^!*CJRz8O+nw&t;ucLK6T6*a*h}

delta 468
zcmV;_0W1E)3F8Bh8Gi-<008i8eFp#l0jfzvK~#9!z1ICp!ay9y@pQM{?hKolxpNQJ
zBAgF%y45cg74}<H|NnnupTWTwoRBbYgEt7CdvSMr@M6E;pH#QoJ*AGWIxNJHt#fp|
zssa2j=s2Fbbk!mhVZM~{wv=)4ET_e*oR%MrVL}OX{n=PVn|~a@3z{Q^Jj4;J&esS&
zn5FIBJPbvYuW<4bjZo*<xthW>Q=lSP-2!^kv!mY{feF3S%i7c94Z*a;%vGtcXDVsD
zS=d4jE}{bHHH|d_(`@w;CqOeAXCAgJ=5U~&NVWjeY;mtDpj#Sa7^c0=H-J@}Fk|vc
z=w-Irf~$jJnSXttkMzA+n6Bn9O99^-hU@z)qs<fGQJXMB9Iv(=VBP{u`|Eg<KF}R~
zZx*KeSEUi)(llJZf5UYKIB5%}{f)QpfcpmF`eTw0;{oljd6<?tSfzj$CgIu(-(t1^
z`h$9=;A1a*E`n?cv}guWC;iKC{WJ#pg~S<Q0*|A!08QX8@|%McVTXHabFMF@Z!|e4
zN-#jXKko8T!d*2V;31Lfr7h^M&6#1Gm?4Qg6rwds2sD%a(0+gF1_c&q4yW<}0000<
KMNUMnLSTX<SK-G1

diff --git a/browser/themes/osx/browser-lightweightTheme.css b/browser/themes/osx/browser-lightweightTheme.css
index bf796936437f..03d3b3d731c1 100644
--- a/browser/themes/osx/browser-lightweightTheme.css
+++ b/browser/themes/osx/browser-lightweightTheme.css
@@ -21,7 +21,7 @@
 #tabbrowser-tabs:not([movingtab]) > .tabbrowser-tab > .tab-stack > .tab-background > .tab-background-middle[selected=true]:-moz-lwtheme {
   background-attachment: scroll, scroll, fixed;
   background-color: transparent;
-  background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle-lwtheme.png),
+  background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png),
                     @fgTabTextureLWT@;/*,
                     lwtHeader;*/
   background-position: 0 0, 0 0, right top;
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index 14e690f8ad0c..2e279f80a829 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -195,7 +195,6 @@ browser.jar:
   skin/classic/browser/tabbrowser/loading@2x.png                         (tabbrowser/loading@2x.png)
   skin/classic/browser/tabbrowser/tab-active-middle.png                  (tabbrowser/tab-active-middle.png)
   skin/classic/browser/tabbrowser/tab-active-middle@2x.png               (tabbrowser/tab-active-middle@2x.png)
-  skin/classic/browser/tabbrowser/tab-active-middle-lwtheme.png          (tabbrowser/tab-active-middle-lwtheme.png)
   skin/classic/browser/tabbrowser/tab-arrow-left.png                     (tabbrowser/tab-arrow-left.png)
   skin/classic/browser/tabbrowser/tab-arrow-left@2x.png                  (tabbrowser/tab-arrow-left@2x.png)
   skin/classic/browser/tabbrowser/tab-arrow-right.png                    (tabbrowser/tab-arrow-right.png)
diff --git a/browser/themes/osx/shared.inc b/browser/themes/osx/shared.inc
index 3a5e5411196b..e3f852657ee2 100644
--- a/browser/themes/osx/shared.inc
+++ b/browser/themes/osx/shared.inc
@@ -1,10 +1,10 @@
 %include ../../../toolkit/themes/osx/global/shared.inc
 %include ../shared/browser.inc
 
-%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 fgTabTexture linear-gradient(transparent, transparent 2px, hsla(0,0%,100%,0.6) 2px, hsla(0,0%,100%,0.6) 3px, hsl(0,0%,99%) 3px, hsl(0,0%,92%))
 %define toolbarColorLWT rgba(253,253,253,0.45)
 %define fgTabTextureLWT linear-gradient(transparent, transparent 2px, rgba(254,254,254,0.72) 2px, @toolbarColorLWT@)
-%define fgTabBackgroundMiddle linear-gradient(transparent, transparent)
+%define fgTabBackgroundMiddle @fgTabTexture@
 %define hudButton -moz-appearance: none; color: #434343; border-radius: 4px; border: 1px solid #b5b5b5; background: linear-gradient(#fff, #f2f2f2); box-shadow: inset 0 1px rgba(255,255,255,.8), inset 0 0 1px rgba(255,255, 255,.25), 0 1px rgba(255,255,255,.3); background-clip: padding-box; background-origin: padding-box; padding: 2px 6px;
 %define hudButtonPressed box-shadow: inset 0 1px 4px -3px #000, 0 1px rgba(255,255,255,.3);
 %define hudButtonFocused box-shadow: 0 0 1px -moz-mac-focusring inset, 0 0 4px 1px -moz-mac-focusring, 0 0 2px 1px -moz-mac-focusring;
diff --git a/browser/themes/osx/tabbrowser/tab-active-middle-lwtheme.png b/browser/themes/osx/tabbrowser/tab-active-middle-lwtheme.png
deleted file mode 100644
index ec7c84e3476db7204115f8a9bc03cf2436b0405f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 148
zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol}0V0ox?vVxwBze2LF#HF>1$&oI28wVNctjR6
zFmMZlFeAgPITAoY_7YEDSN6NC93m{*d+wX60fiJjT^vI+&L^iNB_$;vV3LrOkf_<{
lwddc5&`F6RJxz%$3?4g~-8{VaECDKJ@O1TaS?83{1ORhhCHDXT

diff --git a/browser/themes/osx/tabbrowser/tab-active-middle.png b/browser/themes/osx/tabbrowser/tab-active-middle.png
index 7872d03678032661cced28b941f1fbd353019707..c3e5e18ba3ceddcf098a5b98a5f40c784a7e3d52 100644
GIT binary patch
delta 337
zcmV-X0j~bz0fYmP83+Ub003?rbdZrDCw~DZNkl<Z7#Rh@J8P3+7y!`oJ@2cMYD`5W
z#iAu%3KgsI27*h$3OW?G4h8>@gRX*ttAmSkSF<^bAgRSdV-li+v1t-*63;2(7z)hD
z)5ieh$z5h<!c6fzRgE;9*O4y8$iAm~{)lUCYI$X9Bt3~M>MAyrq*F0bG4MuN@qaSy
zIdaR`Z!z)6p$oE(SktxZleTlxVXXV=n*~F~+tiTFD_Islol$bueedO|iMD-R599+S
zTUwgRQaSFK%C4(PYtgi0Xeh*rO@$3pFBI#kukOg6n!M_?x_6dU<-UQ>Y8IT7=NxxY
z*SsBhQ%m13Q*&b5k`E44e38acbw1USt~=7}*!I_owx)C<F1zi!Y*#Gm`C(PZL-~e|
jk9z)T2o^mvHn8PCBi~(w*-wa300000NkvXXu0mjf#i5`(

delta 175
zcmV;g08syg1LFaZ83+ad006`lyc>}rCw~BiNkl<ZD3R4sTMob=2-AM-YP;|5r%p)9
zI)?`sN#g@bu>!!6qW6AgKx^&FfH6kNfU=37Ff39AlY5O?YpyY!j4IoQhF(~((8aBt
z9k_-#>GL0+1nC-f4sjh~Ye^*3j?X*T+Xirr)j*C9z2tPxV3oCaxvLti4#xTx*BsEk
dsud;@j2odXFwr*oGLQfO002ovPDHLkV1kxDOh^C#

diff --git a/browser/themes/osx/tabbrowser/tab-active-middle@2x.png b/browser/themes/osx/tabbrowser/tab-active-middle@2x.png
index c73eb967bd20cff4878e0a5148d9d96f5b7dede8..6cdc4472e71aeb715582a8eeb03bd471e61514e2 100644
GIT binary patch
delta 636
zcmV-?0)zdC2#N)e8Gi!+001Z%3UdGe0ANr|R7C&)0G^(ns;a7yk&$(Eb!TU1goK1y
zSy@R*Nw&7O!NI{GARyV<*#H0lH8nNO&CTQE<NyEv?(Xga0s;a80{r~^`1ttx`uh9(
z`}z6#{r&v{0s{E>`2PO>|NsA;ot>Zpnw|gv03dWyPE!K|1AhYp0|NsC0|NsCO#=f1
z0|NpCXai_yXlMgyXlMhEV=WK>00Fs4L_t(|UR9CVsvJ2OgZ1x=9otoz?z3fi|F;Yz
zVdl(tClClp`1%Qa{PQm#`0|PWi`U2d%a6zRm&fDrj@R$6-`?Kd9xvbCAMhEatA#*}
zxs^+8tILHaj(>4*gePE3XsY1|0k&Ks8&Wnv)t0_mOa__>XN+A=3$9i}cu2(oIo-|l
z1X084z-22;3!1jLokXKBmxy9p3mdFlc&@qF1-Wsi=VW+*OhcthE^SOAQT7~NjFBX}
zH95hcQtxZ}_7xb?qz-RQ#ov-nD1(wMQsPDcU3`<1tbeCnutPV&g;N=+*rj%H5}_RI
zi;WZ$OYRA>WphqgSS$b82%vkEBCLrqHm-xBLMC>0O%_FgAqa!;JUI&q5uV5-H;@Jn
z!|f(QObG{+IxcvO4Dj!p{se4~P!w{Kbev&26+<^sXrQctn+RU4YywKuT7yAFXdN8a
zM#3EoEOkh&;j7U165d!O(n!8d24OHWK$c|VSl$~kAf71)3=HDqF41HJO1e*I*i@j;
zvY2WV(r|av0Y`MAg0F$Sn3Awl$s$TH75|wuF`vzB_!-1N`0+DTk}MJPS|oK_2mJzm
WYZjY*oDj4C0000<MNUMnLSTY{8yvX+

literal 1032
zcmaJ=&rj1(94}c!Kqg#Jgab{H2#M>DZ7sB6V7G2EV+oEWE*KL^``DVTKWrcFhcSYB
z&_s=YfL9VP81EePV4_4rJg5<46eD*@IGA|R*Rc%`&Zg~q@0-u(^Zohm&P<>6cl32&
z80Jq-Nh!2;qHm(D75xWZ{u0r00>(3N)>?!`#Q~V8SqlJ98cG(VfTESJY=ChL^PSYw
z8JLmJ3#w(1iiaUfhK<-5Ha=Oh6*Uhaz5uei86keGKO=Bmix3xCnU?Js$mvrR2h3Kc
z(`qHJ@)|KYfsdC2Bwzrj;3cDAx<V;JRCNWk_skT5S0OMTA@+mH$TN7%asbYfp@2#=
z49;;R6J|M%IgJNtCP>lf<pNAtU^yW;iq{?jd2_TyAtfbhzR)Q`<RG*KiYgY1WHCfq
zPL^VLp7%6@!2m)8+_DLkQowWv>k1NZRY$j>Zkf2Js4Q4ZFhZb6_fs(JhOFt<%7h9=
zl@yy|NZL!O4wU8pLk**Wc3}z}#QRTSH(j;?l>)A{<fy1|i-VpkTZlP8ftHiDtU|qt
zGdT-dZqBmt*er(+%ZjR-o?)cQkYyohx==Aykdz_>(jawR6B1)$G%SY3_=LzYOgt#E
zEFEP>!)ziR4M}0P&Xp{6$p9v-bF~95-<0bOgJC1j5^(gZKub85fmf3j^yaZ}P4#MA
zt$8e?O}P{bhVokbSF7tLG(X<9F}Uc^7=2)(d3VrY5A|Grg)T)UDT(RQr+2S6+L!6>
zGZ*}K-f!LL+WHxJ9N3}hy>A0wH+t6}+}|Add};gl%Ax$)@ndiJjay7>`R%n+U32*z
zajmC+c=h37K3l+7Z~I^Lu83_d{kvaO-zHypK6j+^9`kYeLtpRk>eH5yA-X#{?|ZZt
b*lnk=qvy82@A|Hny}Ox=PfJgt^EdwhQ^rWp

diff --git a/browser/themes/osx/tabbrowser/tab-background-end.png b/browser/themes/osx/tabbrowser/tab-background-end.png
index 9374cbda64b64563200cb6b8488ef3495781375b..2e515a39efeaafc71c8ee00bc29baa7ca952ce0f 100644
GIT binary patch
delta 1026
zcmV+d1pWJ^1(yhrBYy+lNkl<Zc-pO(O;2P+6o#3x8)GJlECfHpLPv}-1R_E+j5E-D
z$mcMCWHMuhAQ}w|Lih#z0Qd)N2>(Le2pQRtuw=mo`3P|~Y@9LaI`8qVbL(>Zb~?n{
zP9;y?x6Z9Pr|R5pNY`=XtB@nFk(+@V#w#9Qk`B^NJ|~}$cYn#PDu=iskUEG5b)Xj^
z)XW2dpZ|XG;>XL&%O8%8j-KxB?mk*yUmtC2Yb)?^D|sh5KyrHkb^tMuy|8m`l1zz{
zhfFd{eMFrvl}bPD@9%&2bbh{{%Wjj#<n~E%V#PBL7MgHEoSQHYD!nVoq!TyCq~AY#
z_Q&Jq=H_lL|9^nws}!%Lup4Lc@kC{u1xXaML$M2IXJ-rT?d`qX@?m+~?Ol`1!wMLV
zg}he9cVXt@;$oqtrR9#j_p;)GnhLuyDan|CDq=WKi8u){N30{$2L}gF!l(cBxaBpr
zT1G`GajCiUFcuCnx3;!6!mS^b-#U9?k&zT7(=^Vji+|^1=jZ27^7(urzICmIzsZIb
zpI%;G9_IF@ns3b{!`A@=mGQBiot<yPyUy2Ict`{W%qPHzpG!Hz|Ga!T*Vx#2mnq(;
zsof$Ngot5Yy%Lc4nfU}nI<dI8m~MBL0nq^_A&7wY5wJPDw>UHqJs;WH+L~gDk85hT
z2#Np^DSrxtN*`iOP7Pkg=BBXt(B9tO3{$j`eCBoo(l0<ih$y|I7kY`~R0&Fu#EO4C
ze?H9=J)}N!VS)6)Kp%_siJDK42th);9wOtdt*u3-d6VQa-Wd0xVu<(E5CT4rlptO^
zytK45$~5n1{(u3v_dgie-rjz|G@oVufC2bAjeiEcKBkf0KRi5q$TVG<-?J+20_EtH
zS5r+q5s@oz#TBC+9UX&A^>(IqL$nu)UPYvUM<Z49h5~`~8ddGv*x2yxzMbi7#f^6q
zFi?&L;NcqYMdNi;r4n}R`1p7#m&+CH&*y*rrvacxiK)gK$23wUrpcVpYlvfDb#-+z
z+<!WG*Vh$Spa9hZpaptDZ!r?)w#KV^K$11)*^SfF)2XJWrXi+$FK+p@KL%9M&CMy`
z6+u<H0S$01vAFk25cUA~c6NTBVao?Y@%qXi1L;;Px|ATG@Ty%(0Mkn1b<tcx%npF!
zufO~@+tAQ3%+#NTcV3_VMG_7G=vN95s(TUy)PqPRj@vwdv=YD{Nc&Ds|D0V}S$V+Q
z4}}9XlefsNtFK#<C=F2NE1$y%9!ACf9x`%rax%NQxjD43u+ZJv+4)5iNBF+q^o2VO
wc!hZ=I;hz|(6YVZ@I^8T)k*3g=_a{<0TE*<##epET>t<807*qoM6N<$f{cdyN&o-=

delta 654
zcmV;90&)G92&Dy(BYy&HNkl<Zc-p<!&1xD^7{+lE$2!_72`SR1P%6?&KWHh9X*9+d
z<40mlQng7M0<EQ8xEF;8-h(@@z>Qlkz*Rueg=;ri1XOe(Sp-26)8~aVAfW{3%(TMq
zU5N1K9Ovka1}`Hcf*y1rz$`OEZf<TgYNFRC_yF(VB`m@t5Pv}jT9{QkP9xdx_kW(B
zpMS4ZDu=mTE?_pB9SGUM0wM@%uU>O~eZ31&h{G}7{Bd=4^}AN99UmPXc@cUAbMOGP
zYQ<?p{$dXfN2AfNa=9E^SXfv_>^X}IQhYofYj{z3=N=LG*6nr^OG`_uh`nI(*?%3D
z;xUTb?RJVk1%I8=IEBMgiZ+|g6L$3*K~Ngro)X0m(&=<i@s_jjmJH!er*mR5nVbkd
z1VKqSBvUk%N`(-7#=UA54$8EBc6N5azH3oQI3QDSI2?YRpPzRlXaa#Z?B@_kCX=+?
zi_+2J32$-;6^q3$?Dt&Hv)wd&9Q=(&BZk;V5JAfm-hbfWyS%)l6}!O58}@SAb~qfH
z2tEcKPk5bEAe+tZAZX<|&on%oe5F!ppZ7e|SmU(bYPBf5!t*`TaC4&gmdE1>B50BO
zS4m@40dGE^r&Yg}d#q@<6ma)?y**JBeF&Q6teS>Xp^eki(+Fa3!2sH6;+osr+ZBae
zgTY|mYJas#HwgO4IKgK$chUH)g0*V38poFV*||1MJ`6B35-Gf_6pMT7^?KZ5vCzuj
zfC&tszxzZ&DC|(lGI%a7E@GKXW={}=00QsX_CJ}pLDZ@pmN+5QZnxuwLLr(+BzAGu
o!#10ZF1|VG8u<TVcHaL0pr1FohJ36x00000Ne4wvM6N<$f}))<UjP6A

diff --git a/browser/themes/osx/tabbrowser/tab-background-middle.png b/browser/themes/osx/tabbrowser/tab-background-middle.png
index 060a3afa4abd9a732e2da16ecb57d0b4df0c851d..addb64b13f422a34d6b87e4e75488f9fa2e35ba3 100644
GIT binary patch
delta 281
zcmV+!0p|Xh0ki^;B!Bx!L_t(|+HJ{OQUXy7gyFpCh7=e;1-YmQtb_f(r#t>NXP^q1
zQ}uN^Il+4xJU6#JUPf8E*uKcRNCKTblsYG*JS&q9_DJc(;Us1%>1_swqteG@W{M7a
z^u@^sGC8)-Na^=ViJ^y_2bO>G5R{)WL41!1;;S)QH-gx^w14LS?+qb1>}>7&2@OKl
z*7BAGt=ry)<c(lAbZ8SSpMs?}&7=phw!OYh7(uKaX%&=@F+sfB1>Xtc?WW)+h-FjD
zDx>vqc~P!~LGNcFY|m@ps)6T0>FnyNAaxwOLU5Q}ab&_Z3u4+U*i#$yASU&|le-U>
fnV<*pI_3|XuM#tIM_omQ00000NkvXXu0mjf;#!4F

delta 124
zcmV-?0E7Ru0+|7jBy|~dMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0000x
zNkl<ZD9>YIU|`^4zyer+SQD$n-@kuNuuA;@|Nj|Q2}VZ7|G4bHDZxOpj-ez$R*;PP
eoC?VYD*ynYFCVWl;#aBw0000<MNUMnLSTXc)iO!|

diff --git a/browser/themes/osx/tabbrowser/tab-background-start.png b/browser/themes/osx/tabbrowser/tab-background-start.png
index 5b0c62ca637166ead5fbdac5e054e69dab18e7f9..243bf0099ffe7760843fc75b98d1029d9c9efbef 100644
GIT binary patch
delta 998
zcmV<C0~!301^Wk(BYy+JNkl<ZcwV)YO;0075Qh8hS(~*So3-PQWY*Z^12`-~phzYQ
z5(iEkvl7k$!CpBa<VcXqMuNY<Z{WCOBXL0DKP6GJo3N~baiw~?JUz6Cc85(`Dyq82
zQxDbkF;M^Qg0B<tR%UQCjFciK7zD+CVioAXL7e1SN-Up<oqrdmevlO`FxD2K4bTOl
zML%Mx&dtqLwzjq^i;IipFbwmxS}mW;=TR7Y7-Ww)iWFd3T5D?vP@=1CJ%8T%q2CV~
zT+~{>Q=|q8>V|bhiiiQjtP$S{6=^h^&DN_|zkK=h>9-FV@V6S`jUrzB6hkPI9D&t6
zuKLyvBF*{v`G3yY+1XUH`Pn7={S~BQASnw~U`@_RR<IP3Mk=S3PN&m8KR=(U*J^JV
za20z7q;f4(YC?P<I~cdkfTezVdOBIJ*IzS_p+ts2Brq*Jh(s)!*v!7t(SCk-c=+Vt
z;Go2y3k3^>pBo>OImceKxm@n?_V#v_?LPrEyqg0RKY!7;kMI%ER(E%I=Z}t#ifmuT
z$PDXaBCf5kua{ZBWf{5$GR^)6FwA?EN~OBk?Hc=rh5U>neVFW#{3^%@)gq5JHZ~@{
zd-jYNaGiDli0f1$p?ObGNYL5Z2`OD#Sy?Ht9<UI!z{rTDLu_77CviJ)R(NrGdO83w
zn!QrFl7C~#G5}-5Lg2mpQ$%#{92dWynlkT4fMFnUOe_E;0E~u-wy#<?-7Dg;nVFeF
zty;ZO(z~QmPGznFsf25?Hv)_1-Mw;LT3uZoQ@}M@gmo6f=+5Z?VjN;4*&_pVG@HLV
zK0cn_+}ylSUPWgfAQ|E1Znvvh-@p~D-?8sK3x6{9Z*gH^;fohPy&#4T7;3aFBBZa+
zyGnnD4+A3we!RcGA1*B|T`)8nIn*B1Dlb|XOY%Q_e;*?y4|q-VdOeV$8wQZOK$%RM
z<bYC4vE>}nTEPcYv6hsy`~7~{`@VO<w5zz5L9U23l0gljraKDm@xQhc?)U_L+GsQ;
z_kZ^GjC~1!NZIHBLrM)pa_%Wsl5sgVXYeMMgLzQC;wL93FH2z<{sx7}0^JRQSX;}&
z5zkM14(B>$3fMv5_3Xs>`1s_>%b(3h;SVAVRKkE@DYoG^0i}{f61@P(%VWX7M2~Zn
zot>SX!v2qYxmGywJJa3*aFyb_AhDCV>|gedn0!8xNXwkVe7oIl%+AghmzS5zYin!e
zR;y*E(`)(IJAkVeuXX%DT}pfb5t%%H!%`xS78WufQhxyg6nCOBEr~CXZ)5WQKX?LG
U%ed<84FCWD07*qoM6N<$f`GQ%N&o-=

delta 633
zcmV-<0*3wj2ayGkBYy%|Nkl<Zc-p<zO=}uK9LI4R*SbxsL@d&#P!wsUjkJ_%8ckwt
z;zJ%ankF^`T1$KIE(R2Q58iwQUcCAOJOvDT@a)AyKt&JYK?G6LpYRtGA>ht#Dts=>
z?0k1-9aJ_P4kd-pBeFm^P=FG6SR9i)N-;Ubcz6cO@CMBA5q~~E#40%o>cFH{tF6go
z(w)!ePpj4H&sMAT8}~${jLP9LEWz7QDCE4lx;pE2yMHn6*I+O>gJTH5p=>l7vAP}Q
zDEeBf)vo4pxnRHF|AXKu_~2lc6yXJm>Ma(_dZW<@W8xna*uReyQ3bp-nM{*ta1wpU
zFb9iZE|<&an13(;d-ITFi(|2v2a}!9q`UJFyV|EJmC9DH*Uu@sGcU2LeHD#Hy|l$%
zA;g4vFkfC?p3wGrgb=gMDvd_7(d+fT(`0TTSi+Mdv>b^<ymWM2La}bM5=@y)=7`?e
zwooi#Iq>kQR4N5=-341hv4$7H-syCXXrgaIv4j=y+<$7dZsXc6I9afsUqd31*vEA@
zd}YCWezV!EpSIb-g7y8bRVo!fJ^dyNmY+bK!{PAY`VLL9!Gh%&y-TH1e)^KEvl6;m
zHP7=~&1Ta_Pi|*5Z&VIXU?m=pAJAE}i6OhWxtT@5J5eR*4F-d!-ER9a#tv&@%!DX5
z4Jv4*26Ak%t57H$WBew35o;Q~8&gtH1@Cn_ou^nVj-yVxaaAk|BRKuz_5$?qf#W#$
z#l?m1`uaME!4A5~Dh1iCcerFU8dq>e_rl@uVLF`-)M~ZyD!pK13d|Aa|9AKw@hUgE
TwE0yI00000NkvXXu0mjfZc8&6

diff --git a/browser/themes/osx/tabbrowser/tab-stroke-end.png b/browser/themes/osx/tabbrowser/tab-stroke-end.png
index 72132496367b3a20f04e511bd53185df23796bfa..099978580391777f4fdd196fc9aa160ebf4123a7 100755
GIT binary patch
literal 1215
zcmeAS@N?(olHy`uVBq!ia0vp^azHH4!3-piZ|XG#Qj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07#P<E_=LCu6$1ei6B9EtGmwNZAR-D13Z|x}o}QkOk&)@?
z>7}KmEiEk*Cr+F<Z{Dg^tF~?1cJScAvuDrVym|BS<Hzsbz5DUw$N&HTfhM%JwgSmx
z$BqF>Mn*;mdFap~Ap7p!yFg_?^MULSA3of=bqm7&^5x5uCr^Ovd-v|WdGqGu$B);p
zT?2A~;M=!v5C%kJVqzkY3snF4^JkzkAmjM);}8Wv66g{j`ThHMhzLXrTo%Xx>H?Bm
zw{C?9E?&I&{Q2{61;WC@z;Iw?WtEhaR8>{|_wS#&y87$aumAk{12l@CpC73B>eZ`(
zfq_6ju2``Gr~nuyDk>^KT@euxadC0KfB!BnF0QDk(9zKWniCxz4b&wfA_5ezt*r&x
zo1LA#fB$}<#+;m-UAuNYeE1L;P<!|8y?pud{rmTS{ra_I#|~gnyn6Kt=)3OjZlK0V
zlO}E7zWwRbr=Ma3z5w0YUlQaO3<^PDq_JQDtgLKo>>M1NoIJd|{QQDKKwpW9iHS={
zO3BD5C@HI|scUNK=;#_48W|ZIo0yqdSXx=z*g848d3gBv`UM6C1qBBOhlGTLhDSt1
z0(}r0p8y1jiAl-HDJf~`Ik~yHdHMN8#igZX<&`yc4NV>W(~ekM-T|f~UQZXt5RLP>
zlS9j;9eG+~kFP6pFkajkTfIH+)EN=+%gfGy!H3z_nolZ{&%ZVY27&u370*Bs&%I%*
z!?bPhJ!Jk}o-Z-O=+9#D|Np+8{+<5aFE>6&WiQK@E0L$S&;9@7+ox$iJ@?MG_H8`;
z<DmNb{<Rvrc3yOpIyURES-r((t(UL(4;3{gFzeM77iEh3Z_SN(CZf6Z!_jqNwIctt
zdzV=7XTK{u$*svK!Oyg0QTOrR$ER&H@o*}b?saubcV7RybyJn~i(~^BJ6BtG8L?fO
z#L2mhQ}R}?xZ2dSiVhd1Eje#-s^rt!756$rFIygrbWVKMvFWvQ>Q@_PcfJ;bB`KHX
z??g|zV*HG0*NH6~5AG;+KYj9t4#STrCp1>G&aO;$yVR*D%oo!v&9GKuM*G`I=BXlF
zHw_M)$kM+ub**atIrhx0pA<wCr1rh{Sh;h{OmAJ`nO6?7rcJ*)|MJSbEj%tVy$nh$
zi|6r`_NkeCXX7nqGr6oe)7e~IZR@^?uO4RZJ(CnWFDkY0;Ah{pRq>@qq&V_UPUdc7
zka^|Zf7|u%|Da~pGqoOzUpEw1bQa&YmB{$Jb9TqhPkP3d&kf5aw767#UGDz+_y4)Q
zOv2)#Qeg_8<(53Zwf66yS4Yl$d&61i;Cv!!g_n}ce*xPF(PwjifBk%X`_#+FLn`jL
uJTSbm>_ls?pu_~5()8~!)s@e`Y`Nbp=`8$Dd`c@Qe|ft4xvX<aXaWH8Z3;mE

delta 3067
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
JPDHLkV1kDDuMhwL

diff --git a/browser/themes/osx/tabbrowser/tab-stroke-end@2x.png b/browser/themes/osx/tabbrowser/tab-stroke-end@2x.png
index 5477f9e92c392a34f7110c9aba63c4e933eaa614..d321ca579016cf5fe8b0d4be6bbb42e3d2216fa1 100644
GIT binary patch
literal 4991
zcmZ8k2Q(X8`w!75HCk#Hv5G3O8UzV7Tdloo1u<&Gh?p_E&>E#$yQMK}D@Cmi)SfY7
z*4{M|Ui0&Q-}`;%fByHJd+&4a`90(JoO_;oZ?wLy7CkK|EdT(Zzo)Hkcrhzobogb^
z#po{^5C{NJ3A(DO>EBaR1MB;som|~f0D%0przSIKqVaWjG}`bZD*|k;^*rWhnTgS(
zIxfzVHqgB!{N{aD{OZ^(!3CIHbRictakZvMFE~ODbV8vr4rJ6;;-d%I2al6ms_z*+
zzg2WkJ9y;>Bj3%<OD1y-SbJfkA6BHJE`=F|WyNJ1qPnuJ>*q8MlNTw)rI~$#Z<6v^
zld~Si3|0;60EdfLb;T3AdYB|ySq^&F=eT1ocWowao#~PVnuB5|2cr4)T0B{}aU6$q
z2HnGMH9FUusgDm`YeAEHH~tJksVIvn-{LZu0tVWJm38?LG;#g6)>%p}e+4Oh9dm-z
zB5i@}9Z7R0o?P|(PKi||uaQ1|bC7uNTB&nJiFCjH4eKcL;|zSA!xzTrX)&^KQ#4}q
z^Zt!LI_0)yb@z~Amk#5P216(Vcn$UoU*j;-%UZU!CD*4x)0ct=yz;L+Jbvsa6?}ue
zVt^#H{;oqne$>yIsp=zJ__pa`^_as-VnK(I>nw7%^**jB)i%xBbm_@dSCwUIH>E(l
zV{?AbLO69eqPpa3!KI!-n4C-w>#mNOn`ddE>O^Upg~63m=~P9V_zqEzhBx1mdAk_u
zu^%|PSnszDtlkVOaSC$2HZgXoA&YGyA$w|Y0|R0Y97BACL6$%_h}Oe~_BFXJS}W@6
z0=lf?_9KP&6+h}{Nhkkk)PyPtNq0PX`n?M&#jiKW<USRs5I^7k<YgsWqj-)1Ua`H*
ztNB-jIl^e1;)K_}YD1FCnfYV6+*ta?Wt~=7E5jvP9}gJIts$HUY459^pD`;;SAX|J
z1t;>tpm%(m^Qb5O>{(j5j@Z6{UcZ#=qfKToHM5JK+#o#P%?+`^pwtO!IPBeQa&yC+
zc<;TMiuGuRmV36<d^;Q~s}Mi&Fr-wp3yMkk(D?`ZjV3^VTiJ?YNQizNJ!{cFVK`Bd
zi(mUIqF>-<E20D5Jy<u_Uv!ppR_Iw^TfjCvqxkp<hhm-}?iNn$R0JoCgPcBy!C2Ju
zp9)&PX-bs1q|mV4m@PCGTxN@8o{F({8F9<LBW$GG8N9%@n0)f}q*95i{Cb@&Pg4Fu
z<DU&0au3}pcOyH7w(9Z2&%xq5RP3^hLZD30Xq)lRC&d_63u1Oso*}fOZERm4A8VDd
zm=Y5J%Zd@!j^2*d`_cYehO##6>!Hoz&GI}T=`4v^5(b;~xcxw=L*{oT%-d9BpB9te
z-(wvLnqkPfSBxb<J6X)e%ZkcGX+k=`NL!C+J!k2WW$9ZKf%<=G{1%%l*c8Pdx1u_I
z+@yh>qVw2#r2hQ;o8r2u%cBBj+~!qMGv~y!Ke{1HGC8r-r259+%emSMphP2B`OGo*
zs?P5zOzl8G_<>2Eu(~3z9Orqd9H*i!|2gXbY7b!n@D6b25@Wt78#G?p7QO($l?(X_
zGX)?mgB<{%aC9{`$Cy8S0CPZlNFW{2_9%$}53dXKMZpPxU5Fki3=$mR;qK`R3sC0&
zHv)Dc|Gf?22mc#_aZ~0uf2a>uL;Ik>vJ$cqlKgO5Fc_@l<LCr4RM-4R{bHre?}EX2
z!5|QSe}4&o840wHGek;3K>;Eu4Uv`>zd(rl26|$U0pgy%0{=1cUpwk3Uk4voFN`bN
z6a2Sbq&?aXqs-6$x1;~Hf8zA;`ky0D-+x$L@Ph;(y&zH&l92ydzED)U;0ROmK_M|{
zA7eDy9j^L!62SL7kj^MW6w)zJ3G)9D|F~3w{2j;tiR(Y4|Gj&`8cutm`QHq}X}K1I
z7%qx=;yra$W0y-k>Btu;Camo<fzEBI!>I=O#%;In+%X#+nbJ4a?CRH`V@)(=`%v@7
zx*MW#4JUSaO=q7k2d+(JSx)uqF*y1oe{^*PdvxjVqQXZ@P}sXXnYdp0t#kjGgLBLh
zheO3QhqBkS@3zA7^zzAe-2wanH@#eP>pHE;@ASO&oODkNmn^{jp#lT2_T`+0m&CHr
z83A8YJO3WAbs$=Q_d~-CNv5XTTi0!G%lHB76RUMSQ*Gz4z|9RNM{(X9J|P2kgA`UX
zV|fT%7%s5IBx46!llFUi#e{zZ%{6N>T5A1BOv37m*N217H)2osmirDu52pM_<G2+G
zzQ2D&PeYmxbB<dgfM$AGN`bFhfS-#eZ=Pw=b#xRt0p}>{#8u3!8-x5j{QUer6c-nV
z-)4<{Iz4Sesr$ojm_T5in3xE{ZcPUIb)|?~^M;-5yoqIlaCTf$c)bJB5kCUd#xIIf
zTa#L;d5xJ1DlKb6{@Tp}z4sh0F!0A<u~0g0ShcF1mMb95?eSwy0HZ6^>io}lMo9Bt
zOX-=%2iwhQ$!m9a#dgAe0%VKF@<Vh~&0LKNZR&i4RD~=n>@|?{ZLcg+DM^0o1bQxb
zNI<Mpi}FRAzr*!7m8LUj)VELh;B@Z$^I*eVrdhRHGFNN4SL_4zMB6PXsa=@u?p&em
z>FMECdq$^FAGo)aS=My4HY1Dozv6YAqY=A?I6v8Iun9XQ<y{ldygpK@p=34*&SR+Z
zPBk$W3Y+`LeHfq9s!*I_fbQ?6+NWmZ*)VlFKmEb1=T0yj%UcaSTg}hr$)oq&pRDs8
zU*!5(@;lKU_{wnY5wPAR+);`t=pFD4?o(_i<q_!_Jr~rvDdevq@A)>;#>D61K+@WX
z+M=3Mm>6_rjP6hElgqafRVkE8U7cC-<weNC^NQGwm60QO0sY2yCzkjK-8iz}Ez?J5
z#vI<moU|kV+2mo3YW4(`G5u9Q04JB^II3_lVj{j^KKy;QtgGS9+3_~Iq_{YpypW`4
zW8NI9EL_d7<803$Hr;WX+HbTM>l#T)CIR&QEh5MQwG}TJwwsQ(tWd#(-#=sfHm4iY
zxzmG5HWd+?3NG)fjwM@Pmwa&=;CSf_kX|zqI-El{c-odM_hugd1Trf1hpr8a>dM$g
zGrkZ#p!jt3K3vyrEOjv_tCt{!r$EjgvL|<uU%~gQocpr$($ms(oA-JZKOt9mq_`|6
zE2#Z|IviNSiw;#TW2@XTfpK9<P3quH#Nlid$$vU<dAI%I+)W&BH}`Qaoop6vJ{T&w
zIocA|u3IZa9VZwdsA7GS^KIf)IN6t*V{^DYj+^MW)SWt2)=0L@#ril6o9~FY^E=lY
zb3FO34aIYR6-sA8CCNbqsU+o(=C;X)0f8=$!*Y`*Dn7f7PDj{avcE8nedK-;PxWs7
zYDVkTY8lk~I3Wf~7|@?<O+vt$z!uk+g(Hvi@pajZg0cveuQNWDnYpHNi_dR8NVwV>
zOwV<BXDm+d_B^nT9?E`dq^CS`$7i8Kt#U*t|L&a4FN#ZMO}e}T+ck~=hU@6{NhXzq
z{Hll`{e&^P$xRHna8&IX3k+@hdMkKG*dA@A?V=)ACX1)(R!u3jIC`m4L1Zk>Z*FbJ
zChy5GH=Ef6;@x^P6oj3+-?ion<?Xvz{Y+R4=aH*|Fyh@(;1p@pI#XZ|AQdVque(Ks
zjDN|%H90WgZGQH^4X|s%)Y+0!1UyKUegIAc0NPbDkth7+=Kcun31VN+QNLUvS&PSF
z(4fht>SL>A%0r-lbPJV3%)xnquorcFS(S?&kDwrQ;v2!J&7bgT=0>(8l5!{wZT!F^
zN~8Xh{bJ!w%A8>8ZRytfjahow3@d^$lBjNb(CGN<brPfUem|s3@9y?%2qWe3)mmX}
z8N8F$IA)7^^}&zO0Y#UO6beyfzbPF14J_kJeD5gRQeSr8_t45!SLOGqLJT6r>dV7+
zm%CfvOddJ&D8Ao~LUK1$AIIYK+nlGr2F|3A;7*2jT)HZC7S)dyBLH*>U<x#N#euuA
zYUL9XLnsf`T9#Bz-BxIOJa1SL9*^o?9m-!{{4OT~mClp26NA4Qan7NVr}W{VQBZj+
zP`={O9CADy4d2ko+$EGeB0BYDS&Owi@W=`dTy7H@Q28`pt&=2531xTe<{6K;Aq!24
z7;Li>&6Ok0H0}GZ4&vidWt@+exd3WF=o_7>bxK<P(_IyP26opLDw=SmMH1Ot@uVcy
zgPxN}L^n5LdeZJFHNyp_1>)MfWji@DVsy9D*Z~m=+Jev)--m0-d{LjLaPmpls&P}<
zxK-!1;X)<4S$M`delWFE#Jn^W^)CE|BnbFWcaeJ(hMi^q(ls{qJi>C2aY6Mvx;66B
zymL?5ND(y^fOu=`x?<OgwwH!#K3a$2`s%E>-++2=!g|M8Z&3Ib-Y9$tP3Cdv;oS4*
zo&I$^(^V<wd~hL<9aW~jj@h;Q4YI0C$@vn>M)6>W{+b4Ezqbwu&@=8BoIb1n<N11t
zmUpRyvy#-KaD7;Smv^LqOmZfl%EGUvm0Vs_(lK(a;iWjaowVXMQSEv|%%Upe%Y)$_
zf{D6QdJ6DGW6;$Er%2F?==Xd?(RS4j3`i|>*g7Wf%(VGFbj^QNYS26Vfg9VgiazDW
zhP;Tx6N$)jdR%uhg}G)r(foH*X1yHz^f1(^Gg)+q6f3y?&SA+yN+8X{bhl)TEqa6a
zI_eLM3|{$$tGwF+@<=%B=OL@qWs*vV+FAxym0#C9y~4)Y6(0D6C;@Wk?JqKWQfZym
z!oRo<dM<mpWs$mLGXca)k(0j_ns9MF9)EX;S8m(xbbQNA*W#T|K;7~UzMpQI@r;3i
z#zGU!0K2bef^nMAQU(IFzBOT12g|s)xPGm;NC}sP{;1x{KcR`)$Y+hjXihT1m|KwR
z2|RSi<`eCHIw#6stYW3*_hXE^_WBUb=4D3ZapyvC5$rQ@F&{*46C?BWh_u3XcX|DN
z{c4Uc_|4&+s(lrCi<MQgGQE)FmE8E(s_&*aeKbqTI)=JK`|vd2Nbf12YC`$1pix&h
zJMCjjwo{QI1XQ`lO5XeTkDZG$jXJH23sgz4?LsJajkkV};HQaH=I8xL*>PDhG;xv;
zb@w=g_i%waqP|Ij$M*AM7GZ=m41YV*x+^;yb*X3c`{PR~f+$QyTyKzj&7<FLji;Y{
z5!&>I_8}q-^oAtMl10SG=;*lx_MJ09skxLz=IV|6vs76W=b{-r01<Z5-uHpNaZ|9x
zvy~e@WRZ4vjYgT3&`CrPX5WohXEm7AvFz2cOJ~jB<zCl~Vm@84R*b6*>Xg2h`bl2q
z&_L6E2;j(32|qGl4xQ}vbKH1dIlbg2A9`|V%gM=UTFjuwl7!kCa7=|-q?jyGVU1FI
zrMtDoI)>%5Io1-YB5Vcsmt1_I13%$~Zh%43q#TLOHl)G`@t&8^S7g&A<Hyajt1uLp
zO4#plOlRmYrhPHs0|-<Z7GR(73RYz!fwB(Tskx*hwb*bZH6nLV>t;O6({z(q8y_rb
z%YnFdK&<G3MLViF3EsxvdFOinDSw2oL05+IYQ?x`G%xA}nMZ_CWq&VR-SvI7*7lJO
zq!D9Lu{FZ?(Q^BlB(Oa?@Kxf1zMLY_kd#U>T-BX~V?N3O;(x~)KBIdf4IQOPz^>f5
z4PD=e@4;f4Qp%#lnXnl2*PS-iM*e}D&5ui*37b?qAr<-ctxI^TqbMyJ3MJILn5cX@
zZzQE8*QcnX3Ok(=o$Rfsn*D9niulrO`pZo<dfD*P`cV0q@rx&+sI>v2r+>j_hhJ)W
zQ%Qd<frPg_4_f8pVG{sHY2FRgCyaZ#A`X%`mnR$?%3U1n&e47Sg>Ka?63Unr{gMeX
zkAlyWJM=iwrS6_bR5rzdqDD@+boe1dY=Z%K)f6fEe1n`DUPZhbw3c$%Kp#Z$E5y16
z5h^h>?U8smF>^|TiPc3GlWbpp4)XVX#c(ssL~(E1IP12P@BzhBSH}Fq&cXGjcRWM4
z!ex)N$5NAgv+F&yJ3^)0Xl2I_%bQPkH>KNW*P#`So@TF-g!ODb)$XLn^C(*e%spib
zszJ}#^v_(kXUk~piwV>u@U?ZsmRvpWxF-V+mUu;A6Hs|uqNN!_R(kJ}OYg_Ln4URN
zJ&+E(Q*Ux=iC#S`YG`OE@RutK+aJ)PhsA|fc@S%GoR_C}f$YsDs@hGSm2?Rw8Xw+j
z^j5z<M9$X_v^id_nbT9G*0Uaxno6I_ZZ&Y$SCaH}ZaCIVYy2>PcF*S>O5g8C*PQu!
zXFp&Xc}gae*Mt6g)voc-l2WbhC5NvSaBpO~G5Ea7btq3KNb6+;z{@`cX=~i6ZbbzE
z_=FEQ=^qXdfQj3}1Z&N^pve6@lMw7N5mFQU*W%mf)3}4F1CtTchXo}?+yb*EogqhE
ziRZZQb_J7#VM|}N!t}}ZmW7s`oZRPQKmQ1bM0&mVbhD=Wqlp4hO9MVqcS8j&YHXX(
zaUX(;w_D2Vk&pJ@<{TvdETKHmQ{Ga}`5bB)VzVfApL4utCG2Td4PQ9sm*?MK-g_Fl
K>ZNz>BL4*!v3WuO

literal 2456
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
W&v3K8+6@E%0000<MNUMnLSTaESFg7K

diff --git a/browser/themes/osx/tabbrowser/tab-stroke-start.png b/browser/themes/osx/tabbrowser/tab-stroke-start.png
index 08941c8a783419fd8c0e743c3cafbfaaf6b43ea5..e5a7b5ee9aecb73410b5cacdd4951b2520b54bca 100755
GIT binary patch
literal 1219
zcmeAS@N?(olHy`uVBq!ia0vp^azHH4!3-piZ|XG#Qj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07#KGM_=LCu6$1ei3_#e-%*+Z33Z|x}o}QkOk&)@?>7}Km
zEiEk*Cr+F@ckaA-^H!}|wQbwBg9i_uJ$v@%&6|%OKYsV_-H#tX{{R0EG$}VX7f1pP
zS-W;Ekip2v2qDj%I|pQ+IdkUs@83X+fb1(*t{gjd48s2O=@ZZdAp6_5Z%>~-ee>qc
z`}gmGTp)P#=n;egQIMFJ2;u(x`4g!4?c2AXKY!l6dpAT7NCLG3$zQ*I0ZE`5xHyCX
zv3=LBT@dd4`SXDegR2o176!VUm6cUeQc_J#?ccwD8X6j}U%v*L_Vw#met!Pz*RKP;
z92gkb+1a^b#R{NcS67#^vNBLtSXda)aG>*QYHD<Kb&HCMfab)+!~k`Ph=>49sI9Hd
z&dvr}{rB%*U??3rbZEzp9ry0tJAC-?-o1M-U%vd{!2_Tlfnf^_QlO>45a{mi26_P)
z@<3fce?6OUn-%ER2_->(!N3q?VrIb#SXtTF*w{HZI5~NEdHMMTg@E1?6%!K|mz0u`
zQBYD=Ra4i{)Y8$>H83<XGB!3bHM6j^vaxk^cJuJ`@%0M~3<?Sk4h{(k2@MaAh>VVo
zj*U-9NJvafN=i;nNl8lwIzBHiKfkEBw6v_evZk(~siS`yvzMVeFfH+Vx;TbtoX?#c
zS}tSA)4JSx@k+;S+BfH&d}oq->P+seDT=9HGeO|?{yWp3l%$(i{XMt$($=LaFW0##
z`)=N|YL$(A_p->ivl2I~YF>QUxN%A4)}-?{+1K0E{{OgocG}NJbFbUg?A(%lb<fO&
zv%^;V@2lQdxaq<fm0iD{WuLFVXBar;S|;PV?r-xe_umm<zi{Bn<;KmPhx4b4o}G4$
zN!jYYX59A-=YYl6!b&@S`^6@f^l>^^UetQ^=;Pn-(-)O`JTaL*uSPb!I^TmK<XWeM
z16$<xd1aNezsW=`-M(Z^dfxHOd-dg2JSrs*x3C(Byt?PSU8m8#wc*L!&#q^8TNNC6
z<)Ly>Q{m99)ux;73C|YwZapB_$WU7S&du)mw-^mBwkh|f^MobmZaS#GRQTXT*1KDd
zWjwf*vU|O<No)U$lbOP^{jNvJ+iRFcDqU(*>X2A?xBB4WsbVbd`74h{%FfyNc4J#y
z1=p%nWhsT!i>o)i)n9(k@|LhItC3Zd{Gzn%fA1sSf1B>@c1cQI&@m#qM=w8&*KW7g
zMhz~OhdomnWDM0jFL_+nc`sY>r*Pqx7h98(M0-`_1NvlK?@wDEe_h!%;qeL9kVZ+7
z6Dpp|&&b~?|8;h|uR=?K)C?90#jV?~6&mGzn>By`|37<oXozunE2v#^%hIbo=%l*&
u+}-Nh;{U8)7<-mJxS8qPlF@L8<u5<u3n#^!*CJRz8O+nw&t;ucLK6T6*a*h}

delta 407
zcmX@ixsiE-N<Cw7kh>GZx^prw85kH?(j9#r85lP9bN@+X1@hYid_r7-G#G?3FxWF_
zX)&m%Fo^333#$t%8S~5O@=BR<$(wS?8F9+!b4r`B%j@&W8u7^(@+z3{$Q$#>8F0%O
z0cAl76pc9*jCkb@dF4!aWQ}<gOu6Na>$&BPxaADF<xIF0jky$zKxWAsLp1=6P%!3^
zH{t<mkTXu|&$b0RM7Jc!FPMRmnT3s=o0nfuSVB@-MnPFcT|-OP$k@!>(#pop!O_{p
z)!oC(+sDs8FgTRk`rQnm#(qy1#}En0xd*eEoE#)rFZ?$A#GzR4TbUB1nfU*8HnZ{f
z_Tmk}75nbaH(nEBsdwF|TO?=GPD?JCB|lXPUR(3$-Qu`&>16wCAIXkKjA=fOE%uCo
z*#^#hY1|Gj@dnG~de$A-BP4K7O`(W+nXbbMQ-;8;3Ri@hUzpr+>1SGggU4>o6~&cj
kgE-gdz5a7;XS?mcXlM3%fi@*UGf?n)y85}Sb4q9e0Bi(nrvLx|

diff --git a/browser/themes/osx/tabbrowser/tab-stroke-start@2x.png b/browser/themes/osx/tabbrowser/tab-stroke-start@2x.png
index 8bdbe97cd04c25a6f4ec94925f3095d329dfc9e4..64449115cc9ffbcccacffbb3219467fd81086f0d 100644
GIT binary patch
literal 4792
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
OMGaLQmEyl_{{9!`PXyoq

literal 2463
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

diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
index cc8fb778a607..5c655719435a 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -133,6 +133,7 @@
   background-size: 100% 100%;
   content: "";
   display: -moz-box;
+  position: relative;
 }
 
 .tab-background-start[selected=true]::before,
@@ -172,6 +173,7 @@
 .tab-background-middle[selected=true] {
   background-color: transparent;
   background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png),
+                    @fgTabTexture@,
                     @fgTabBackgroundMiddle@;
   background-repeat: repeat-x;
   background-size: 100% 100%;
@@ -179,6 +181,8 @@
 
 /* Selected tab lightweight theme styles */
 .tab-background-middle[selected=true]:-moz-lwtheme {
+  background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png),
+                    @fgTabTextureLWT@;
   /* Don't stretch the LWT header images */
   background-size: 100% 100%, 100% 100%, auto auto;
 }
@@ -188,10 +192,6 @@
   background-image: @fgTabTextureLWT@;
 }
 
-.tab-background-middle[selected=true]:-moz-lwtheme {
-  background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle-lwtheme.png), @fgTabTextureLWT@;
-}
-
 .tab-background-start[selected=true]:-moz-lwtheme::before,
 .tab-background-end[selected=true]:-moz-lwtheme::before,
 .tab-background-middle[selected=true]:-moz-lwtheme {
@@ -253,6 +253,7 @@
   background-size: 3px 100%;
   content: "";
   display: -moz-box;
+  margin-bottom: 1px;
   width: 3px;
 }
 
diff --git a/browser/themes/windows/browser-aero.css b/browser/themes/windows/browser-aero.css
index 5c7f8b453610..349160bffb50 100644
--- a/browser/themes/windows/browser-aero.css
+++ b/browser/themes/windows/browser-aero.css
@@ -34,6 +34,7 @@
 
   .tab-background-middle[selected=true]:not(:-moz-lwtheme) {
     background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png),
+                      @fgTabTexture@,
                       linear-gradient(transparent, transparent 2px, @customToolbarColor@ 2px, @customToolbarColor@);
   }
 
diff --git a/browser/themes/windows/browser-lightweightTheme.css b/browser/themes/windows/browser-lightweightTheme.css
index a486b442aa96..292d0dc78743 100644
--- a/browser/themes/windows/browser-lightweightTheme.css
+++ b/browser/themes/windows/browser-lightweightTheme.css
@@ -22,7 +22,7 @@
 #tabbrowser-tabs:not([movingtab]) > .tabbrowser-tab > .tab-stack > .tab-background > .tab-background-middle[selected=true]:-moz-lwtheme {
   background-attachment: scroll, scroll, fixed;
   background-color: transparent;
-  background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle-lwtheme.png),
+  background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png),
                     @fgTabTextureLWT@;/*,
                     lwtHeader;*/
   background-position: 0 0, 0 0, right top;
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index b4e20a407222..17b07223a0b5 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -72,17 +72,17 @@
   }
 
   #main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme) {
-    background: linear-gradient(to top, @toolbarShadowColor@ 1px, transparent 1px),
+    background: linear-gradient(to top, @toolbarShadowColor@ 2px, transparent 2px),
                 linear-gradient(rgba(50%,50%,50%,0), ActiveCaption 85%);
     color: CaptionText;
   }
   #main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive {
-    background: linear-gradient(to top, @toolbarShadowColor@ 1px, transparent 1px),
+    background: linear-gradient(to top, @toolbarShadowColor@ 2px, transparent 2px),
                 linear-gradient(rgba(50%,50%,50%,0), InactiveCaption 85%);
     color: InactiveCaptionText;
   }
   #TabsToolbar:-moz-lwtheme {
-    background: linear-gradient(to top, @toolbarShadowColor@ 1px, transparent 1px);
+    background: linear-gradient(to top, @toolbarShadowColor@ 2px, transparent 2px);
   }
   #main-window[tabsintitlebar] #titlebar:-moz-lwtheme {
     visibility: hidden;
@@ -1518,7 +1518,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 #TabsToolbar:not(:-moz-lwtheme),
 #TabsToolbar[tabsontop=false] {
-  background-image: linear-gradient(to top, @toolbarShadowColor@ 1px, rgba(0,0,0,.05) 1px, transparent 50%);
+  background-image: linear-gradient(to top, @toolbarShadowColor@ 2px, rgba(0,0,0,.05) 2px, transparent 50%);
 }
 
 #main-window[tabsintitlebar] #TabsToolbar {
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index 7d30a6a00172..7b2e519825b2 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -142,7 +142,6 @@ browser.jar:
         skin/classic/browser/tabbrowser/loading.png                  (tabbrowser/loading.png)
         skin/classic/browser/tabbrowser/tab.png                      (tabbrowser/tab.png)
         skin/classic/browser/tabbrowser/tab-active-middle.png        (tabbrowser/tab-active-middle.png)
-        skin/classic/browser/tabbrowser/tab-active-middle-lwtheme.png (tabbrowser/tab-active-middle-lwtheme.png)
         skin/classic/browser/tabbrowser/tab-arrow-left.png           (tabbrowser/tab-arrow-left.png)
         skin/classic/browser/tabbrowser/tab-arrow-left-inverted.png  (tabbrowser/tab-arrow-left-inverted.png)
         skin/classic/browser/tabbrowser/tab-background-start.png     (tabbrowser/tab-background-start.png)
@@ -411,7 +410,6 @@ browser.jar:
         skin/classic/aero/browser/tabbrowser/loading.png             (tabbrowser/loading.png)
         skin/classic/aero/browser/tabbrowser/tab.png                 (tabbrowser/tab.png)
         skin/classic/aero/browser/tabbrowser/tab-active-middle.png   (tabbrowser/tab-active-middle.png)
-        skin/classic/aero/browser/tabbrowser/tab-active-middle-lwtheme.png (tabbrowser/tab-active-middle-lwtheme.png)
         skin/classic/aero/browser/tabbrowser/tab-arrow-left.png      (tabbrowser/tab-arrow-left.png)
         skin/classic/aero/browser/tabbrowser/tab-arrow-left-inverted.png (tabbrowser/tab-arrow-left-inverted.png)
         skin/classic/aero/browser/tabbrowser/tab-background-start.png    (tabbrowser/tab-background-start.png)
diff --git a/browser/themes/windows/tabbrowser/tab-active-middle-lwtheme.png b/browser/themes/windows/tabbrowser/tab-active-middle-lwtheme.png
deleted file mode 100644
index 592aab39c29cdd122f9939feaf9644042a98a3bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 226
zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol}0V0ox?vVykEa{HEjtmSN`?>!lvI6;>1s;*b
z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP*t3#
zi(`m|f9{EmyiAS)EC(-JdZ>JKoWSt&xD(HI|K!9efwKbF@BQw4?Q_-M)ValW|I?mr
te_h>S*ptYUEOA)km_Zv(=A4<O%u;^@Tb3UC84I+D!PC{xWt~$(69D^cNhAOO

diff --git a/browser/themes/windows/tabbrowser/tab-active-middle.png b/browser/themes/windows/tabbrowser/tab-active-middle.png
index ad7909399b0b0c1ebf0a40075953fc69d71fb7ce..be90ec0a12bf4efc43674e34c6d6c928f6bca98d 100644
GIT binary patch
delta 588
zcmV-S0<-<L1LOpdBYy%bNkl<Zc-lRZ%S)nR6vhucy9Q>W+09IU#YpX9z!n*_5Dg_I
z?4n?Ji_9V`CCcn#cQ52^p$ipL(*ng%L?LMD|D!XV1J2^`z3=zF-*cYxdp`O)@nh_>
zzKrVI_n%y2G(P$J&-ky;npBKR_B0$0|Bh-f82n#TFc?HSoqt9&8pYDm65MV#j7B5K
zVzFRvZx1$`4b^HDhlhtSnM|OYn;Ycwd8pND%+1YVe}5l(y&iOXdy7t|gGQr)>+5Uu
z`+cNRDUepH#p&rO%H=X19v-l;uz;hZBTy(5g2Um!#>NKX@wgnGoScBp&(Be-)uds)
zUPmkzgWYZieSds>AdyI5W@bhtd_EsU%3v^{-EKpt(?O+Di7SuC14<^7BD21}F2fxh
z93Yd)fX>d&u(`R(y5jEj^;Mh^Z`c*v<{@1!7Z?+Hy<Y6>?4VRC;r{+!E``Hk(ER*7
zF9am_dwzaKuh#>a&1Po9uDF-T<Z?OC)zuZt$YHD1LVq9-fI^`F&CbqZYHA9Me|2>g
zN~Kb)6MxRrGQ`EjMOdv?`2Bv++S;1j)@U>`;N|6|q)9y3*47q|kB@ms;kLWG3+i^e
z;^Oh~kzL7CATqS~_jduv);VU0c6xdmkw}CClAtawE|AS;K`$>aSYBS1K9x#EdO4j=
z(8|h+Xhjx_Mewj3HUC%KL)_fm-J#iRVtadAxKW`{;FpY@Lt^YgKn|Xso|q~}D$d^C
a-tZ5ggB>;l>yL>50000<MNUMnLSTXlV=6TO

delta 413
zcmV;O0b>5-1hxZ^BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D02*{fSaefwW^{L9a%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0003c
zNkl<ZI8SYl;bsF-5Js>4Q~DBph`vCdDJ-Fc5NcUUgjgb$s(*+^wenhhgJgGm&Ty~N
z{5YBKn{VdMCRJ5+cZ+oY@c49#G>+rXU#4k_nh<Bf6oz3qCw{&$h3wt<!UXE<z40lS
z;Cj7AO^6f0$x0)%_|ylD0s~P!eq`cEBWlLrK=Xh(sB`uBJEEW$H{K8hwxb&Km>$#f
zA)&2))t+WSPk*>~V~5z$46^qRb~HK~9n)R*e$|#{kTv1fjSXf)v%u!Y<7<L71Eq?`
zUxmqn-Wx4j?d5W5)k4r3G&CDb!xI66jZeK`0yTqy!AdYI!q8TqTC%$2xh2iOo*N5c
zDyk4H44yM=6`e41#GI))TT#WJM%3J?8K?=P`qb<{!xrop8`W@~t1EXY00000NkvXX
Hu0mjf0n)Ui

diff --git a/browser/themes/windows/tabbrowser/tab-background-end.png b/browser/themes/windows/tabbrowser/tab-background-end.png
index adbecd9d40cc06fae56abcbdda7ab74ae291098f..d78b44c0ef10d9509ce234203b6a96c69ad25bda 100644
GIT binary patch
delta 970
zcmV;*12z1`2H*#fB!8z#L_t(|+O3ycNEA^R$JbnURWud%!DKBXHY}x!v+jD^bsgQ+
zy?9x3Q8dKB>Y)c8B<P`ii4wZJ2tp4*Pel|2LDYLiN@W@b5lB%)UQ#kJLfoC%{%7_y
z<1n*q&hEpHb9S8he&_q<n=_-Xu*{khhaqEjp_wsao`ty{?0=$U;25y#Fvh{Wz#Jbb
z^tb#Rpn49O*f3!rtj2f*zbkN&8Djxi2*&M;$cRLvx+sXqkwmh^FzR9)Cl{UF*!X?=
z=lZXah0kAxo=wg4-<Z7Zx3QrHoLGsIN)Rktr~;J}Wb#OKn-nOdVui#xS$zlS0^Q&Q
z=mSGrTU%%5=6^p7j*Ny`oOlR9O&ARr^+MT!C<Zc#BuJROj^nsM0y;n_%5kS&zM364
zaLiqY3-$sd5abXbb4~|@Y(T>Mi*u!siv39lfWF1$AH(&Y{zhC>4h-?KQ*ne-ij-1{
zLY!3Iv%I=CeAw<M_kK^j=@`hZL@t&X$5qNrjw?&;`+raTAUOB_;~;`o;o@ANr{$JJ
ziJMDNYVQv4fzajaH@&3f2x9n`HRf^&U5GMUh9HRBcZhFkWp%)`-(HIVV%Ab%)do|&
z$89@-%7bGUuXzxp6w)kN)*$gFBHe!?_GrNOV)|__*<k24D~Lgo9gLARms<m#KbxDO
zeO1k*!+-N35z0-UWwp|(Hdm`g0_V<Oa+60(*iMl(kT;gJKdXvcG}3<O!Q(CjwE!dC
zP?X(GQ0r=*=UI)o-^|Vj5$q@eWn;{QKoZlktCpLJn>E6&uB}7N*g&o*R&=rYeoe$K
zt#CZ=uVH(g2v!8L#E%8l4+J?x+@uwVJ!9dk9)AQkLq^}%RH_OiE44EPTJAr3+JRsd
zz$k7c%6GFuPQ;EBXj=I6wF`l);(ZpyjD&P=W#YzU;L%C+HwPExy-wfBW&|q+D&<yu
z0E*&<6md=7x*I?+3j!N~n6;V^bFr)IQ>5|R;!3Bf-0ncoJSl6)r7|lZ;<{Af&}88&
z6MtSvEc82_W-Z=t1-e))R+|RumzLK$E!CbT$j!9FGo{RdS-y7@u{|B|v6yrE^}Fuk
za+?FeOKIkKdC&#Ww-;T2Ahx9gDrcWh%>>ITT~1_t5afd#V1SS=g2@1axF(I*I6mh3
zzPQp89-r`{;phUaC6E>&<2+ggDo#Ij97D&qlLg#+_=Fw3FwV4e4_8>2HWQ?~N$H8$
ss>1O!QG<?Wu?R2y&!iRDqa3II3$5?a!<t)cUjP6A07*qoM6N<$f~>vQv;Y7A

delta 814
zcmV+}1JV582gL@EB!3J^L_t(|+QpVjNEC4#$G2Q{wep4L`hIKcBUe|qUH9Ru>?I0W
zSRvRcg0MP7QDj5}fpqaubm-8jLs2)20>vn@g2F;l$t<yhhkUNPv-4W}PW}f*QOB8C
z=<r!snE8GFzsLVSe_dpTC6ZtO;UE;~!B)Z+f-V>=EiL^+_<vIZOdua*0VCKB3}g`@
z;sWLuDV+i~7JIz@wx5$ztwW>Z$6oahG+pny>yF>$*o}vBKs;H1UYdPS#2m-fFbunw
zX4ric%`|!`y5-Nz!pZ)3pPEmcxn#q`*&rH(N#&ZwJkPsV!?Jv>pJ5N;<<_S?y@ybN
zQoNKbl`nYxI)52t#m@EMINnY9na0ua$)lyUE#-JIX@wkFZGf!UA%l}fD~7-SI$|uY
zHj}=GigGQbwr_$el)nDWhruQ?{SiQ~RczZNc9i|Vh0ZP)0;EVwu2yW_EG);_N5&=^
zqjUC@A;>nM*CMV^K&78%YC5jo7P2-<d#y%Xt^}6ltbfmY-!>pf0WfG0mny_OGv}!@
z7FAb}qcubj&v_`_O60{QO2PKBww=A=K%hji+-k%{N?};G?B2u2b>uh=7t5_k90&wV
zO2LU%{POicEdmuu`#gufN{|&7C<R%YCVo#<A&><`ihZ6%mJ(#exoV*NtU2F)*p6T^
zAXJSwTYn80u)<U4JC{!}GGI!@nQCBIF0cE+qiW&omJZnLf=@?~6{o8K1D5sv^N?+I
zpJyN>$cj_c!1ICBMT#yoIh%z294D508bX4sI7uz&bH?Rc-EIWT1L0!U)AJAmIdP&|
zSdLE~{5EEZ%C-tyYloQivfR6|7(WSG@X<`h>3@qi-Q=SYA!aQgCyv(w$McCJKPJo4
z%=JzLP8CZoy^*dbj?)URMM+P3`W&(Oc41$qt#ub)OB|~e^gC|RN2fn~(O;EN=n~|)
zr0ikR1*{fF2LnD3i1GO7l#gFWD%(4*333}*z)lba3@gOAcqa!Fd=4`)(dIA1<E|Tb
s?kBsN+t0Zx_aAp>S{ht}{J)F;0syAjod^R6f&c&j07*qoM6N<$g5<@AvH$=8

diff --git a/browser/themes/windows/tabbrowser/tab-background-middle.png b/browser/themes/windows/tabbrowser/tab-background-middle.png
index 4c7c951bf77c892245234c29a73bc3eadaee22f9..86a4ab4d0acac486d3ea84b15467bce39b44df86 100644
GIT binary patch
delta 104
zcmV-u0GI!r0jdFzNnuP$L_t(|+F}%tHRfc107fuk`2Qb7vjADTVB!A|DJa3f`1{YF
zbOtPd1t|Xvy96WSf2<Nv(=h-O0}g;w$54|XIY>r*PRry25MTiN(jh$iO}7{T0000<
KMNUMnLSTZ<PbnY(

delta 91
zcmV-h0Hpt_0i6MmNmM^cL_t(2kz?VKH|Ao%0$6}p8LPz0Ye)65N^r8XJjN=)$jJB~
xmmN4I{tcuKno9tKgo<|jrJhj(>hl3h3;^ubABmBI(o+Bc002ovPDHLkV1hjKCrkhU

diff --git a/browser/themes/windows/tabbrowser/tab-background-start.png b/browser/themes/windows/tabbrowser/tab-background-start.png
index 4e7690eb0d2c1bde3423f9d7635d11515d8ce9df..7898b2b225a0ae9f9a6df197e2d0cceb13dd3f7d 100644
GIT binary patch
delta 946
zcmV;j15Ny^2FC}GBYy*qNkl<Zc-pO&Ur19?9LLpdu8F4N9!zE#v9Of>c;}{0r_MH=
zbLvb{G{nH_p$8u%=%Kwt3H^BygdT#PiYN$zsP~GL$}|ijkfMnElahfE;&$))Uj4c4
z?%bR1&%=k`IcMkmzUTM*opbI|atci;*#=IuGH?Vt2YqG^Y=0`ONE)HWm?p=-Y0=(=
zwhnd!ak7GN#8`xgKM;@*AR8g5hChuc1e=XD2H0ZskHAkEEQh{1<WLd;BhH1y{r*T%
z5+qTIPK+!c{Svdi%X)L{j{EueWY6rEul>JPeh;p${yBrS=aiz93WmocqovdW1E<Ds
z>9Bg(LxV#;`+xMz$G-LT^|RPqKj;Q0K|5#z9%(9-Qcf8Gh>{n<ToOfUffnpNaLiHp
z>h)A_fag#1Jl_R8phXU)dMXm|lQ2Z7rs<%l%GpyrxA1cSPP@su`+qPem8~n)pV|<m
zx^iiBi1r+|xUCCI%c5upBdP!srPAS|jZm6HDb7H<bbtE8r#?9IlGEm$5OT^!4Wdpu
z`k`pi-bnG48@F6k&t~A-DH6vl9J8@-v|NUMzolY+ajBO?n__{YAQT=C5FM=swqW?u
zbtk2`2{gunM2r<>#&BmLj8_SiyqtK~NzpoEMd1oD?=qe2&|{Icue9F!cWteU964fz
z5rzQ!a(~gB&1g5T(D@6O9dvb0!~<Jjsc?9V9t><u3ygOkK53)cHpGM6`%IBD(Tc(<
z{4Un_=-a6ouOJ8xV2=lKzFnOq!WqE4w7lXaC-w0_0)*VRnfjD!4ahCGciMPCaKk}e
zyfD{@kc*z~ugNg%yXJ(j6Ao(QMJcV)F?u-Y^M6<T;PEpL7B>J}yvSc0_Nffj7uGcU
z`CA+9ye3|lcbVEunyJ2dw&qjyd_ZuKgX(B-RYbcjGHI1fvkHi5HjdrC*Fp!xnh5fT
zDZH7~aI{>ezQ|JZeQvRpc3qVSBp_c`LIrf#jL~;>)WvTes>(!>-dnVz{;rCmT8tZv
zWq;1v`Gw`yU@%w(DiVbR!(Sh|uPQoBI#7^TWUiTb^S)gO25nemNd}Z!2ttfL@aaGY
zvcSQ@k~-Uq@kuX4?X<|847Sp%LByG8=c1i23gRHyd?TZ-A9ITxyb!FT1?9<N>nYrA
z<Qnx2?E}R_7e~1JkDl5$1bLwelPZ%S#48F1cwUW5Z=nyg2V&yMwbO*-Nx~G(KPiCF
U!|d>&asU7T07*qoM6N<$f;Z>Z-v9sr

delta 789
zcmV+w1M2+82df5<BYyxHbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!
z%}GQ-R7l6gmrG9*Q5c5b?>lFv(@tAz?-vR!hymmh5KtRX69|!DP)SVH7>p*~cW&Kj
zTw-*I345b|!@uA^P;q0dK!KLaxS7#Xd!g+Zzs)pl&Ux~j?|(gKPNiWO002ET2Ahh?
zo@{<DeL~inVeQk$hKR9~lVnbA0ffnL18@RRtnZ{9iY5>xKnvF9a%%eHyElE46QjO(
zEaK2zE)M#AinJLjO|!t|x#{qOrEFxNw?}t69R+48Fj0;GgPHbff{Cb+zDfW=ms1O^
zEI&`ooX>b1s()M;#Ouu1FCS3b*bH8^ivH=T1Q6)yN=4tVzV7OXM|Kn`)`)OWZEQ`j
zakL-_0A8=h9eMY5IhAUU=A_`AI>XUwkF6m2Kdip#NOvZFO2OOppiP5IY#D(6{!%tF
zHr!uS1aBP$+Nv=FP!uV{4{vANq~!0w-yyOMTy{u!mVdHW+^J-2lZp0@YTK%@0MIr!
zJ>?Y4xkha3r`o8!Z@q4}=gg_$J!UF4V%w~-6)Jt^LdK!Hw9Q6s8wSS*CQIKqdS-mY
zL4+-!`a#hgm}>sw>`o^QCf+3?d%;zDY%R6c+np{DVc&k^>ibu1k4M#TFt9~LyUlEg
zM#0wN>wlSvQOS&AGq&}?C2O4+oH`V&k-<JTZS4mem5l`e&*{;jf_Yl~bMWs_btV(q
zKwr-f)7Y>bY)zRQnks!81r{z&3q^3=Of>8V!$5NATq#tQLWFKC&gYrA>HgLQn^0?+
zC4l(##Y^%;cgGhgco!{{tg~$n-Khe{e4(e0?tg5kQq;ZLGy|@5M-Dk0YU<U?X9uZd
z^qb(;Y%76F`)U0XNa(sNwzB+UfA;*@&#DxKR&6VR9RO4S8UQbV;I)N0<;lHUJAKE~
zU!9tgC!&_2<zOuw42*|@eu_uK7#Zw0uFlV*Js#N*%sIm_jQn=d1)ECZKh-b0lb4z|
TlMd(l00000NkvXXu0mjfT&Q{S

diff --git a/browser/themes/windows/tabbrowser/tab-stroke-end.png b/browser/themes/windows/tabbrowser/tab-stroke-end.png
index 6d9e07ddfdb2012daaac0159b313dd4cc32fcc36..763f43195a6424856df5d181c8954ab1d47dc08b 100644
GIT binary patch
literal 1283
zcmeAS@N?(olHy`uVBq!ia0vp^azHH4!3-piZ|XG#Qj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07#JT1_=LCu74r#6@e4}}$eI8de8M0$kO3E0P*5;6HTCrL
zjEsy-Pfsr`Ep2IOnK*Icym|9hty;Bh+qQ!T51u`H_U6r-j~_pN_wL<~A3y&8{|_`F
zH#Zk<Ais<;kj)P^eCN)ca9bdD!AKc?VHtiA*#{3E@QKLti>dI5Dc!$+pI=;+UsChW
zpFjNKYR{fM<CoCnm(;p<@80+C-+>H%Ded3Ce+x+K{`&QcUrLu>Qs={m4`04~;g`|@
za<fXB{{H>@?b|ngX+5CG`}gk!r1b=(^#!C2_@xc`rS<ux4Fsfsq!CaMs0Ju5AZrXn
zKr{Je41ip5Wh-NcV4&^SZ`}b}0hF@!j1G>=|N8Z-fQ-@4pFcHBy+RWT#FQ;Re*6sd
zKF~TK5K**n4@&NyG*3*)(!e(0+RZyB&RhhFtDAZP$-tQ0u1RyI%~`g5&DPC3_dj|1
z9H?^Ju0xx)@0&7v>4nQTrp;ZxYQwfSZ{EFr{T8Tx`n=^ptCy_Y1hnq{!zXv|KYIB1
z8BiBc>iVs_r_Wx#dj0l?kDuPWdH?a#=Z_yh0bTp;`;QMFKK}Ue6Ubf^cGnvioeN5W
z{DK)685x<Fn3!3x0ajKvAYcaq4h~LEE-r2!K0ZEvej!mYNhxVrIeB?SWn~pLbq!5T
zO>J#$9bE%MBV$ujb8BmB8(TX&I|oNsPahxufPkQ&;E>SJu<+>Egrv0eoSeMk;*yfm
z(u&%;wzl?;uHH$L=gytGVA0a0>o;uOvG>UFlV{GIyLA20v)6AwWqgRvVqjq6@^o<w
z(Kw$wAv8JIQNS(Vn|t!QGw;s5dAHZot3j#tkzQ-k(YtrI?%2J1_iO*BtxkEfDs7YR
zd$#pS-Hp>UF;)4Ref-<m*WqQpdHPrKfBb!YeERk6{Of0%Zdw}WJj1B^`AqTq_vgkN
zuMKMFPP&%#W8(MxZ|CH%Ot%)eb<>B(=I_@ZhxUDTO}Zd3<4o82b}R0!H>`U!w&+d2
zbTr?*#N=v1YW4Ni1rM%Wx+XPeT5B-Fk#manH;uRLOtbvivsKwCz3}4Mow}7e%`F10
zo4FXD9PU;AG~;Hp>$UW!2jb@2m~Ax7@8xN@s&}=?X->i7Y=?iQ@8_tqguG~cvv+HA
z_8LV&jrK_zS=E){)ppz66b_td@Y-~%zQD&%CyRSdrM{qrZ{o9^D=iCoZb?L6N;t{-
zaMSL)mhW#(U39U}#!cU=;rsTjp~)SA4l0W~PfVINy{{}pe)}=j+}Me0`gIPh+h@1f
zs&bi4lxu>)txa4{<nvdBBqm25e~^2njp=8^p5n5a|61ACxE!XO`(wJ{!NqBb|JS?s
z@F=V;WHRs#p5m{sm-+X&Dx3c$m!n6#s<#xKYv;b3yEjioBY}^rSvg%o>ES;A@a=us
z+9u{Io`=pwtzT-O(BWvU$nvG8x-RMas&k%GkGXLA)gFtI@;$;Lxys~R^|#NDPqUwH
y`{HfF%GB(UvL#vmgcOIIe{6N>()6ES>>Vcft=V!Wyd9W=89ZJ6T-G@yGywpbIyi&?

delta 458
zcmV;*0X6=E3fTjY8Gi-<008i8eFp#l0ia1lK~#9!y_VZf!axv)fgZM743;3$g|=vo
zu^h^w)f+Kr;Et&8|2FtHnWkjD(2I7Oe7ztf-^~2G-EDO`9YNTHMVP<<#nUEQe{nva
z|3%B4<{$1fdvl}g)s42f4Au)r%>&z0S5(Na0%{TCRme>sfPV)Rn1P)PH*3d#8fgWP
zyaurj71IVokjrqrbZ#F96hYN}&0@WP0tNPRvb-aC)p-MAy?`#*L4IG#S;QoF!QN4c
zPnpxm8y1uN28%AE1!u5{NuFZlF^!zM<`KK#XqdL3u6e{H-(rs|t!oys!v5ZrS#ydF
za5UX(38Bd*CV%-e#$9bKM)89T(&RE{F7eO}H!oVwEMkEp^+4yj$tEWG!S=?zGG|V4
z?x-Zxa%K_7GFYWr&Me{{u1xP`&P?JeXEBKS+UJu+JjZF3l;h?UcfproT2i|pG%F@~
zCMW3vGX1D*Tr9!K@smg&Inj)m<UaVu!7<V07t}8%`9m0d7K_cWgwQi5Y8C5OqYRwz
zaY-CC>x*G5tlo$UsKiYc5Q7y6fJeWX^e29P00HI&78U_z)Bpeg07*qoM6N<$f?_7t
AxBvhE

diff --git a/browser/themes/windows/tabbrowser/tab-stroke-start.png b/browser/themes/windows/tabbrowser/tab-stroke-start.png
index a741942ac8db0dc46bf22ccfe20b81c8df7456f5..91f533dfcce43df0f3baa7526f8a6be240564f6b 100644
GIT binary patch
literal 1287
zcmeAS@N?(olHy`uVBq!ia0vp^azHH4!3-piZ|XG#Qj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07#JT1_=LCu74r#6@e4}}$eI8de8M0$kO3E0P*5;6HTCrL
zjEsy-Pfsr`Ep2IOnK*Icym|9hty;Bh+qQ!T51u`H_U6r-j~_pN_wL<~A3y&8{|_`F
zH#Zk<Ais<;kj)P^eCN)ca9bdD!AKc?VHtiA*#{3E@QKLti>dI5Dc!$+pI=;+UsChW
zpFjNKYR{fM<CoCnm(;p<@80+C-+>H%Ded3Ce+x+K{`&QcUrLu>Qs={m4`04~;g`|@
za<fXB{{H>@?b|ngX+5CG`}gk!r1b=(^#!C2_@xc`rS<ux4Fsfsq!CaMs0Ju5AZrXn
zKr{Je41ip5Wh-NcV4&^SZ`}b}0hF@!j1G>=|N8Z-fQ-@4pFcHBy+RWT#FQ;Re*6sd
zKF~TK5K**n4@&NyG*3*)(!e(0+RZyB&RhhFtDAZP$-tQ0u1RyI%~`g5&DPC3_dj|1
z9H?^Ju0xx)@0&7v>4nQTrp;ZxYQwfSZ{EFr{T8Tx`n=^ptCy_Y1hnq{!zXv|KYIB1
z8BiBc>iVs_r_Wx#dj0l?kDuPWdH?a#=Z_yh0bTp;`;QMFKK}Ue6Ubf^cGnvioeN5W
z{DK)685x<Fn3!3x0ajKvAYcaq4h~LEE-r2!K0ZEvej!mYNhxVrIeB?SWn~pLbq!5T
zO>J#$9bE%MBV$ujb8BmB8(TX&I|oNsPahxufPkQ&;E>SJu<+>Egrv0eoSeMk;*yfm
z(u&%;wzl?;uHH$L=gytGVA0a0>o;uOvG>UFlV{GIyLA20v)6AwWqgRvVqjq6^K@|x
z(U_QfA+$QgP=M{h<_m{%lqaXCowU5G%PpcQQm!eY{qEhmqj&G#jjh)*pYrZzUfz9m
z<IlC8LElBCx~6V3T-<*3c+%}D=R&2oy}1#|KilnWT>X=Cv)9|#|6jRy>dS2XJ^z6r
zw$3uxIbL>8!u{L)?(Q6CeHOjH@2b9UuB3|5>n#l7r;qj>jt`T1#2__eR`!;KwU2kJ
zX0BYb^+3nD>jkGb-DYooC7Bx<Cw=^F?Wq?s!VN`><~-Y(d2j8}3|S$|von{^dZ=t}
zJBeY%8ezi*9;4-d)nx6L+O`)x)75-Ev)E?C=VwPGJYHPM<WA7Ie``YNcil$!)`ll@
zKmWXZt1Nz_m5^r%SBJs<sKhr5nY)%cJ?L;~u$sO*@z&4C3Cnmi_MVqmb1X}*?C$9~
z9DO=3CYic9zx#CUEx&-*A@?s&wsfj4Umd<(ez%Tkq|&7}r4EUOR$tFZXX|kE-3!{h
z*~%h$^^Q$HJC`pwWwwYhNNn$^s?q~3#pSaXFL!Wrf9-rF$M^lShtcx-f2Lov=;Szb
z>;GEOsA+LkYKFeSEDw98GRPQyGr4rD^yA~0%!}Dak7!AG+AZ*zwB$lWj_m%ox1Rs?
z5WHbg#2A{u#%lC3eCC~vRp(EN-{0-X@zBJ8)4(Y!f9>NX|1Uh{kFWjpwWiKTG|j<h
zN$-_8Kc}>MrLB3f517_7zcBVJeQ-0=xh124>E-^Nv3_f2ytcduOvMbIu6{1-oD!M<
DYi&dW

delta 468
zcmV;_0W1E83gZKi8Gi-<008i8eFp#l0jfzvK~#9!z1ICp!ay9y@pQM{?hKolxpNQJ
zBAgF%y45cg74}<H|NnnupTWTwoRBbYgEt7CdvSMr@M6E;pH#QoJ*AGWIxNJHt#fp|
zssa2j=s2Fbbk!mhVZM~{wv=)4ET_e*oR%MrVL}OX{n=PVn|~a@3z{Q^Jj4;J&esS&
zn5FIBJPbvYuW<4bjZo*<xthW>Q=lSP-2!^kv!mY{feF3S%i7c94Z*a;%vGtcXDVsD
zS=d4jE}{bHHH|d_(`@w;CqOeAXCAgJ=5U~&NVWjeY;mtDpj#Sa7^c0=H-J@}Fk|vc
z=w-Irf~$jJnSXttkMzA+n6Bn9O99^-hU@z)qs<fGQJXMB9Iv(=VBP{u`|Eg<KF}R~
zZx*KeSEUi)(llJZf5UYKIB5%}{f)QpfcpmF`eTw0;{oljd6<?tSfzj$CgIu(-(t1^
z`h$9=;A1a*E`n?cv}guWC;iKC{WJ#pg~S<Q0*|A!08QX8@|%McVTXHabFMF@Z!|e4
zN-#jXKko8T!d*2V;31Lfr7h^M&6#1Gm?4Qg6rwds2sD%a(0+gF1_c&q4yW<}0000<
KMNUMnLSTZpYvGIl


From 77cdeff8ff01030e94d7defd4261789f3d321be4 Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Fri, 31 May 2013 16:32:06 +0200
Subject: [PATCH 187/230] Bug 866928: Don't show toolbars in customization mode
 that are collapsed when not in customization mode, r=mconley

---
 browser/components/customizableui/src/CustomizeMode.jsm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index ccf64d3d68b5..dca9a5346818 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -140,7 +140,7 @@ CustomizeMode.prototype = {
 
     this.resetButton.hidden = CustomizableUI.inDefaultState;
 
-    let customizableToolbars = document.querySelectorAll("toolbar[customizable=true]:not([autohide=true])");
+    let customizableToolbars = document.querySelectorAll("toolbar[customizable=true]:not([autohide=true]):not([collapsed=true])");
     for (let toolbar of customizableToolbars)
       toolbar.setAttribute("customizing", true);
 

From 69eeb216a9849b280bfa95992d599af38d1c0230 Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Mon, 3 Jun 2013 13:17:52 +0200
Subject: [PATCH 188/230] Bug 870897: make the zoom controls customizable,
 r=mconley

---
 browser/base/content/browser.xul              |  12 --
 .../customizableui/content/panelUI.inc.xul    |  21 +--
 .../customizableui/content/panelUI.js         |  23 +--
 .../customizableui/src/CustomizableUI.jsm     | 112 ++++++++------
 .../src/CustomizableWidgets.jsm               | 137 ++++++++++++++++++
 .../locales/en-US/chrome/browser/browser.dtd  |   5 -
 browser/themes/linux/browser.css              |   8 -
 .../linux/customizableui/panelUIOverlay.css   |   4 +-
 .../osx/customizableui/panelUIOverlay.css     |  31 ++--
 browser/themes/shared/browser.inc             |   2 +-
 .../customizableui/panelUIOverlay.inc.css     |  94 ++++++++++--
 .../windows/customizableui/panelUIOverlay.css |   6 +-
 12 files changed, 308 insertions(+), 147 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 49d1e5501881..3c9e5e058ebc 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1007,18 +1007,6 @@
                      label="&fullScreenCmd.label;"
                      tooltiptext="&fullScreenButton.tooltip;"/>
 
-      <toolbaritem id="zoom-controls" class="chromeclass-toolbar-additional"
-                   title="&zoomControls.label;">
-        <toolbarbutton id="zoom-out-button" class="toolbarbutton-1"
-                       label="&fullZoomReduceCmd.label;"
-                       command="cmd_fullZoomReduce"
-                       tooltiptext="&zoomOutButton.tooltip;"/>
-        <toolbarbutton id="zoom-in-button" class="toolbarbutton-1"
-                       label="&fullZoomEnlargeCmd.label;"
-                       command="cmd_fullZoomEnlarge"
-                       tooltiptext="&zoomInButton.tooltip;"/>
-      </toolbaritem>
-
       <toolbarbutton id="feed-button"
                      type="menu"
                      class="toolbarbutton-1 chromeclass-toolbar-additional"
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index 36b996016cb3..671e57ac639c 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -6,10 +6,11 @@
        role="group"
        type="arrow"
        level="top"
-       consumeoutsideclicks="true">
+       consumeoutsideclicks="true"
+       noautofocus="true">
   <panelmultiview id="PanelUI-multiView" mainViewId="PanelUI-mainView">
     <panelview id="PanelUI-mainView" flex="1">
-      <vbox class="PanelUI-pageControls" pack="center">
+      <vbox id="PanelUI-pageControls" pack="center">
         <hbox class="PanelUI-editControls">
           <toolbarbutton id="PanelUI-cut-btn" flex="1"
                          label="&cutCmd.label;"
@@ -27,22 +28,6 @@
                          class="panel-combined-button"
                          command="cmd_paste"/>
         </hbox>
-        <hbox class="PanelUI-zoomControls">
-          <toolbarbutton id="PanelUI-zoomOut-btn" flex="1"
-                         noautoclose="true" label="&fullZoomReduceCmd.label;"
-                         command="cmd_fullZoomReduce"
-                         class="panel-combined-button"
-                         tooltiptext="&zoomOutButton.tooltip;"/>
-          <toolbarbutton id="PanelUI-zoomReset-btn" flex="1"
-                         noautoclose="true" command="cmd_fullZoomReset"
-                         class="panel-combined-button"
-                         tooltiptext="&zoomReset.tooltip;"/>
-          <toolbarbutton id="PanelUI-zoomIn-btn" flex="1"
-                         noautoclose="true" label="&fullZoomEnlargeCmd.label;"
-                         command="cmd_fullZoomEnlarge"
-                         class="panel-combined-button"
-                         tooltiptext="&zoomInButton.tooltip;"/>
-        </hbox>
       </vbox>
 
       <vbox id="PanelUI-contents" type="grid"/>
diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
index 11206a88150b..6feee58def75 100644
--- a/browser/components/customizableui/content/panelUI.js
+++ b/browser/components/customizableui/content/panelUI.js
@@ -22,8 +22,7 @@ const PanelUI = {
       multiView: "PanelUI-multiView",
       helpView: "PanelUI-help",
       menuButton: "PanelUI-menu-button",
-      panel: "PanelUI-popup",
-      zoomResetButton: "PanelUI-zoomReset-btn"
+      panel: "PanelUI-popup"
     };
   },
 
@@ -42,12 +41,6 @@ const PanelUI = {
       this.panel.addEventListener(event, this);
     }
 
-    // Register ourselves with the service so we know when the zoom prefs change.
-    Services.obs.addObserver(this, "browser-fullZoom:zoomChange", false);
-    Services.obs.addObserver(this, "browser-fullZoom:zoomReset", false);
-
-    this._updateZoomResetButton();
-
     this.helpView.addEventListener("ViewShowing", this._onHelpViewShow, false);
     this.helpView.addEventListener("ViewHiding", this._onHelpViewHide, false);
   },
@@ -58,8 +51,6 @@ const PanelUI = {
     }
     this.helpView.removeEventListener("ViewShowing", this._onHelpViewShow);
     this.helpView.removeEventListener("ViewHiding", this._onHelpViewHide);
-    Services.obs.removeObserver(this, "browser-fullZoom:zoomChange");
-    Services.obs.removeObserver(this, "browser-fullZoom:zoomReset");
   },
 
   /**
@@ -118,13 +109,6 @@ const PanelUI = {
     }
   },
 
-  /**
-   * nsIObserver implementation, responding to zoom pref changes
-   */
-  observe: function (aSubject, aTopic, aData) {
-    this._updateZoomResetButton();
-  },
-
   /**
    * Registering the menu panel is done lazily for performance reasons. This
    * method is exposed so that CustomizationMode can force registration in the
@@ -213,11 +197,6 @@ const PanelUI = {
                            this.panel.state == "showing";
   },
 
-  _updateZoomResetButton: function() {
-    this.zoomResetButton.setAttribute("label", gNavigatorBundle
-      .getFormattedString("zoomReset.label", [Math.floor(ZoomManager.zoom * 100)]));
-  },
-
   _onWidgetPanelCommand: function(aEvent) {
     if (!aEvent.originalTarget.hasAttribute("noautoclose")) {
       aEvent.currentTarget.hidePopup();
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 55c11533524f..0a550666a84d 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -62,7 +62,7 @@ let gFuturePlacements = new Map();
 
 //XXXunf Temporary. Need a nice way to abstract functions to build widgets
 //       of these types.
-let gSupportedWidgetTypes = new Set(["button", "view"]);
+let gSupportedWidgetTypes = new Set(["button", "view", "custom"]);
 
 /**
  * gSeenWidgets remembers which widgets the user has seen for the first time
@@ -76,6 +76,7 @@ let gSavedState = null;
 let gRestoring = false;
 let gDirty = false;
 let gInBatch = false;
+let gResetting = false;
 
 /**
  * gBuildAreas maps area IDs to actual area nodes within browser windows.
@@ -117,6 +118,7 @@ let CustomizableUIInternal = {
       anchor: "PanelUI-menu-button",
       type: CustomizableUI.TYPE_MENU_PANEL,
       defaultPlacements: [
+        "zoom-controls",
         "new-window-button",
         "privatebrowsing-button",
         "save-page-button",
@@ -323,6 +325,8 @@ let CustomizableUIInternal = {
       }
       this.insertWidgetBefore(node, currentNode, container, aArea);
       this._addParentFlex(node);
+      if (gResetting)
+        this.notifyListeners("onWidgetReset", id);
     }
 
     if (currentNode) {
@@ -708,52 +712,66 @@ let CustomizableUIInternal = {
       throw new Error("buildWidget was passed a non-widget to build.");
     }
 
-    LOG("Building " + aWidget.id);
+    LOG("Building " + aWidget.id + " of type " + aWidget.type);
 
-    let node = aDocument.createElementNS(kNSXUL, "toolbarbutton");
-
-    node.setAttribute("id", aWidget.id);
-    node.setAttribute("widget-id", aWidget.id);
-    node.setAttribute("widget-type", aWidget.type);
-    if (aWidget.disabled) {
-      node.setAttribute("disabled", true);
-    }
-    node.setAttribute("removable", aWidget.removable);
-    node.setAttribute("label", aWidget.name);
-    node.setAttribute("tooltiptext", aWidget.description);
-    //XXXunf Need to hook this up to a <key> element or something.
-    if (aWidget.shortcut) {
-      node.setAttribute("acceltext", aWidget.shortcut);
-    }
-    node.setAttribute("class", "toolbarbutton-1 chromeclass-toolbar-additional");
-
-    let handler = this.handleWidgetClick.bind(this, aWidget, node);
-    node.addEventListener("command", handler, false);
-
-    // If the widget has a view, and has view showing / hiding listeners,
-    // hook those up to this widget.
-    if (aWidget.type == "view" &&
-        (aWidget.onViewShowing || aWidget.onViewHiding)) {
-      LOG("Widget " + aWidget.id + " has a view with showing and hiding events. Auto-registering event handlers.");
-      let viewNode = aDocument.getElementById(aWidget.viewId);
-
-      if (!viewNode) {
-        ERROR("Could not find the view node with id: " + aWidget.viewId);
-        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") {
-          viewNode.addEventListener(eventName, aWidget[handler], false);
+    let node;
+    if (aWidget.type == "custom") {
+      if (aWidget.onBuild) {
+        try {
+          node = aWidget.onBuild(aDocument);
+        } catch (ex) {
+          ERROR("Custom widget with id " + aWidget.id + " threw an error: " + ex.message);
         }
       }
+      if (!node || !(node instanceof aDocument.defaultView.XULElement))
+        ERROR("Custom widget with id " + aWidget.id + " does not return a valid node");
+    }
+    else {
+      node = aDocument.createElementNS(kNSXUL, "toolbarbutton");
 
-      LOG("Widget " + aWidget.id + " showing and hiding event handlers set.");
+      node.setAttribute("id", aWidget.id);
+      node.setAttribute("widget-id", aWidget.id);
+      node.setAttribute("widget-type", aWidget.type);
+      if (aWidget.disabled) {
+        node.setAttribute("disabled", true);
+      }
+      node.setAttribute("removable", aWidget.removable);
+      node.setAttribute("label", aWidget.name);
+      node.setAttribute("tooltiptext", aWidget.description);
+      //XXXunf Need to hook this up to a <key> element or something.
+      if (aWidget.shortcut) {
+        node.setAttribute("acceltext", aWidget.shortcut);
+      }
+      node.setAttribute("class", "toolbarbutton-1 chromeclass-toolbar-additional");
+
+      let handler = this.handleWidgetClick.bind(this, aWidget, node);
+      node.addEventListener("command", handler, false);
+
+      // If the widget has a view, and has view showing / hiding listeners,
+      // hook those up to this widget.
+      if (aWidget.type == "view" &&
+          (aWidget.onViewShowing || aWidget.onViewHiding)) {
+        LOG("Widget " + aWidget.id + " has a view with showing and hiding events. Auto-registering event handlers.");
+        let viewNode = aDocument.getElementById(aWidget.viewId);
+
+        if (!viewNode) {
+          ERROR("Could not find the view node with id: " + aWidget.viewId);
+          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") {
+            viewNode.addEventListener(eventName, aWidget[handler], false);
+          }
+        }
+
+        LOG("Widget " + aWidget.id + " showing and hiding event handlers set.");
+      }
     }
 
     aWidget.instances.set(aDocument, node);
@@ -1117,7 +1135,7 @@ let CustomizableUIInternal = {
           listener[aEvent].apply(listener, aArgs);
         }
       } catch (e) {
-        Cu.reportError(e + " -- " + e.fileName + ":" + e.lineNumber);
+        Cu.reportError(e + " -- " + (e.fileName ? e.fileName + ":" + e.lineNumber : ""));
       }
     }
   },
@@ -1311,6 +1329,10 @@ let CustomizableUIInternal = {
       widget.onViewHiding = typeof aData.onViewHiding == "function" ? 
                                  aData.onViewHiding :
                                  null;
+    } else if (widget.type == "custom") {
+      widget.onBuild = typeof aData.onBuild == "function" ?
+                                 aData.onBuild :
+                                 null;
     }
 
     if (gPalette.has(widget.id)) {
@@ -1466,6 +1488,7 @@ let CustomizableUIInternal = {
   },
 
   reset: function() {
+    gResetting = true;
     Services.prefs.clearUserPref(kPrefCustomizationState);
     LOG("State reset");
 
@@ -1486,6 +1509,7 @@ let CustomizableUIInternal = {
         this.buildArea(areaId, placements, areaNode);
       }
     }
+    gResetting = false;
   },
 
   _addParentFlex: function(aElement) {
diff --git a/browser/components/customizableui/src/CustomizableWidgets.jsm b/browser/components/customizableui/src/CustomizableWidgets.jsm
index a8c27906cb91..f66d4b70ebbd 100644
--- a/browser/components/customizableui/src/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/src/CustomizableWidgets.jsm
@@ -28,6 +28,18 @@ function LOG(aMsg) {
 }
 function ERROR(aMsg) Cu.reportError("[CustomizableWidgets] " + aMsg);
 
+
+function setAttributes(aNode, aAttrs) {
+  for (let [name, value] of Iterator(aAttrs)) {
+    if (!value) {
+      if (aNode.hasAttribute(name))
+        aNode.removeAttribute(name);
+    } else {
+      aNode.setAttribute(name, value);
+    }
+  }
+}
+
 const CustomizableWidgets = [{
     id: "history-panelmenu",
     type: "view",
@@ -246,4 +258,129 @@ const CustomizableWidgets = [{
         win.openPreferences();
       }
     }
+  }, {
+    id: "zoom-controls",
+    name: "Zoom Controls",
+    type: "custom",
+    removable: true,
+    defaultArea: CustomizableUI.AREA_PANEL,
+    allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
+    onBuild: function(aDocument) {
+      let inPanel = (this.currentArea == CustomizableUI.AREA_PANEL);
+      let noautoclose = inPanel ? "true" : null;
+      let flex = inPanel ? "1" : null;
+      let cls = inPanel ? "panel-combined-button" : "toolbarbutton-1";
+      let buttons = [{
+        id: "zoom-out-button",
+        noautoclose: noautoclose,
+        command: "cmd_fullZoomReduce",
+        flex: flex,
+        class: cls,
+        label: "Zoom out",
+        tooltiptext: "Zoom out"
+      }, {
+        id: "zoom-reset-button",
+        noautoclose: noautoclose,
+        command: "cmd_fullZoomReset",
+        flex: flex,
+        class: cls,
+        tooltiptext: "Reset Zoom"
+      }, {
+        id: "zoom-in-button",
+        noautoclose: noautoclose,
+        command: "cmd_fullZoomEnlarge",
+        flex: flex,
+        class: cls,
+        label: "Zoom in",
+        tooltiptext: "Zoom in"
+      }];
+
+      let node = aDocument.createElementNS(kNSXUL, "toolbaritem");
+      node.setAttribute("id", "zoom-controls");
+      node.setAttribute("title", "Zoom Controls");
+      if (inPanel)
+        node.setAttribute("flex", "1");
+      node.classList.add("chromeclass-toolbar-additional");
+
+      buttons.forEach(function(aButton) {
+        let btnNode = aDocument.createElementNS(kNSXUL, "toolbarbutton");
+        setAttributes(btnNode, aButton);
+        node.appendChild(btnNode);
+      });
+
+      // The middle node is the 'Reset Zoom' button.
+      let zoomResetButton = node.childNodes[1];
+      let window = aDocument.defaultView;
+      function updateZoomResetButton() {
+        zoomResetButton.setAttribute("label", window.gNavigatorBundle
+          .getFormattedString("zoomReset.label", [Math.floor(window.ZoomManager.zoom * 100)]));
+      };
+
+      // Register ourselves with the service so we know when the zoom prefs change.
+      Services.obs.addObserver(updateZoomResetButton, "browser-fullZoom:zoomChange", false);
+      Services.obs.addObserver(updateZoomResetButton, "browser-fullZoom:zoomReset", false);
+
+      updateZoomResetButton();
+      if (!inPanel)
+        zoomResetButton.setAttribute("hidden", "true");
+
+      function updateWidgetStyle(aInPanel) {
+        let attrs = {
+          noautoclose: aInPanel ? "true" : null,
+          flex: aInPanel ? "1" : null,
+          class: aInPanel ? "panel-combined-button" : "toolbarbutton-1"
+        };
+        for (let i = 0, l = node.childNodes.length; i < l; ++i) {
+          setAttributes(node.childNodes[i], attrs);
+        }
+        zoomResetButton.setAttribute("hidden", aInPanel ? "false" : "true");
+        if (aInPanel)
+          node.setAttribute("flex", "1");
+        else if (node.hasAttribute("flex"))
+          node.removeAttribute("flex");
+      }
+
+      let listener = {
+        onWidgetAdded: function(aWidgetId, aArea, aPosition) {
+          if (aWidgetId != this.id)
+            return;
+
+          updateWidgetStyle(aArea == CustomizableUI.AREA_PANEL);
+        }.bind(this),
+
+        onWidgetRemoved: function(aWidgetId, aPrevArea) {
+          if (aWidgetId != this.id)
+            return;
+
+          // When a widget is demoted to the palette ('removed'), it's visual
+          // style should change.
+          updateWidgetStyle(false);
+          zoomResetButton.setAttribute("hidden", "true");
+        }.bind(this),
+
+        onWidgetReset: function(aWidgetId) {
+          if (aWidgetId != this.id)
+            return;
+          updateWidgetStyle(this.currentArea == CustomizableUI.AREA_PANEL);
+        }.bind(this),
+
+        onWidgetMoved: function(aWidgetId, aArea) {
+          if (aWidgetId != this.id)
+            return;
+          updateWidgetStyle(aArea == CustomizableUI.AREA_PANEL);
+        }.bind(this),
+
+        onWidgetDestroyed: function(aWidgetId) {
+          if (aWidgetId != this.id)
+            return;
+
+          CustomizableUI.removeListener(listener);
+          Services.obs.removeObserver(updateZoomResetButton, "browser-fullZoom:zoomChange");
+          Services.obs.removeObserver(updateZoomResetButton, "browser-fullZoom:zoomReset");
+        }.bind(this)
+      };
+      CustomizableUI.addListener(listener);
+
+      return node;
+    }
   }];
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 3ee00426af17..50e1690bb8cb 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -532,11 +532,6 @@ you can use these alternative items. Otherwise, their values should be empty.  -
 
 <!ENTITY fullScreenButton.tooltip       "Display the window in full screen">
 
-<!ENTITY zoomOutButton.tooltip          "Zoom out">
-<!ENTITY zoomInButton.tooltip           "Zoom in">
-<!ENTITY zoomControls.label             "Zoom Controls">
-<!ENTITY zoomReset.tooltip              "Reset Zoom">
-
 <!ENTITY quitApplicationCmdWin.label       "Exit"> 
 <!ENTITY quitApplicationCmdWin.accesskey   "x">
 <!ENTITY goBackCmd.commandKey "[">
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index f29d017a4229..0db9e4e68a02 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -683,14 +683,6 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   -moz-image-region: rect(0px 120px 24px 96px);
 }
 
-/* These buttons are going to be removed in later bugs, but until then
- * we're overriding the menuPanel-icons sprites with these ones with
- * !important.
- *
- * Here are the relevant removal bugs:
- * #zoom-out-button, #zoom-in-button - Bug 870897
- */
-
 #zoom-out-button {
   list-style-image: url("moz-icon://stock/gtk-zoom-out?size=toolbar") !important;
 }
diff --git a/browser/themes/linux/customizableui/panelUIOverlay.css b/browser/themes/linux/customizableui/panelUIOverlay.css
index 4c0ba6516319..60acde9fd093 100644
--- a/browser/themes/linux/customizableui/panelUIOverlay.css
+++ b/browser/themes/linux/customizableui/panelUIOverlay.css
@@ -28,13 +28,13 @@
   list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar&state=disabled");
 }
 
-#PanelUI-zoomOut-btn {
+#PanelUI-contents #zoom-out-button {
   list-style-image: url("moz-icon://stock/gtk-zoom-out?size=toolbar");
   padding-left: 12px;
   padding-right: 12px;
 }
 
-#PanelUI-zoomIn-btn {
+#PanelUI-contents #zoom-in-button {
   list-style-image: url("moz-icon://stock/gtk-zoom-in?size=toolbar");
   padding-left: 12px;
   padding-right: 12px;
diff --git a/browser/themes/osx/customizableui/panelUIOverlay.css b/browser/themes/osx/customizableui/panelUIOverlay.css
index ad050b8c7ef0..0e501186d690 100644
--- a/browser/themes/osx/customizableui/panelUIOverlay.css
+++ b/browser/themes/osx/customizableui/panelUIOverlay.css
@@ -18,6 +18,7 @@
     width: 20px;
   }
 
+  #PanelUI-contents #zoom-controls toolbarbutton,
   .panel-combined-button {
     list-style-image: url(chrome://browser/skin/customizableui/menuPanel-small-icons@2x.png);
   }
@@ -129,41 +130,37 @@
     -moz-image-region: rect(0 96px 32px 64px);
   }
 
-  #PanelUI-zoomOut-btn {
+  #PanelUI-contents #zoom-out-button {
     -moz-image-region: rect(0 128px 32px 96px);
   }
 
-  #PanelUI-zoomIn-btn {
+  #PanelUI-contents #zoom-in-button {
     -moz-image-region: rect(0 160px 32px 128px);
   }
 }
 
-.PanelUI-pageControls toolbarbutton:not(:first-child) {
+#PanelUI-pageControls toolbarbutton:not(:first-child),
+#PanelUI-contents #zoom-controls toolbarbutton:not(:first-child) {
   -moz-margin-start: 0;
 }
-.PanelUI-pageControls toolbarbutton:not(:last-child) {
+#PanelUI-pageControls toolbarbutton:not(:last-child),
+#PanelUI-contents #zoom-controls toolbarbutton:not(:last-child) {
   -moz-margin-end: 0;
 }
-.PanelUI-pageControls toolbarbutton:not(:first-child):not(:last-child) {
+#PanelUI-pageControls toolbarbutton:not(:first-child):not(:last-child),
+#PanelUI-contents #zoom-controls toolbarbutton:not(:first-child):not(:last-child) {
   margin-left: 0;
   margin-right: 0;
 }
 
-#PanelUI-zoomIn-btn,
-#PanelUI-zoomOut-btn {
+#PanelUI-contents #zoom-in-button,
+#PanelUI-contents #zoom-out-button {
   padding-left: 12px;
   padding-right: 12px;
 }
 
-.PanelUI-editControls #PanelUI-copy-btn,
-.PanelUI-zoomControls #PanelUI-zoomReset-btn {
-  border-left: none;
-  border-right: none;
-  border-radius: 0;
-}
-
-#PanelUI-zoomIn-btn .toolbarbutton-text,
-#PanelUI-zoomOut-btn .toolbarbutton-text,
-#PanelUI-zoomReset-btn .toolbarbutton-icon {
+#PanelUI-contents #zoom-in-button .toolbarbutton-text,
+#PanelUI-contents #zoom-out-button .toolbarbutton-text,
+#PanelUI-contents #zoom-reset-button .toolbarbutton-icon {
   display: none;
 }
diff --git a/browser/themes/shared/browser.inc b/browser/themes/shared/browser.inc
index 017d06ff1624..93b04a280a30 100644
--- a/browser/themes/shared/browser.inc
+++ b/browser/themes/shared/browser.inc
@@ -1,3 +1,3 @@
 %filter substitution
 
-%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #zoom-out-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button
+%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index 8154440c4456..bb80ddb3f870 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -52,13 +52,30 @@
   font-size: 10px;
 }
 
-.PanelUI-pageControls {
+#PanelUI-contents #wrapper-zoom-controls {
+  margin-left: -1em;
+  margin-right: -1em;
+  width: calc(100% + 2em);
+}
+
+#PanelUI-contents #zoom-controls,
+#PanelUI-pageControls {
   padding: 1em 0 0;
 }
 
+#PanelUI-contents #zoom-controls {
+  -moz-margin-start: -1em;
+  -moz-box-align: stretch;
+  width: calc(100% + 2em);
+}
+
+#PanelUI-contents #wrapper-zoom-controls #zoom-controls {
+  -moz-margin-start: 0;
+}
+
 .PanelUI-footer,
 .PanelUI-editControls,
-.PanelUI-zoomControls,
+#PanelUI-contents #zoom-controls,
 #PanelUI-contents,
 .PanelUI-footer,
 .panel-mainview:not([panelid="PanelUI-popup"]) {
@@ -92,11 +109,8 @@ panelview:not([mainview]) .toolbarbutton-text,
   display: block;
 }
 
-.PanelUI-pageControls toolbarbutton {
-  min-width: 7em;
-}
-
-.PanelUI-pageControls toolbarbutton > .toolbarbutton-icon {
+#PanelUI-pageControls toolbarbutton > .toolbarbutton-icon,
+#PanelUI-contents #zoom-controls toolbarbutton > .toolbarbutton-icon {
   -moz-margin-end: 0;
 }
 
@@ -111,8 +125,30 @@ panelview:not([mainview]) .toolbarbutton-text,
   list-style-image: url(chrome://browser/skin/customizableui/menuPanel-icons.png);
 }
 
+#PanelUI-contents #zoom-controls toolbarbutton,
+#PanelUI-pageControls toolbarbutton {
+  -moz-box-orient: horizontal;
+  min-width: 7em;
+}
+
+#customization-palette #zoom-controls toolbarbutton,
+#PanelUI-contents #zoom-controls toolbarbutton {
+  max-width: none;
+  max-height: none;
+  height: auto;
+}
+
+#customization-palette #zoom-reset-button {
+  display: none;
+}
+
+#customization-palette #zoom-controls toolbarbutton {
+  min-width: 1em;
+}
+
 /* These smaller icons have different styling between the panel and the toolbar,
    hence not referencing toolbar.png for these icons. */
+#PanelUI-contents #zoom-controls toolbarbutton,
 .panel-combined-button {
   list-style-image: url(chrome://browser/skin/customizableui/menuPanel-small-icons.png);
 }
@@ -124,16 +160,22 @@ panelview:not([mainview]) .toolbarbutton-text,
   margin: calc(5em / 12);
 }
 
+#PanelUI-contents #zoom-controls toolbarbutton > .toolbarbutton-icon {
+  min-width: 0;
+  min-height: 0;
+  margin: 0;
+}
+
 .PanelUI-editControls #PanelUI-copy-btn,
-.PanelUI-zoomControls #PanelUI-zoomReset-btn {
+#PanelUI-contents #zoom-controls #zoom-reset-button {
   border-left: none;
   border-right: none;
   border-radius: 0;
 }
 
-#PanelUI-zoomIn-btn .toolbarbutton-text,
-#PanelUI-zoomOut-btn .toolbarbutton-text,
-#PanelUI-zoomReset-btn .toolbarbutton-icon {
+#PanelUI-contents #zoom-in-button .toolbarbutton-text,
+#PanelUI-contents #zoom-out-button .toolbarbutton-text,
+#PanelUI-contents #zoom-reset-button .toolbarbutton-icon {
   display: none;
 }
 
@@ -178,7 +220,8 @@ panelview toolbarbutton,
 
 panelview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #widget-overflow-list > toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
-#PanelUI-mainView .PanelUI-pageControls toolbarbutton,
+#PanelUI-pageControls toolbarbutton,
+#PanelUI-contents #zoom-controls toolbarbutton,
 .customizationmode-button,
 #PanelUI-mainView #PanelUI-customize-btn {
   background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
@@ -341,18 +384,39 @@ toolbarbutton.panel-multiview-anchor {
   -moz-image-region: rect(0 48px 16px 32px);
 }
 
-#PanelUI-zoomOut-btn {
+#PanelUI-contents #zoom-out-button {
   -moz-image-region: rect(0 64px 16px 48px);
 }
 
-#PanelUI-zoomReset-btn {
+#PanelUI-contents #zoom-reset-button {
   list-style-image: none;
 }
 
-#PanelUI-zoomIn-btn {
+#PanelUI-contents #zoom-in-button {
   -moz-image-region: rect(0 80px 16px 64px);
 }
 
+#PanelUI-contents #zoom-out-button {
+  -moz-margin-end: none;
+}
+
+#PanelUI-contents #zoom-in-button {
+  -moz-border-start: 1px solid;
+  -moz-margin-start: none;
+}
+
+#PanelUI-contents #zoom-out-button:-moz-locale-dir(ltr),
+#PanelUI-contents #zoom-in-button:-moz-locale-dir(rtl) {
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+}
+
+#PanelUI-contents #zoom-out-button:-moz-locale-dir(rtl),
+#PanelUI-contents #zoom-in-button:-moz-locale-dir(ltr) {
+  border-top-left-radius: 2px;
+  border-bottom-left-radius: 2px;
+}
+
 /* These icons are missing from Toolbar.png, so this is a temporary
    hack until they are added. */
 toolbar > .customization-target > #find-button,
diff --git a/browser/themes/windows/customizableui/panelUIOverlay.css b/browser/themes/windows/customizableui/panelUIOverlay.css
index 990029662e64..d8d27762e530 100644
--- a/browser/themes/windows/customizableui/panelUIOverlay.css
+++ b/browser/themes/windows/customizableui/panelUIOverlay.css
@@ -7,7 +7,7 @@
 
 %include ../../shared/customizableui/panelUIOverlay.inc.css
 
-.PanelUI-pageControls toolbarbutton {
+#PanelUI-pageControls toolbarbutton {
   list-style-image: url("chrome://browser/skin/Toolbar.png");
 }
 
@@ -21,12 +21,12 @@
   -moz-image-region: rect(0, 252px, 18px, 234px);
 }
 
-#PanelUI-zoomOut-btn {
+#PanelUI-contents #zoom-out-btn {
   -moz-image-region: rect(0, 288px, 18px, 270px);
   padding-left: 12px;
   padding-right: 12px;
 }
-#PanelUI-zoomIn-btn {
+#PanelUI-contents #zoom-in-btn {
   -moz-image-region: rect(0, 306px, 18px, 288px);
   padding-left: 12px;
   padding-right: 12px;

From 0b1883ccb9f4cdb2e4c5313a5bfb7c074a80a3de Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Mon, 3 Jun 2013 13:17:55 +0200
Subject: [PATCH 189/230] Bug 870901: Re-add edit controls and make them
 customizable, r=mconley

---
 .../customizableui/content/panelUI.inc.xul    | 20 ----
 .../customizableui/src/CustomizableUI.jsm     |  1 +
 .../src/CustomizableWidgets.jsm               | 98 +++++++++++++++++++
 .../locales/en-US/chrome/browser/browser.dtd  |  4 -
 browser/themes/linux/browser.css              | 42 ++++++++
 .../linux/customizableui/panelUIOverlay.css   | 12 +--
 browser/themes/osx/browser.css                | 67 +++++++++++++
 .../osx/customizableui/panelUIOverlay.css     | 13 +--
 browser/themes/shared/browser.inc             |  2 +-
 .../customizableui/panelUIOverlay.inc.css     | 35 ++++---
 browser/themes/windows/browser.css            | 12 +++
 .../windows/customizableui/panelUIOverlay.css |  8 +-
 12 files changed, 262 insertions(+), 52 deletions(-)

diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index 671e57ac639c..becd8cc90b16 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -10,26 +10,6 @@
        noautofocus="true">
   <panelmultiview id="PanelUI-multiView" mainViewId="PanelUI-mainView">
     <panelview id="PanelUI-mainView" flex="1">
-      <vbox id="PanelUI-pageControls" pack="center">
-        <hbox class="PanelUI-editControls">
-          <toolbarbutton id="PanelUI-cut-btn" flex="1"
-                         label="&cutCmd.label;"
-                         tooltiptext="&cutButton.tooltip;"
-                         class="panel-combined-button"
-                         command="cmd_cut"/>
-          <toolbarbutton id="PanelUI-copy-btn" flex="1"
-                         label="&copyCmd.label;"
-                         tooltiptext="&copyButton.tooltip;"
-                         class="panel-combined-button"
-                         command="cmd_copy"/>
-          <toolbarbutton id="PanelUI-paste-btn" flex="1"
-                         label="&pasteCmd.label;"
-                         tooltiptext="&pasteButton.tooltip;"
-                         class="panel-combined-button"
-                         command="cmd_paste"/>
-        </hbox>
-      </vbox>
-
       <vbox id="PanelUI-contents" type="grid"/>
 
       <vbox id="PanelUI-mainView-spring" flex="1"/>
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 0a550666a84d..29661bde6b4e 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -118,6 +118,7 @@ let CustomizableUIInternal = {
       anchor: "PanelUI-menu-button",
       type: CustomizableUI.TYPE_MENU_PANEL,
       defaultPlacements: [
+        "edit-controls",
         "zoom-controls",
         "new-window-button",
         "privatebrowsing-button",
diff --git a/browser/components/customizableui/src/CustomizableWidgets.jsm b/browser/components/customizableui/src/CustomizableWidgets.jsm
index f66d4b70ebbd..7d65f214068e 100644
--- a/browser/components/customizableui/src/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/src/CustomizableWidgets.jsm
@@ -381,6 +381,104 @@ const CustomizableWidgets = [{
       };
       CustomizableUI.addListener(listener);
 
+      return node;
+    }
+  }, {
+    id: "edit-controls",
+    name: "Edit Controls",
+    type: "custom",
+    removable: true,
+    defaultArea: CustomizableUI.AREA_PANEL,
+    allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
+    onBuild: function(aDocument) {
+      let inPanel = (this.currentArea == CustomizableUI.AREA_PANEL);
+      let flex = inPanel ? "1" : null;
+      let cls = inPanel ? "panel-combined-button" : "toolbarbutton-1";
+      let buttons = [{
+        id: "cut-button",
+        command: "cmd_cut",
+        flex: flex,
+        class: cls,
+        label: "Cut",
+        tooltiptext: "Cut"
+      }, {
+        id: "copy-button",
+        command: "cmd_copy",
+        flex: flex,
+        class: cls,
+        label: "Copy",
+        tooltiptext: "Copy"
+      }, {
+        id: "paste-button",
+        command: "cmd_paste",
+        flex: flex,
+        class: cls,
+        label: "Paste",
+        tooltiptext: "Paste"
+      }];
+
+      let node = aDocument.createElementNS(kNSXUL, "toolbaritem");
+      node.setAttribute("id", "edit-controls");
+      node.setAttribute("title", "Edit Controls");
+      if (inPanel)
+        node.setAttribute("flex", "1");
+      node.classList.add("chromeclass-toolbar-additional");
+
+      buttons.forEach(function(aButton) {
+        let btnNode = aDocument.createElementNS(kNSXUL, "toolbarbutton");
+        setAttributes(btnNode, aButton);
+        node.appendChild(btnNode);
+      });
+
+      function updateWidgetStyle(aInPanel) {
+        let attrs = {
+          flex: aInPanel ? "1" : null,
+          class: aInPanel ? "panel-combined-button" : "toolbarbutton-1"
+        };
+        for (let i = 0, l = node.childNodes.length; i < l; ++i) {
+          setAttributes(node.childNodes[i], attrs);
+        }
+        if (aInPanel)
+          node.setAttribute("flex", "1");
+        else if (node.hasAttribute("flex"))
+          node.removeAttribute("flex");
+      }
+
+      let listener = {
+        onWidgetAdded: function(aWidgetId, aArea, aPosition) {
+          if (aWidgetId != this.id)
+            return;
+          updateWidgetStyle(aArea == CustomizableUI.AREA_PANEL);
+        }.bind(this),
+
+        onWidgetRemoved: function(aWidgetId, aPrevArea) {
+          if (aWidgetId != this.id)
+            return;
+          // When a widget is demoted to the palette ('removed'), it's visual
+          // style should change.
+          updateWidgetStyle(false);
+        }.bind(this),
+
+        onWidgetReset: function(aWidgetId) {
+          if (aWidgetId != this.id)
+            return;
+          updateWidgetStyle(this.currentArea == CustomizableUI.AREA_PANEL);
+        }.bind(this),
+
+        onWidgetMoved: function(aWidgetId, aArea) {
+          if (aWidgetId != this.id)
+            return;
+          updateWidgetStyle(aArea == CustomizableUI.AREA_PANEL);
+        }.bind(this),
+
+        onWidgetDestroyed: function(aWidgetId) {
+          if (aWidgetId != this.id)
+            return;
+          CustomizableUI.removeListener(listener);
+        }.bind(this)
+      };
+      CustomizableUI.addListener(listener);
+
       return node;
     }
   }];
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 50e1690bb8cb..445488b6ed21 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -526,10 +526,6 @@ you can use these alternative items. Otherwise, their values should be empty.  -
 <!ENTITY newWindowButton.tooltip        "Open a new window">
 <!ENTITY sidebarCloseButton.tooltip     "Close sidebar">
 
-<!ENTITY cutButton.tooltip              "Cut">
-<!ENTITY copyButton.tooltip             "Copy">
-<!ENTITY pasteButton.tooltip            "Paste">
-
 <!ENTITY fullScreenButton.tooltip       "Display the window in full screen">
 
 <!ENTITY quitApplicationCmdWin.label       "Exit"> 
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 0db9e4e68a02..1bba6096e4db 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -683,6 +683,27 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   -moz-image-region: rect(0px 120px 24px 96px);
 }
 
+#cut-button {
+  list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar") !important;
+}
+#cut-button[disabled="true"] {
+  list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar&state=disabled") !important;
+}
+
+#copy-button {
+  list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar") !important;
+}
+#copy-button[disabled="true"] {
+  list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar&state=disabled") !important;
+}
+
+#paste-button {
+  list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar") !important;
+}
+#paste-button[disabled="true"] {
+  list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar&state=disabled") !important;
+}
+
 #zoom-out-button {
   list-style-image: url("moz-icon://stock/gtk-zoom-out?size=toolbar") !important;
 }
@@ -819,6 +840,27 @@ toolbar[iconsize="small"] #new-window-button {
   -moz-image-region: rect(0px 80px 16px 64px);
 }
 
+toolbar[iconsize="small"] #cut-button {
+  list-style-image: url("moz-icon://stock/gtk-cut?size=menu");
+}
+toolbar[iconsize="small"] #cut-button[disabled="true"] {
+  list-style-image: url("moz-icon://stock/gtk-cut?size=menu&state=disabled");
+}
+
+toolbar[iconsize="small"] #copy-button {
+  list-style-image: url("moz-icon://stock/gtk-copy?size=menu");
+}
+toolbar[iconsize="small"] #copy-button[disabled="true"] {
+  list-style-image: url("moz-icon://stock/gtk-copy?size=menu&state=disabled");
+}
+
+toolbar[iconsize="small"] #paste-button {
+  list-style-image: url("moz-icon://stock/gtk-paste?size=menu");
+}
+toolbar[iconsize="small"] #paste-button[disabled="true"] {
+  list-style-image: url("moz-icon://stock/gtk-paste?size=menu&state=disabled");
+}
+
 toolbar[iconsize="small"] #fullscreen-button {
   list-style-image: url("moz-icon://stock/gtk-fullscreen?size=menu");
 }
diff --git a/browser/themes/linux/customizableui/panelUIOverlay.css b/browser/themes/linux/customizableui/panelUIOverlay.css
index 60acde9fd093..96f93789e914 100644
--- a/browser/themes/linux/customizableui/panelUIOverlay.css
+++ b/browser/themes/linux/customizableui/panelUIOverlay.css
@@ -7,24 +7,24 @@
 
 %include ../../shared/customizableui/panelUIOverlay.inc.css
 
-#PanelUI-cut-btn {
+#PanelUI-contents #cut-button {
   list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar");
 }
-#PanelUI-cut-btn[disabled="true"] {
+#PanelUI-contents #cut-button[disabled="true"] {
   list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar&state=disabled");
 }
 
-#PanelUI-copy-btn {
+#PanelUI-contents #copy-button {
   list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar");
 }
-#PanelUI-copy-btn[disabled="true"] {
+#PanelUI-contents #copy-button[disabled="true"] {
   list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar&state=disabled");
 }
 
-#PanelUI-paste-btn {
+#PanelUI-contents #paste-button {
   list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar");
 }
-#PanelUI-paste-btn[disabled="true"] {
+#PanelUI-contents #paste-button[disabled="true"] {
   list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar&state=disabled");
 }
 
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 88e4e3494568..270fa233236c 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -947,6 +947,73 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   }
 }
 
+/* cut button */
+
+#cut-button {
+  -moz-image-region: rect(0, 260px, 20px, 240px);
+}
+
+@media (min-resolution: 2dppx) {
+  #cut-button {
+    -moz-image-region: rect(0, 520px, 40px, 480px);
+  }
+}
+
+#edit-controls {
+  -moz-box-align: center;
+}
+
+/* copy button */
+
+#copy-button {
+  -moz-image-region: rect(0, 280px, 20px, 260px);
+}
+
+@media (min-resolution: 2dppx) {
+  #copy-button {
+    -moz-image-region: rect(0, 560px, 40px, 520px);
+  }
+}
+
+/* paste button */
+
+#paste-button {
+  -moz-image-region: rect(0, 300px, 20px, 280px);
+}
+
+@media (min-resolution: 2dppx) {
+  #paste-button {
+    -moz-image-region: rect(0, 600px, 40px, 560px);
+  }
+}
+
+#cut-button {
+  -moz-margin-end: 0;
+}
+
+#paste-button {
+  -moz-border-start: none;
+  -moz-margin-start: 0;
+}
+
+#cut-button:-moz-locale-dir(ltr),
+#paste-button:-moz-locale-dir(rtl) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+#cut-button:-moz-locale-dir(rtl),
+#paste-button:-moz-locale-dir(ltr) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+#copy-button {
+  border-radius: 0;
+  margin-right: 0;
+  margin-left: 0;
+}
+
 /* alltabs button */
 
 #alltabs-button {
diff --git a/browser/themes/osx/customizableui/panelUIOverlay.css b/browser/themes/osx/customizableui/panelUIOverlay.css
index 0e501186d690..f06e09709aea 100644
--- a/browser/themes/osx/customizableui/panelUIOverlay.css
+++ b/browser/themes/osx/customizableui/panelUIOverlay.css
@@ -18,6 +18,7 @@
     width: 20px;
   }
 
+  #PanelUI-contents #edit-controls toolbarbutton,
   #PanelUI-contents #zoom-controls toolbarbutton,
   .panel-combined-button {
     list-style-image: url(chrome://browser/skin/customizableui/menuPanel-small-icons@2x.png);
@@ -118,15 +119,15 @@
     -moz-image-region: rect(384px 128px 448px 64px);
   }
 
-  #PanelUI-cut-btn {
+  #PanelUI-contents #cut-button {
     -moz-image-region: rect(0 32px 32px 0);
   }
 
-  #PanelUI-copy-btn {
+  #PanelUI-contents #copy-button {
     -moz-image-region: rect(0 64px 32px 32px);
   }
 
-  #PanelUI-paste-btn {
+  #PanelUI-contents #paste-button {
     -moz-image-region: rect(0 96px 32px 64px);
   }
 
@@ -139,15 +140,15 @@
   }
 }
 
-#PanelUI-pageControls toolbarbutton:not(:first-child),
+#PanelUI-contents #edit-controls toolbarbutton:not(:first-child),
 #PanelUI-contents #zoom-controls toolbarbutton:not(:first-child) {
   -moz-margin-start: 0;
 }
-#PanelUI-pageControls toolbarbutton:not(:last-child),
+#PanelUI-contents #edit-controls toolbarbutton:not(:last-child),
 #PanelUI-contents #zoom-controls toolbarbutton:not(:last-child) {
   -moz-margin-end: 0;
 }
-#PanelUI-pageControls toolbarbutton:not(:first-child):not(:last-child),
+#PanelUI-contents #edit-controls toolbarbutton:not(:first-child):not(:last-child),
 #PanelUI-contents #zoom-controls toolbarbutton:not(:first-child):not(:last-child) {
   margin-left: 0;
   margin-right: 0;
diff --git a/browser/themes/shared/browser.inc b/browser/themes/shared/browser.inc
index 93b04a280a30..84cf27d5cb6c 100644
--- a/browser/themes/shared/browser.inc
+++ b/browser/themes/shared/browser.inc
@@ -1,3 +1,3 @@
 %filter substitution
 
-%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button
+%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index bb80ddb3f870..d068cef1f4b5 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -52,29 +52,32 @@
   font-size: 10px;
 }
 
+#PanelUI-contents #wrapper-edit-controls,
 #PanelUI-contents #wrapper-zoom-controls {
   margin-left: -1em;
   margin-right: -1em;
   width: calc(100% + 2em);
 }
 
-#PanelUI-contents #zoom-controls,
-#PanelUI-pageControls {
+#PanelUI-contents #edit-controls,
+#PanelUI-contents #zoom-controls {
   padding: 1em 0 0;
 }
 
+#PanelUI-contents #edit-controls,
 #PanelUI-contents #zoom-controls {
   -moz-margin-start: -1em;
   -moz-box-align: stretch;
   width: calc(100% + 2em);
 }
 
+#PanelUI-contents #wrapper-edit-controls #edit-controls,
 #PanelUI-contents #wrapper-zoom-controls #zoom-controls {
   -moz-margin-start: 0;
 }
 
 .PanelUI-footer,
-.PanelUI-editControls,
+#PanelUI-contents #edit-controls,
 #PanelUI-contents #zoom-controls,
 #PanelUI-contents,
 .PanelUI-footer,
@@ -109,7 +112,7 @@ panelview:not([mainview]) .toolbarbutton-text,
   display: block;
 }
 
-#PanelUI-pageControls toolbarbutton > .toolbarbutton-icon,
+#PanelUI-contents #edit-controls toolbarbutton > .toolbarbutton-icon,
 #PanelUI-contents #zoom-controls toolbarbutton > .toolbarbutton-icon {
   -moz-margin-end: 0;
 }
@@ -125,12 +128,14 @@ panelview:not([mainview]) .toolbarbutton-text,
   list-style-image: url(chrome://browser/skin/customizableui/menuPanel-icons.png);
 }
 
-#PanelUI-contents #zoom-controls toolbarbutton,
-#PanelUI-pageControls toolbarbutton {
+#PanelUI-contents #edit-controls toolbarbutton,
+#PanelUI-contents #zoom-controls toolbarbutton {
   -moz-box-orient: horizontal;
   min-width: 7em;
 }
 
+#customization-palette #edit-controls toolbarbutton,
+#PanelUI-contents #edit-controls toolbarbutton,
 #customization-palette #zoom-controls toolbarbutton,
 #PanelUI-contents #zoom-controls toolbarbutton {
   max-width: none;
@@ -142,12 +147,14 @@ panelview:not([mainview]) .toolbarbutton-text,
   display: none;
 }
 
+#customization-palette #edit-controls toolbarbutton,
 #customization-palette #zoom-controls toolbarbutton {
   min-width: 1em;
 }
 
 /* These smaller icons have different styling between the panel and the toolbar,
    hence not referencing toolbar.png for these icons. */
+#PanelUI-contents #edit-controls toolbarbutton,
 #PanelUI-contents #zoom-controls toolbarbutton,
 .panel-combined-button {
   list-style-image: url(chrome://browser/skin/customizableui/menuPanel-small-icons.png);
@@ -160,13 +167,14 @@ panelview:not([mainview]) .toolbarbutton-text,
   margin: calc(5em / 12);
 }
 
+#PanelUI-contents #edit-controls toolbarbutton > .toolbarbutton-icon,
 #PanelUI-contents #zoom-controls toolbarbutton > .toolbarbutton-icon {
   min-width: 0;
   min-height: 0;
   margin: 0;
 }
 
-.PanelUI-editControls #PanelUI-copy-btn,
+#PanelUI-contents #edit-controls #copy-button,
 #PanelUI-contents #zoom-controls #zoom-reset-button {
   border-left: none;
   border-right: none;
@@ -220,7 +228,7 @@ panelview toolbarbutton,
 
 panelview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #widget-overflow-list > toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
-#PanelUI-pageControls toolbarbutton,
+#PanelUI-contents #edit-controls toolbarbutton,
 #PanelUI-contents #zoom-controls toolbarbutton,
 .customizationmode-button,
 #PanelUI-mainView #PanelUI-customize-btn {
@@ -372,15 +380,15 @@ toolbarbutton.panel-multiview-anchor {
   -moz-image-region: rect(192px 64px 224px 32px);
 }
 
-#PanelUI-cut-btn {
+#PanelUI-contents #cut-button {
   -moz-image-region: rect(0 16px 16px 0);
 }
 
-#PanelUI-copy-btn {
+#PanelUI-contents #copy-button {
   -moz-image-region: rect(0 32px 16px 16px);
 }
 
-#PanelUI-paste-btn {
+#PanelUI-contents #paste-button {
   -moz-image-region: rect(0 48px 16px 32px);
 }
 
@@ -400,17 +408,22 @@ toolbarbutton.panel-multiview-anchor {
   -moz-margin-end: none;
 }
 
+#PanelUI-contents #paste-button,
 #PanelUI-contents #zoom-in-button {
   -moz-border-start: 1px solid;
   -moz-margin-start: none;
 }
 
+#PanelUI-contents #cut-button:-moz-locale-dir(ltr),
+#PanelUI-contents #paste-button:-moz-locale-dir(rtl),
 #PanelUI-contents #zoom-out-button:-moz-locale-dir(ltr),
 #PanelUI-contents #zoom-in-button:-moz-locale-dir(rtl) {
   border-top-right-radius: 2px;
   border-bottom-right-radius: 2px;
 }
 
+#PanelUI-contents #cut-button:-moz-locale-dir(rtl),
+#PanelUI-contents #paste-button:-moz-locale-dir(ltr),
 #PanelUI-contents #zoom-out-button:-moz-locale-dir(rtl),
 #PanelUI-contents #zoom-in-button:-moz-locale-dir(ltr) {
   border-top-left-radius: 2px;
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 17b07223a0b5..2a341af5d268 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -717,6 +717,18 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   -moz-image-region: rect(0, 198px, 18px, 180px);
 }
 
+#cut-button {
+  -moz-image-region: rect(0, 216px, 18px, 198px);
+}
+
+#copy-button {
+  -moz-image-region: rect(0, 234px, 18px, 216px);
+}
+
+#paste-button {
+  -moz-image-region: rect(0, 252px, 18px, 234px);
+}
+
 #fullscreen-button {
   -moz-image-region: rect(0, 270px, 18px, 252px);
 }
diff --git a/browser/themes/windows/customizableui/panelUIOverlay.css b/browser/themes/windows/customizableui/panelUIOverlay.css
index d8d27762e530..01560ef80a36 100644
--- a/browser/themes/windows/customizableui/panelUIOverlay.css
+++ b/browser/themes/windows/customizableui/panelUIOverlay.css
@@ -7,17 +7,17 @@
 
 %include ../../shared/customizableui/panelUIOverlay.inc.css
 
-#PanelUI-pageControls toolbarbutton {
+#PanelUI-contents #edit-controls toolbarbutton {
   list-style-image: url("chrome://browser/skin/Toolbar.png");
 }
 
-#PanelUI-cut-btn {
+#PanelUI-contents #cut-button {
   -moz-image-region: rect(0, 216px, 18px, 198px);
 }
-#PanelUI-copy-btn {
+#PanelUI-contents #copy-button {
   -moz-image-region: rect(0, 234px, 18px, 216px);
 }
-#PanelUI-paste-btn {
+#PanelUI-contents #paste-button {
   -moz-image-region: rect(0, 252px, 18px, 234px);
 }
 

From 20c70616570c716968c1cf9824242206c1c56ca1 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Mon, 3 Jun 2013 14:20:02 -0400
Subject: [PATCH 190/230] Backed out changeset ea38f867cc07 due to possibly
 introducing leaks.

---
 .../customizableui/content/panelUI.inc.xul    | 20 ++++
 .../customizableui/src/CustomizableUI.jsm     |  1 -
 .../src/CustomizableWidgets.jsm               | 98 -------------------
 .../locales/en-US/chrome/browser/browser.dtd  |  4 +
 browser/themes/linux/browser.css              | 42 --------
 .../linux/customizableui/panelUIOverlay.css   | 12 +--
 browser/themes/osx/browser.css                | 67 -------------
 .../osx/customizableui/panelUIOverlay.css     | 13 ++-
 browser/themes/shared/browser.inc             |  2 +-
 .../customizableui/panelUIOverlay.inc.css     | 35 +++----
 browser/themes/windows/browser.css            | 12 ---
 .../windows/customizableui/panelUIOverlay.css |  8 +-
 12 files changed, 52 insertions(+), 262 deletions(-)

diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index becd8cc90b16..671e57ac639c 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -10,6 +10,26 @@
        noautofocus="true">
   <panelmultiview id="PanelUI-multiView" mainViewId="PanelUI-mainView">
     <panelview id="PanelUI-mainView" flex="1">
+      <vbox id="PanelUI-pageControls" pack="center">
+        <hbox class="PanelUI-editControls">
+          <toolbarbutton id="PanelUI-cut-btn" flex="1"
+                         label="&cutCmd.label;"
+                         tooltiptext="&cutButton.tooltip;"
+                         class="panel-combined-button"
+                         command="cmd_cut"/>
+          <toolbarbutton id="PanelUI-copy-btn" flex="1"
+                         label="&copyCmd.label;"
+                         tooltiptext="&copyButton.tooltip;"
+                         class="panel-combined-button"
+                         command="cmd_copy"/>
+          <toolbarbutton id="PanelUI-paste-btn" flex="1"
+                         label="&pasteCmd.label;"
+                         tooltiptext="&pasteButton.tooltip;"
+                         class="panel-combined-button"
+                         command="cmd_paste"/>
+        </hbox>
+      </vbox>
+
       <vbox id="PanelUI-contents" type="grid"/>
 
       <vbox id="PanelUI-mainView-spring" flex="1"/>
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 29661bde6b4e..0a550666a84d 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -118,7 +118,6 @@ let CustomizableUIInternal = {
       anchor: "PanelUI-menu-button",
       type: CustomizableUI.TYPE_MENU_PANEL,
       defaultPlacements: [
-        "edit-controls",
         "zoom-controls",
         "new-window-button",
         "privatebrowsing-button",
diff --git a/browser/components/customizableui/src/CustomizableWidgets.jsm b/browser/components/customizableui/src/CustomizableWidgets.jsm
index 7d65f214068e..f66d4b70ebbd 100644
--- a/browser/components/customizableui/src/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/src/CustomizableWidgets.jsm
@@ -381,104 +381,6 @@ const CustomizableWidgets = [{
       };
       CustomizableUI.addListener(listener);
 
-      return node;
-    }
-  }, {
-    id: "edit-controls",
-    name: "Edit Controls",
-    type: "custom",
-    removable: true,
-    defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
-    onBuild: function(aDocument) {
-      let inPanel = (this.currentArea == CustomizableUI.AREA_PANEL);
-      let flex = inPanel ? "1" : null;
-      let cls = inPanel ? "panel-combined-button" : "toolbarbutton-1";
-      let buttons = [{
-        id: "cut-button",
-        command: "cmd_cut",
-        flex: flex,
-        class: cls,
-        label: "Cut",
-        tooltiptext: "Cut"
-      }, {
-        id: "copy-button",
-        command: "cmd_copy",
-        flex: flex,
-        class: cls,
-        label: "Copy",
-        tooltiptext: "Copy"
-      }, {
-        id: "paste-button",
-        command: "cmd_paste",
-        flex: flex,
-        class: cls,
-        label: "Paste",
-        tooltiptext: "Paste"
-      }];
-
-      let node = aDocument.createElementNS(kNSXUL, "toolbaritem");
-      node.setAttribute("id", "edit-controls");
-      node.setAttribute("title", "Edit Controls");
-      if (inPanel)
-        node.setAttribute("flex", "1");
-      node.classList.add("chromeclass-toolbar-additional");
-
-      buttons.forEach(function(aButton) {
-        let btnNode = aDocument.createElementNS(kNSXUL, "toolbarbutton");
-        setAttributes(btnNode, aButton);
-        node.appendChild(btnNode);
-      });
-
-      function updateWidgetStyle(aInPanel) {
-        let attrs = {
-          flex: aInPanel ? "1" : null,
-          class: aInPanel ? "panel-combined-button" : "toolbarbutton-1"
-        };
-        for (let i = 0, l = node.childNodes.length; i < l; ++i) {
-          setAttributes(node.childNodes[i], attrs);
-        }
-        if (aInPanel)
-          node.setAttribute("flex", "1");
-        else if (node.hasAttribute("flex"))
-          node.removeAttribute("flex");
-      }
-
-      let listener = {
-        onWidgetAdded: function(aWidgetId, aArea, aPosition) {
-          if (aWidgetId != this.id)
-            return;
-          updateWidgetStyle(aArea == CustomizableUI.AREA_PANEL);
-        }.bind(this),
-
-        onWidgetRemoved: function(aWidgetId, aPrevArea) {
-          if (aWidgetId != this.id)
-            return;
-          // When a widget is demoted to the palette ('removed'), it's visual
-          // style should change.
-          updateWidgetStyle(false);
-        }.bind(this),
-
-        onWidgetReset: function(aWidgetId) {
-          if (aWidgetId != this.id)
-            return;
-          updateWidgetStyle(this.currentArea == CustomizableUI.AREA_PANEL);
-        }.bind(this),
-
-        onWidgetMoved: function(aWidgetId, aArea) {
-          if (aWidgetId != this.id)
-            return;
-          updateWidgetStyle(aArea == CustomizableUI.AREA_PANEL);
-        }.bind(this),
-
-        onWidgetDestroyed: function(aWidgetId) {
-          if (aWidgetId != this.id)
-            return;
-          CustomizableUI.removeListener(listener);
-        }.bind(this)
-      };
-      CustomizableUI.addListener(listener);
-
       return node;
     }
   }];
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 445488b6ed21..50e1690bb8cb 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -526,6 +526,10 @@ you can use these alternative items. Otherwise, their values should be empty.  -
 <!ENTITY newWindowButton.tooltip        "Open a new window">
 <!ENTITY sidebarCloseButton.tooltip     "Close sidebar">
 
+<!ENTITY cutButton.tooltip              "Cut">
+<!ENTITY copyButton.tooltip             "Copy">
+<!ENTITY pasteButton.tooltip            "Paste">
+
 <!ENTITY fullScreenButton.tooltip       "Display the window in full screen">
 
 <!ENTITY quitApplicationCmdWin.label       "Exit"> 
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 1bba6096e4db..0db9e4e68a02 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -683,27 +683,6 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   -moz-image-region: rect(0px 120px 24px 96px);
 }
 
-#cut-button {
-  list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar") !important;
-}
-#cut-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar&state=disabled") !important;
-}
-
-#copy-button {
-  list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar") !important;
-}
-#copy-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar&state=disabled") !important;
-}
-
-#paste-button {
-  list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar") !important;
-}
-#paste-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar&state=disabled") !important;
-}
-
 #zoom-out-button {
   list-style-image: url("moz-icon://stock/gtk-zoom-out?size=toolbar") !important;
 }
@@ -840,27 +819,6 @@ toolbar[iconsize="small"] #new-window-button {
   -moz-image-region: rect(0px 80px 16px 64px);
 }
 
-toolbar[iconsize="small"] #cut-button {
-  list-style-image: url("moz-icon://stock/gtk-cut?size=menu");
-}
-toolbar[iconsize="small"] #cut-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-cut?size=menu&state=disabled");
-}
-
-toolbar[iconsize="small"] #copy-button {
-  list-style-image: url("moz-icon://stock/gtk-copy?size=menu");
-}
-toolbar[iconsize="small"] #copy-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-copy?size=menu&state=disabled");
-}
-
-toolbar[iconsize="small"] #paste-button {
-  list-style-image: url("moz-icon://stock/gtk-paste?size=menu");
-}
-toolbar[iconsize="small"] #paste-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-paste?size=menu&state=disabled");
-}
-
 toolbar[iconsize="small"] #fullscreen-button {
   list-style-image: url("moz-icon://stock/gtk-fullscreen?size=menu");
 }
diff --git a/browser/themes/linux/customizableui/panelUIOverlay.css b/browser/themes/linux/customizableui/panelUIOverlay.css
index 96f93789e914..60acde9fd093 100644
--- a/browser/themes/linux/customizableui/panelUIOverlay.css
+++ b/browser/themes/linux/customizableui/panelUIOverlay.css
@@ -7,24 +7,24 @@
 
 %include ../../shared/customizableui/panelUIOverlay.inc.css
 
-#PanelUI-contents #cut-button {
+#PanelUI-cut-btn {
   list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar");
 }
-#PanelUI-contents #cut-button[disabled="true"] {
+#PanelUI-cut-btn[disabled="true"] {
   list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar&state=disabled");
 }
 
-#PanelUI-contents #copy-button {
+#PanelUI-copy-btn {
   list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar");
 }
-#PanelUI-contents #copy-button[disabled="true"] {
+#PanelUI-copy-btn[disabled="true"] {
   list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar&state=disabled");
 }
 
-#PanelUI-contents #paste-button {
+#PanelUI-paste-btn {
   list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar");
 }
-#PanelUI-contents #paste-button[disabled="true"] {
+#PanelUI-paste-btn[disabled="true"] {
   list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar&state=disabled");
 }
 
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 270fa233236c..88e4e3494568 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -947,73 +947,6 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   }
 }
 
-/* cut button */
-
-#cut-button {
-  -moz-image-region: rect(0, 260px, 20px, 240px);
-}
-
-@media (min-resolution: 2dppx) {
-  #cut-button {
-    -moz-image-region: rect(0, 520px, 40px, 480px);
-  }
-}
-
-#edit-controls {
-  -moz-box-align: center;
-}
-
-/* copy button */
-
-#copy-button {
-  -moz-image-region: rect(0, 280px, 20px, 260px);
-}
-
-@media (min-resolution: 2dppx) {
-  #copy-button {
-    -moz-image-region: rect(0, 560px, 40px, 520px);
-  }
-}
-
-/* paste button */
-
-#paste-button {
-  -moz-image-region: rect(0, 300px, 20px, 280px);
-}
-
-@media (min-resolution: 2dppx) {
-  #paste-button {
-    -moz-image-region: rect(0, 600px, 40px, 560px);
-  }
-}
-
-#cut-button {
-  -moz-margin-end: 0;
-}
-
-#paste-button {
-  -moz-border-start: none;
-  -moz-margin-start: 0;
-}
-
-#cut-button:-moz-locale-dir(ltr),
-#paste-button:-moz-locale-dir(rtl) {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-
-#cut-button:-moz-locale-dir(rtl),
-#paste-button:-moz-locale-dir(ltr) {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-
-#copy-button {
-  border-radius: 0;
-  margin-right: 0;
-  margin-left: 0;
-}
-
 /* alltabs button */
 
 #alltabs-button {
diff --git a/browser/themes/osx/customizableui/panelUIOverlay.css b/browser/themes/osx/customizableui/panelUIOverlay.css
index f06e09709aea..0e501186d690 100644
--- a/browser/themes/osx/customizableui/panelUIOverlay.css
+++ b/browser/themes/osx/customizableui/panelUIOverlay.css
@@ -18,7 +18,6 @@
     width: 20px;
   }
 
-  #PanelUI-contents #edit-controls toolbarbutton,
   #PanelUI-contents #zoom-controls toolbarbutton,
   .panel-combined-button {
     list-style-image: url(chrome://browser/skin/customizableui/menuPanel-small-icons@2x.png);
@@ -119,15 +118,15 @@
     -moz-image-region: rect(384px 128px 448px 64px);
   }
 
-  #PanelUI-contents #cut-button {
+  #PanelUI-cut-btn {
     -moz-image-region: rect(0 32px 32px 0);
   }
 
-  #PanelUI-contents #copy-button {
+  #PanelUI-copy-btn {
     -moz-image-region: rect(0 64px 32px 32px);
   }
 
-  #PanelUI-contents #paste-button {
+  #PanelUI-paste-btn {
     -moz-image-region: rect(0 96px 32px 64px);
   }
 
@@ -140,15 +139,15 @@
   }
 }
 
-#PanelUI-contents #edit-controls toolbarbutton:not(:first-child),
+#PanelUI-pageControls toolbarbutton:not(:first-child),
 #PanelUI-contents #zoom-controls toolbarbutton:not(:first-child) {
   -moz-margin-start: 0;
 }
-#PanelUI-contents #edit-controls toolbarbutton:not(:last-child),
+#PanelUI-pageControls toolbarbutton:not(:last-child),
 #PanelUI-contents #zoom-controls toolbarbutton:not(:last-child) {
   -moz-margin-end: 0;
 }
-#PanelUI-contents #edit-controls toolbarbutton:not(:first-child):not(:last-child),
+#PanelUI-pageControls toolbarbutton:not(:first-child):not(:last-child),
 #PanelUI-contents #zoom-controls toolbarbutton:not(:first-child):not(:last-child) {
   margin-left: 0;
   margin-right: 0;
diff --git a/browser/themes/shared/browser.inc b/browser/themes/shared/browser.inc
index 84cf27d5cb6c..93b04a280a30 100644
--- a/browser/themes/shared/browser.inc
+++ b/browser/themes/shared/browser.inc
@@ -1,3 +1,3 @@
 %filter substitution
 
-%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button
+%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index d068cef1f4b5..bb80ddb3f870 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -52,32 +52,29 @@
   font-size: 10px;
 }
 
-#PanelUI-contents #wrapper-edit-controls,
 #PanelUI-contents #wrapper-zoom-controls {
   margin-left: -1em;
   margin-right: -1em;
   width: calc(100% + 2em);
 }
 
-#PanelUI-contents #edit-controls,
-#PanelUI-contents #zoom-controls {
+#PanelUI-contents #zoom-controls,
+#PanelUI-pageControls {
   padding: 1em 0 0;
 }
 
-#PanelUI-contents #edit-controls,
 #PanelUI-contents #zoom-controls {
   -moz-margin-start: -1em;
   -moz-box-align: stretch;
   width: calc(100% + 2em);
 }
 
-#PanelUI-contents #wrapper-edit-controls #edit-controls,
 #PanelUI-contents #wrapper-zoom-controls #zoom-controls {
   -moz-margin-start: 0;
 }
 
 .PanelUI-footer,
-#PanelUI-contents #edit-controls,
+.PanelUI-editControls,
 #PanelUI-contents #zoom-controls,
 #PanelUI-contents,
 .PanelUI-footer,
@@ -112,7 +109,7 @@ panelview:not([mainview]) .toolbarbutton-text,
   display: block;
 }
 
-#PanelUI-contents #edit-controls toolbarbutton > .toolbarbutton-icon,
+#PanelUI-pageControls toolbarbutton > .toolbarbutton-icon,
 #PanelUI-contents #zoom-controls toolbarbutton > .toolbarbutton-icon {
   -moz-margin-end: 0;
 }
@@ -128,14 +125,12 @@ panelview:not([mainview]) .toolbarbutton-text,
   list-style-image: url(chrome://browser/skin/customizableui/menuPanel-icons.png);
 }
 
-#PanelUI-contents #edit-controls toolbarbutton,
-#PanelUI-contents #zoom-controls toolbarbutton {
+#PanelUI-contents #zoom-controls toolbarbutton,
+#PanelUI-pageControls toolbarbutton {
   -moz-box-orient: horizontal;
   min-width: 7em;
 }
 
-#customization-palette #edit-controls toolbarbutton,
-#PanelUI-contents #edit-controls toolbarbutton,
 #customization-palette #zoom-controls toolbarbutton,
 #PanelUI-contents #zoom-controls toolbarbutton {
   max-width: none;
@@ -147,14 +142,12 @@ panelview:not([mainview]) .toolbarbutton-text,
   display: none;
 }
 
-#customization-palette #edit-controls toolbarbutton,
 #customization-palette #zoom-controls toolbarbutton {
   min-width: 1em;
 }
 
 /* These smaller icons have different styling between the panel and the toolbar,
    hence not referencing toolbar.png for these icons. */
-#PanelUI-contents #edit-controls toolbarbutton,
 #PanelUI-contents #zoom-controls toolbarbutton,
 .panel-combined-button {
   list-style-image: url(chrome://browser/skin/customizableui/menuPanel-small-icons.png);
@@ -167,14 +160,13 @@ panelview:not([mainview]) .toolbarbutton-text,
   margin: calc(5em / 12);
 }
 
-#PanelUI-contents #edit-controls toolbarbutton > .toolbarbutton-icon,
 #PanelUI-contents #zoom-controls toolbarbutton > .toolbarbutton-icon {
   min-width: 0;
   min-height: 0;
   margin: 0;
 }
 
-#PanelUI-contents #edit-controls #copy-button,
+.PanelUI-editControls #PanelUI-copy-btn,
 #PanelUI-contents #zoom-controls #zoom-reset-button {
   border-left: none;
   border-right: none;
@@ -228,7 +220,7 @@ panelview toolbarbutton,
 
 panelview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #widget-overflow-list > toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
-#PanelUI-contents #edit-controls toolbarbutton,
+#PanelUI-pageControls toolbarbutton,
 #PanelUI-contents #zoom-controls toolbarbutton,
 .customizationmode-button,
 #PanelUI-mainView #PanelUI-customize-btn {
@@ -380,15 +372,15 @@ toolbarbutton.panel-multiview-anchor {
   -moz-image-region: rect(192px 64px 224px 32px);
 }
 
-#PanelUI-contents #cut-button {
+#PanelUI-cut-btn {
   -moz-image-region: rect(0 16px 16px 0);
 }
 
-#PanelUI-contents #copy-button {
+#PanelUI-copy-btn {
   -moz-image-region: rect(0 32px 16px 16px);
 }
 
-#PanelUI-contents #paste-button {
+#PanelUI-paste-btn {
   -moz-image-region: rect(0 48px 16px 32px);
 }
 
@@ -408,22 +400,17 @@ toolbarbutton.panel-multiview-anchor {
   -moz-margin-end: none;
 }
 
-#PanelUI-contents #paste-button,
 #PanelUI-contents #zoom-in-button {
   -moz-border-start: 1px solid;
   -moz-margin-start: none;
 }
 
-#PanelUI-contents #cut-button:-moz-locale-dir(ltr),
-#PanelUI-contents #paste-button:-moz-locale-dir(rtl),
 #PanelUI-contents #zoom-out-button:-moz-locale-dir(ltr),
 #PanelUI-contents #zoom-in-button:-moz-locale-dir(rtl) {
   border-top-right-radius: 2px;
   border-bottom-right-radius: 2px;
 }
 
-#PanelUI-contents #cut-button:-moz-locale-dir(rtl),
-#PanelUI-contents #paste-button:-moz-locale-dir(ltr),
 #PanelUI-contents #zoom-out-button:-moz-locale-dir(rtl),
 #PanelUI-contents #zoom-in-button:-moz-locale-dir(ltr) {
   border-top-left-radius: 2px;
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 2a341af5d268..17b07223a0b5 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -717,18 +717,6 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   -moz-image-region: rect(0, 198px, 18px, 180px);
 }
 
-#cut-button {
-  -moz-image-region: rect(0, 216px, 18px, 198px);
-}
-
-#copy-button {
-  -moz-image-region: rect(0, 234px, 18px, 216px);
-}
-
-#paste-button {
-  -moz-image-region: rect(0, 252px, 18px, 234px);
-}
-
 #fullscreen-button {
   -moz-image-region: rect(0, 270px, 18px, 252px);
 }
diff --git a/browser/themes/windows/customizableui/panelUIOverlay.css b/browser/themes/windows/customizableui/panelUIOverlay.css
index 01560ef80a36..d8d27762e530 100644
--- a/browser/themes/windows/customizableui/panelUIOverlay.css
+++ b/browser/themes/windows/customizableui/panelUIOverlay.css
@@ -7,17 +7,17 @@
 
 %include ../../shared/customizableui/panelUIOverlay.inc.css
 
-#PanelUI-contents #edit-controls toolbarbutton {
+#PanelUI-pageControls toolbarbutton {
   list-style-image: url("chrome://browser/skin/Toolbar.png");
 }
 
-#PanelUI-contents #cut-button {
+#PanelUI-cut-btn {
   -moz-image-region: rect(0, 216px, 18px, 198px);
 }
-#PanelUI-contents #copy-button {
+#PanelUI-copy-btn {
   -moz-image-region: rect(0, 234px, 18px, 216px);
 }
-#PanelUI-contents #paste-button {
+#PanelUI-paste-btn {
   -moz-image-region: rect(0, 252px, 18px, 234px);
 }
 

From 344e3a19926fc758a4441d839974564268e5cafe Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Mon, 3 Jun 2013 14:21:16 -0400
Subject: [PATCH 191/230] Backed out changeset c986b5090517 due to possibly
 introducing leaks.

---
 browser/base/content/browser.xul              |  12 ++
 .../customizableui/content/panelUI.inc.xul    |  21 ++-
 .../customizableui/content/panelUI.js         |  23 ++-
 .../customizableui/src/CustomizableUI.jsm     | 104 +++++--------
 .../src/CustomizableWidgets.jsm               | 137 ------------------
 .../locales/en-US/chrome/browser/browser.dtd  |   5 +
 browser/themes/linux/browser.css              |   8 +
 .../linux/customizableui/panelUIOverlay.css   |   4 +-
 .../osx/customizableui/panelUIOverlay.css     |  31 ++--
 browser/themes/shared/browser.inc             |   2 +-
 .../customizableui/panelUIOverlay.inc.css     |  94 ++----------
 .../windows/customizableui/panelUIOverlay.css |   6 +-
 12 files changed, 143 insertions(+), 304 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 3c9e5e058ebc..49d1e5501881 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1007,6 +1007,18 @@
                      label="&fullScreenCmd.label;"
                      tooltiptext="&fullScreenButton.tooltip;"/>
 
+      <toolbaritem id="zoom-controls" class="chromeclass-toolbar-additional"
+                   title="&zoomControls.label;">
+        <toolbarbutton id="zoom-out-button" class="toolbarbutton-1"
+                       label="&fullZoomReduceCmd.label;"
+                       command="cmd_fullZoomReduce"
+                       tooltiptext="&zoomOutButton.tooltip;"/>
+        <toolbarbutton id="zoom-in-button" class="toolbarbutton-1"
+                       label="&fullZoomEnlargeCmd.label;"
+                       command="cmd_fullZoomEnlarge"
+                       tooltiptext="&zoomInButton.tooltip;"/>
+      </toolbaritem>
+
       <toolbarbutton id="feed-button"
                      type="menu"
                      class="toolbarbutton-1 chromeclass-toolbar-additional"
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index 671e57ac639c..36b996016cb3 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -6,11 +6,10 @@
        role="group"
        type="arrow"
        level="top"
-       consumeoutsideclicks="true"
-       noautofocus="true">
+       consumeoutsideclicks="true">
   <panelmultiview id="PanelUI-multiView" mainViewId="PanelUI-mainView">
     <panelview id="PanelUI-mainView" flex="1">
-      <vbox id="PanelUI-pageControls" pack="center">
+      <vbox class="PanelUI-pageControls" pack="center">
         <hbox class="PanelUI-editControls">
           <toolbarbutton id="PanelUI-cut-btn" flex="1"
                          label="&cutCmd.label;"
@@ -28,6 +27,22 @@
                          class="panel-combined-button"
                          command="cmd_paste"/>
         </hbox>
+        <hbox class="PanelUI-zoomControls">
+          <toolbarbutton id="PanelUI-zoomOut-btn" flex="1"
+                         noautoclose="true" label="&fullZoomReduceCmd.label;"
+                         command="cmd_fullZoomReduce"
+                         class="panel-combined-button"
+                         tooltiptext="&zoomOutButton.tooltip;"/>
+          <toolbarbutton id="PanelUI-zoomReset-btn" flex="1"
+                         noautoclose="true" command="cmd_fullZoomReset"
+                         class="panel-combined-button"
+                         tooltiptext="&zoomReset.tooltip;"/>
+          <toolbarbutton id="PanelUI-zoomIn-btn" flex="1"
+                         noautoclose="true" label="&fullZoomEnlargeCmd.label;"
+                         command="cmd_fullZoomEnlarge"
+                         class="panel-combined-button"
+                         tooltiptext="&zoomInButton.tooltip;"/>
+        </hbox>
       </vbox>
 
       <vbox id="PanelUI-contents" type="grid"/>
diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
index 6feee58def75..11206a88150b 100644
--- a/browser/components/customizableui/content/panelUI.js
+++ b/browser/components/customizableui/content/panelUI.js
@@ -22,7 +22,8 @@ const PanelUI = {
       multiView: "PanelUI-multiView",
       helpView: "PanelUI-help",
       menuButton: "PanelUI-menu-button",
-      panel: "PanelUI-popup"
+      panel: "PanelUI-popup",
+      zoomResetButton: "PanelUI-zoomReset-btn"
     };
   },
 
@@ -41,6 +42,12 @@ const PanelUI = {
       this.panel.addEventListener(event, this);
     }
 
+    // Register ourselves with the service so we know when the zoom prefs change.
+    Services.obs.addObserver(this, "browser-fullZoom:zoomChange", false);
+    Services.obs.addObserver(this, "browser-fullZoom:zoomReset", false);
+
+    this._updateZoomResetButton();
+
     this.helpView.addEventListener("ViewShowing", this._onHelpViewShow, false);
     this.helpView.addEventListener("ViewHiding", this._onHelpViewHide, false);
   },
@@ -51,6 +58,8 @@ const PanelUI = {
     }
     this.helpView.removeEventListener("ViewShowing", this._onHelpViewShow);
     this.helpView.removeEventListener("ViewHiding", this._onHelpViewHide);
+    Services.obs.removeObserver(this, "browser-fullZoom:zoomChange");
+    Services.obs.removeObserver(this, "browser-fullZoom:zoomReset");
   },
 
   /**
@@ -109,6 +118,13 @@ const PanelUI = {
     }
   },
 
+  /**
+   * nsIObserver implementation, responding to zoom pref changes
+   */
+  observe: function (aSubject, aTopic, aData) {
+    this._updateZoomResetButton();
+  },
+
   /**
    * Registering the menu panel is done lazily for performance reasons. This
    * method is exposed so that CustomizationMode can force registration in the
@@ -197,6 +213,11 @@ const PanelUI = {
                            this.panel.state == "showing";
   },
 
+  _updateZoomResetButton: function() {
+    this.zoomResetButton.setAttribute("label", gNavigatorBundle
+      .getFormattedString("zoomReset.label", [Math.floor(ZoomManager.zoom * 100)]));
+  },
+
   _onWidgetPanelCommand: function(aEvent) {
     if (!aEvent.originalTarget.hasAttribute("noautoclose")) {
       aEvent.currentTarget.hidePopup();
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 0a550666a84d..55c11533524f 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -62,7 +62,7 @@ let gFuturePlacements = new Map();
 
 //XXXunf Temporary. Need a nice way to abstract functions to build widgets
 //       of these types.
-let gSupportedWidgetTypes = new Set(["button", "view", "custom"]);
+let gSupportedWidgetTypes = new Set(["button", "view"]);
 
 /**
  * gSeenWidgets remembers which widgets the user has seen for the first time
@@ -76,7 +76,6 @@ let gSavedState = null;
 let gRestoring = false;
 let gDirty = false;
 let gInBatch = false;
-let gResetting = false;
 
 /**
  * gBuildAreas maps area IDs to actual area nodes within browser windows.
@@ -118,7 +117,6 @@ let CustomizableUIInternal = {
       anchor: "PanelUI-menu-button",
       type: CustomizableUI.TYPE_MENU_PANEL,
       defaultPlacements: [
-        "zoom-controls",
         "new-window-button",
         "privatebrowsing-button",
         "save-page-button",
@@ -325,8 +323,6 @@ let CustomizableUIInternal = {
       }
       this.insertWidgetBefore(node, currentNode, container, aArea);
       this._addParentFlex(node);
-      if (gResetting)
-        this.notifyListeners("onWidgetReset", id);
     }
 
     if (currentNode) {
@@ -712,66 +708,52 @@ let CustomizableUIInternal = {
       throw new Error("buildWidget was passed a non-widget to build.");
     }
 
-    LOG("Building " + aWidget.id + " of type " + aWidget.type);
+    LOG("Building " + aWidget.id);
 
-    let node;
-    if (aWidget.type == "custom") {
-      if (aWidget.onBuild) {
-        try {
-          node = aWidget.onBuild(aDocument);
-        } catch (ex) {
-          ERROR("Custom widget with id " + aWidget.id + " threw an error: " + ex.message);
-        }
-      }
-      if (!node || !(node instanceof aDocument.defaultView.XULElement))
-        ERROR("Custom widget with id " + aWidget.id + " does not return a valid node");
+    let node = aDocument.createElementNS(kNSXUL, "toolbarbutton");
+
+    node.setAttribute("id", aWidget.id);
+    node.setAttribute("widget-id", aWidget.id);
+    node.setAttribute("widget-type", aWidget.type);
+    if (aWidget.disabled) {
+      node.setAttribute("disabled", true);
     }
-    else {
-      node = aDocument.createElementNS(kNSXUL, "toolbarbutton");
+    node.setAttribute("removable", aWidget.removable);
+    node.setAttribute("label", aWidget.name);
+    node.setAttribute("tooltiptext", aWidget.description);
+    //XXXunf Need to hook this up to a <key> element or something.
+    if (aWidget.shortcut) {
+      node.setAttribute("acceltext", aWidget.shortcut);
+    }
+    node.setAttribute("class", "toolbarbutton-1 chromeclass-toolbar-additional");
 
-      node.setAttribute("id", aWidget.id);
-      node.setAttribute("widget-id", aWidget.id);
-      node.setAttribute("widget-type", aWidget.type);
-      if (aWidget.disabled) {
-        node.setAttribute("disabled", true);
+    let handler = this.handleWidgetClick.bind(this, aWidget, node);
+    node.addEventListener("command", handler, false);
+
+    // If the widget has a view, and has view showing / hiding listeners,
+    // hook those up to this widget.
+    if (aWidget.type == "view" &&
+        (aWidget.onViewShowing || aWidget.onViewHiding)) {
+      LOG("Widget " + aWidget.id + " has a view with showing and hiding events. Auto-registering event handlers.");
+      let viewNode = aDocument.getElementById(aWidget.viewId);
+
+      if (!viewNode) {
+        ERROR("Could not find the view node with id: " + aWidget.viewId);
+        throw new Error("Could not find the view node with id: " + aWidget.viewId);
       }
-      node.setAttribute("removable", aWidget.removable);
-      node.setAttribute("label", aWidget.name);
-      node.setAttribute("tooltiptext", aWidget.description);
-      //XXXunf Need to hook this up to a <key> element or something.
-      if (aWidget.shortcut) {
-        node.setAttribute("acceltext", aWidget.shortcut);
-      }
-      node.setAttribute("class", "toolbarbutton-1 chromeclass-toolbar-additional");
 
-      let handler = this.handleWidgetClick.bind(this, aWidget, node);
-      node.addEventListener("command", handler, false);
+      // PanelUI relies on the .PanelUI-subView class to be able to show only
+      // one sub-view at a time.
+      viewNode.classList.add("PanelUI-subView");
 
-      // If the widget has a view, and has view showing / hiding listeners,
-      // hook those up to this widget.
-      if (aWidget.type == "view" &&
-          (aWidget.onViewShowing || aWidget.onViewHiding)) {
-        LOG("Widget " + aWidget.id + " has a view with showing and hiding events. Auto-registering event handlers.");
-        let viewNode = aDocument.getElementById(aWidget.viewId);
-
-        if (!viewNode) {
-          ERROR("Could not find the view node with id: " + aWidget.viewId);
-          throw new Error("Could not find the view node with id: " + aWidget.viewId);
+      for (let eventName of kSubviewEvents) {
+        let handler = "on" + eventName;
+        if (typeof aWidget[handler] == "function") {
+          viewNode.addEventListener(eventName, aWidget[handler], false);
         }
-
-        // 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") {
-            viewNode.addEventListener(eventName, aWidget[handler], false);
-          }
-        }
-
-        LOG("Widget " + aWidget.id + " showing and hiding event handlers set.");
       }
+
+      LOG("Widget " + aWidget.id + " showing and hiding event handlers set.");
     }
 
     aWidget.instances.set(aDocument, node);
@@ -1135,7 +1117,7 @@ let CustomizableUIInternal = {
           listener[aEvent].apply(listener, aArgs);
         }
       } catch (e) {
-        Cu.reportError(e + " -- " + (e.fileName ? e.fileName + ":" + e.lineNumber : ""));
+        Cu.reportError(e + " -- " + e.fileName + ":" + e.lineNumber);
       }
     }
   },
@@ -1329,10 +1311,6 @@ let CustomizableUIInternal = {
       widget.onViewHiding = typeof aData.onViewHiding == "function" ? 
                                  aData.onViewHiding :
                                  null;
-    } else if (widget.type == "custom") {
-      widget.onBuild = typeof aData.onBuild == "function" ?
-                                 aData.onBuild :
-                                 null;
     }
 
     if (gPalette.has(widget.id)) {
@@ -1488,7 +1466,6 @@ let CustomizableUIInternal = {
   },
 
   reset: function() {
-    gResetting = true;
     Services.prefs.clearUserPref(kPrefCustomizationState);
     LOG("State reset");
 
@@ -1509,7 +1486,6 @@ let CustomizableUIInternal = {
         this.buildArea(areaId, placements, areaNode);
       }
     }
-    gResetting = false;
   },
 
   _addParentFlex: function(aElement) {
diff --git a/browser/components/customizableui/src/CustomizableWidgets.jsm b/browser/components/customizableui/src/CustomizableWidgets.jsm
index f66d4b70ebbd..a8c27906cb91 100644
--- a/browser/components/customizableui/src/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/src/CustomizableWidgets.jsm
@@ -28,18 +28,6 @@ function LOG(aMsg) {
 }
 function ERROR(aMsg) Cu.reportError("[CustomizableWidgets] " + aMsg);
 
-
-function setAttributes(aNode, aAttrs) {
-  for (let [name, value] of Iterator(aAttrs)) {
-    if (!value) {
-      if (aNode.hasAttribute(name))
-        aNode.removeAttribute(name);
-    } else {
-      aNode.setAttribute(name, value);
-    }
-  }
-}
-
 const CustomizableWidgets = [{
     id: "history-panelmenu",
     type: "view",
@@ -258,129 +246,4 @@ const CustomizableWidgets = [{
         win.openPreferences();
       }
     }
-  }, {
-    id: "zoom-controls",
-    name: "Zoom Controls",
-    type: "custom",
-    removable: true,
-    defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
-    onBuild: function(aDocument) {
-      let inPanel = (this.currentArea == CustomizableUI.AREA_PANEL);
-      let noautoclose = inPanel ? "true" : null;
-      let flex = inPanel ? "1" : null;
-      let cls = inPanel ? "panel-combined-button" : "toolbarbutton-1";
-      let buttons = [{
-        id: "zoom-out-button",
-        noautoclose: noautoclose,
-        command: "cmd_fullZoomReduce",
-        flex: flex,
-        class: cls,
-        label: "Zoom out",
-        tooltiptext: "Zoom out"
-      }, {
-        id: "zoom-reset-button",
-        noautoclose: noautoclose,
-        command: "cmd_fullZoomReset",
-        flex: flex,
-        class: cls,
-        tooltiptext: "Reset Zoom"
-      }, {
-        id: "zoom-in-button",
-        noautoclose: noautoclose,
-        command: "cmd_fullZoomEnlarge",
-        flex: flex,
-        class: cls,
-        label: "Zoom in",
-        tooltiptext: "Zoom in"
-      }];
-
-      let node = aDocument.createElementNS(kNSXUL, "toolbaritem");
-      node.setAttribute("id", "zoom-controls");
-      node.setAttribute("title", "Zoom Controls");
-      if (inPanel)
-        node.setAttribute("flex", "1");
-      node.classList.add("chromeclass-toolbar-additional");
-
-      buttons.forEach(function(aButton) {
-        let btnNode = aDocument.createElementNS(kNSXUL, "toolbarbutton");
-        setAttributes(btnNode, aButton);
-        node.appendChild(btnNode);
-      });
-
-      // The middle node is the 'Reset Zoom' button.
-      let zoomResetButton = node.childNodes[1];
-      let window = aDocument.defaultView;
-      function updateZoomResetButton() {
-        zoomResetButton.setAttribute("label", window.gNavigatorBundle
-          .getFormattedString("zoomReset.label", [Math.floor(window.ZoomManager.zoom * 100)]));
-      };
-
-      // Register ourselves with the service so we know when the zoom prefs change.
-      Services.obs.addObserver(updateZoomResetButton, "browser-fullZoom:zoomChange", false);
-      Services.obs.addObserver(updateZoomResetButton, "browser-fullZoom:zoomReset", false);
-
-      updateZoomResetButton();
-      if (!inPanel)
-        zoomResetButton.setAttribute("hidden", "true");
-
-      function updateWidgetStyle(aInPanel) {
-        let attrs = {
-          noautoclose: aInPanel ? "true" : null,
-          flex: aInPanel ? "1" : null,
-          class: aInPanel ? "panel-combined-button" : "toolbarbutton-1"
-        };
-        for (let i = 0, l = node.childNodes.length; i < l; ++i) {
-          setAttributes(node.childNodes[i], attrs);
-        }
-        zoomResetButton.setAttribute("hidden", aInPanel ? "false" : "true");
-        if (aInPanel)
-          node.setAttribute("flex", "1");
-        else if (node.hasAttribute("flex"))
-          node.removeAttribute("flex");
-      }
-
-      let listener = {
-        onWidgetAdded: function(aWidgetId, aArea, aPosition) {
-          if (aWidgetId != this.id)
-            return;
-
-          updateWidgetStyle(aArea == CustomizableUI.AREA_PANEL);
-        }.bind(this),
-
-        onWidgetRemoved: function(aWidgetId, aPrevArea) {
-          if (aWidgetId != this.id)
-            return;
-
-          // When a widget is demoted to the palette ('removed'), it's visual
-          // style should change.
-          updateWidgetStyle(false);
-          zoomResetButton.setAttribute("hidden", "true");
-        }.bind(this),
-
-        onWidgetReset: function(aWidgetId) {
-          if (aWidgetId != this.id)
-            return;
-          updateWidgetStyle(this.currentArea == CustomizableUI.AREA_PANEL);
-        }.bind(this),
-
-        onWidgetMoved: function(aWidgetId, aArea) {
-          if (aWidgetId != this.id)
-            return;
-          updateWidgetStyle(aArea == CustomizableUI.AREA_PANEL);
-        }.bind(this),
-
-        onWidgetDestroyed: function(aWidgetId) {
-          if (aWidgetId != this.id)
-            return;
-
-          CustomizableUI.removeListener(listener);
-          Services.obs.removeObserver(updateZoomResetButton, "browser-fullZoom:zoomChange");
-          Services.obs.removeObserver(updateZoomResetButton, "browser-fullZoom:zoomReset");
-        }.bind(this)
-      };
-      CustomizableUI.addListener(listener);
-
-      return node;
-    }
   }];
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 50e1690bb8cb..3ee00426af17 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -532,6 +532,11 @@ you can use these alternative items. Otherwise, their values should be empty.  -
 
 <!ENTITY fullScreenButton.tooltip       "Display the window in full screen">
 
+<!ENTITY zoomOutButton.tooltip          "Zoom out">
+<!ENTITY zoomInButton.tooltip           "Zoom in">
+<!ENTITY zoomControls.label             "Zoom Controls">
+<!ENTITY zoomReset.tooltip              "Reset Zoom">
+
 <!ENTITY quitApplicationCmdWin.label       "Exit"> 
 <!ENTITY quitApplicationCmdWin.accesskey   "x">
 <!ENTITY goBackCmd.commandKey "[">
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 0db9e4e68a02..f29d017a4229 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -683,6 +683,14 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   -moz-image-region: rect(0px 120px 24px 96px);
 }
 
+/* These buttons are going to be removed in later bugs, but until then
+ * we're overriding the menuPanel-icons sprites with these ones with
+ * !important.
+ *
+ * Here are the relevant removal bugs:
+ * #zoom-out-button, #zoom-in-button - Bug 870897
+ */
+
 #zoom-out-button {
   list-style-image: url("moz-icon://stock/gtk-zoom-out?size=toolbar") !important;
 }
diff --git a/browser/themes/linux/customizableui/panelUIOverlay.css b/browser/themes/linux/customizableui/panelUIOverlay.css
index 60acde9fd093..4c0ba6516319 100644
--- a/browser/themes/linux/customizableui/panelUIOverlay.css
+++ b/browser/themes/linux/customizableui/panelUIOverlay.css
@@ -28,13 +28,13 @@
   list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar&state=disabled");
 }
 
-#PanelUI-contents #zoom-out-button {
+#PanelUI-zoomOut-btn {
   list-style-image: url("moz-icon://stock/gtk-zoom-out?size=toolbar");
   padding-left: 12px;
   padding-right: 12px;
 }
 
-#PanelUI-contents #zoom-in-button {
+#PanelUI-zoomIn-btn {
   list-style-image: url("moz-icon://stock/gtk-zoom-in?size=toolbar");
   padding-left: 12px;
   padding-right: 12px;
diff --git a/browser/themes/osx/customizableui/panelUIOverlay.css b/browser/themes/osx/customizableui/panelUIOverlay.css
index 0e501186d690..ad050b8c7ef0 100644
--- a/browser/themes/osx/customizableui/panelUIOverlay.css
+++ b/browser/themes/osx/customizableui/panelUIOverlay.css
@@ -18,7 +18,6 @@
     width: 20px;
   }
 
-  #PanelUI-contents #zoom-controls toolbarbutton,
   .panel-combined-button {
     list-style-image: url(chrome://browser/skin/customizableui/menuPanel-small-icons@2x.png);
   }
@@ -130,37 +129,41 @@
     -moz-image-region: rect(0 96px 32px 64px);
   }
 
-  #PanelUI-contents #zoom-out-button {
+  #PanelUI-zoomOut-btn {
     -moz-image-region: rect(0 128px 32px 96px);
   }
 
-  #PanelUI-contents #zoom-in-button {
+  #PanelUI-zoomIn-btn {
     -moz-image-region: rect(0 160px 32px 128px);
   }
 }
 
-#PanelUI-pageControls toolbarbutton:not(:first-child),
-#PanelUI-contents #zoom-controls toolbarbutton:not(:first-child) {
+.PanelUI-pageControls toolbarbutton:not(:first-child) {
   -moz-margin-start: 0;
 }
-#PanelUI-pageControls toolbarbutton:not(:last-child),
-#PanelUI-contents #zoom-controls toolbarbutton:not(:last-child) {
+.PanelUI-pageControls toolbarbutton:not(:last-child) {
   -moz-margin-end: 0;
 }
-#PanelUI-pageControls toolbarbutton:not(:first-child):not(:last-child),
-#PanelUI-contents #zoom-controls toolbarbutton:not(:first-child):not(:last-child) {
+.PanelUI-pageControls toolbarbutton:not(:first-child):not(:last-child) {
   margin-left: 0;
   margin-right: 0;
 }
 
-#PanelUI-contents #zoom-in-button,
-#PanelUI-contents #zoom-out-button {
+#PanelUI-zoomIn-btn,
+#PanelUI-zoomOut-btn {
   padding-left: 12px;
   padding-right: 12px;
 }
 
-#PanelUI-contents #zoom-in-button .toolbarbutton-text,
-#PanelUI-contents #zoom-out-button .toolbarbutton-text,
-#PanelUI-contents #zoom-reset-button .toolbarbutton-icon {
+.PanelUI-editControls #PanelUI-copy-btn,
+.PanelUI-zoomControls #PanelUI-zoomReset-btn {
+  border-left: none;
+  border-right: none;
+  border-radius: 0;
+}
+
+#PanelUI-zoomIn-btn .toolbarbutton-text,
+#PanelUI-zoomOut-btn .toolbarbutton-text,
+#PanelUI-zoomReset-btn .toolbarbutton-icon {
   display: none;
 }
diff --git a/browser/themes/shared/browser.inc b/browser/themes/shared/browser.inc
index 93b04a280a30..017d06ff1624 100644
--- a/browser/themes/shared/browser.inc
+++ b/browser/themes/shared/browser.inc
@@ -1,3 +1,3 @@
 %filter substitution
 
-%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button
+%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #zoom-out-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index bb80ddb3f870..8154440c4456 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -52,30 +52,13 @@
   font-size: 10px;
 }
 
-#PanelUI-contents #wrapper-zoom-controls {
-  margin-left: -1em;
-  margin-right: -1em;
-  width: calc(100% + 2em);
-}
-
-#PanelUI-contents #zoom-controls,
-#PanelUI-pageControls {
+.PanelUI-pageControls {
   padding: 1em 0 0;
 }
 
-#PanelUI-contents #zoom-controls {
-  -moz-margin-start: -1em;
-  -moz-box-align: stretch;
-  width: calc(100% + 2em);
-}
-
-#PanelUI-contents #wrapper-zoom-controls #zoom-controls {
-  -moz-margin-start: 0;
-}
-
 .PanelUI-footer,
 .PanelUI-editControls,
-#PanelUI-contents #zoom-controls,
+.PanelUI-zoomControls,
 #PanelUI-contents,
 .PanelUI-footer,
 .panel-mainview:not([panelid="PanelUI-popup"]) {
@@ -109,8 +92,11 @@ panelview:not([mainview]) .toolbarbutton-text,
   display: block;
 }
 
-#PanelUI-pageControls toolbarbutton > .toolbarbutton-icon,
-#PanelUI-contents #zoom-controls toolbarbutton > .toolbarbutton-icon {
+.PanelUI-pageControls toolbarbutton {
+  min-width: 7em;
+}
+
+.PanelUI-pageControls toolbarbutton > .toolbarbutton-icon {
   -moz-margin-end: 0;
 }
 
@@ -125,30 +111,8 @@ panelview:not([mainview]) .toolbarbutton-text,
   list-style-image: url(chrome://browser/skin/customizableui/menuPanel-icons.png);
 }
 
-#PanelUI-contents #zoom-controls toolbarbutton,
-#PanelUI-pageControls toolbarbutton {
-  -moz-box-orient: horizontal;
-  min-width: 7em;
-}
-
-#customization-palette #zoom-controls toolbarbutton,
-#PanelUI-contents #zoom-controls toolbarbutton {
-  max-width: none;
-  max-height: none;
-  height: auto;
-}
-
-#customization-palette #zoom-reset-button {
-  display: none;
-}
-
-#customization-palette #zoom-controls toolbarbutton {
-  min-width: 1em;
-}
-
 /* These smaller icons have different styling between the panel and the toolbar,
    hence not referencing toolbar.png for these icons. */
-#PanelUI-contents #zoom-controls toolbarbutton,
 .panel-combined-button {
   list-style-image: url(chrome://browser/skin/customizableui/menuPanel-small-icons.png);
 }
@@ -160,22 +124,16 @@ panelview:not([mainview]) .toolbarbutton-text,
   margin: calc(5em / 12);
 }
 
-#PanelUI-contents #zoom-controls toolbarbutton > .toolbarbutton-icon {
-  min-width: 0;
-  min-height: 0;
-  margin: 0;
-}
-
 .PanelUI-editControls #PanelUI-copy-btn,
-#PanelUI-contents #zoom-controls #zoom-reset-button {
+.PanelUI-zoomControls #PanelUI-zoomReset-btn {
   border-left: none;
   border-right: none;
   border-radius: 0;
 }
 
-#PanelUI-contents #zoom-in-button .toolbarbutton-text,
-#PanelUI-contents #zoom-out-button .toolbarbutton-text,
-#PanelUI-contents #zoom-reset-button .toolbarbutton-icon {
+#PanelUI-zoomIn-btn .toolbarbutton-text,
+#PanelUI-zoomOut-btn .toolbarbutton-text,
+#PanelUI-zoomReset-btn .toolbarbutton-icon {
   display: none;
 }
 
@@ -220,8 +178,7 @@ panelview toolbarbutton,
 
 panelview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #widget-overflow-list > toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
-#PanelUI-pageControls toolbarbutton,
-#PanelUI-contents #zoom-controls toolbarbutton,
+#PanelUI-mainView .PanelUI-pageControls toolbarbutton,
 .customizationmode-button,
 #PanelUI-mainView #PanelUI-customize-btn {
   background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
@@ -384,39 +341,18 @@ toolbarbutton.panel-multiview-anchor {
   -moz-image-region: rect(0 48px 16px 32px);
 }
 
-#PanelUI-contents #zoom-out-button {
+#PanelUI-zoomOut-btn {
   -moz-image-region: rect(0 64px 16px 48px);
 }
 
-#PanelUI-contents #zoom-reset-button {
+#PanelUI-zoomReset-btn {
   list-style-image: none;
 }
 
-#PanelUI-contents #zoom-in-button {
+#PanelUI-zoomIn-btn {
   -moz-image-region: rect(0 80px 16px 64px);
 }
 
-#PanelUI-contents #zoom-out-button {
-  -moz-margin-end: none;
-}
-
-#PanelUI-contents #zoom-in-button {
-  -moz-border-start: 1px solid;
-  -moz-margin-start: none;
-}
-
-#PanelUI-contents #zoom-out-button:-moz-locale-dir(ltr),
-#PanelUI-contents #zoom-in-button:-moz-locale-dir(rtl) {
-  border-top-right-radius: 2px;
-  border-bottom-right-radius: 2px;
-}
-
-#PanelUI-contents #zoom-out-button:-moz-locale-dir(rtl),
-#PanelUI-contents #zoom-in-button:-moz-locale-dir(ltr) {
-  border-top-left-radius: 2px;
-  border-bottom-left-radius: 2px;
-}
-
 /* These icons are missing from Toolbar.png, so this is a temporary
    hack until they are added. */
 toolbar > .customization-target > #find-button,
diff --git a/browser/themes/windows/customizableui/panelUIOverlay.css b/browser/themes/windows/customizableui/panelUIOverlay.css
index d8d27762e530..990029662e64 100644
--- a/browser/themes/windows/customizableui/panelUIOverlay.css
+++ b/browser/themes/windows/customizableui/panelUIOverlay.css
@@ -7,7 +7,7 @@
 
 %include ../../shared/customizableui/panelUIOverlay.inc.css
 
-#PanelUI-pageControls toolbarbutton {
+.PanelUI-pageControls toolbarbutton {
   list-style-image: url("chrome://browser/skin/Toolbar.png");
 }
 
@@ -21,12 +21,12 @@
   -moz-image-region: rect(0, 252px, 18px, 234px);
 }
 
-#PanelUI-contents #zoom-out-btn {
+#PanelUI-zoomOut-btn {
   -moz-image-region: rect(0, 288px, 18px, 270px);
   padding-left: 12px;
   padding-right: 12px;
 }
-#PanelUI-contents #zoom-in-btn {
+#PanelUI-zoomIn-btn {
   -moz-image-region: rect(0, 306px, 18px, 288px);
   padding-left: 12px;
   padding-right: 12px;

From 5ef7980af78a3ae795da4f5d36435be27397a2fb Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Mon, 3 Jun 2013 22:12:00 +0200
Subject: [PATCH 192/230] Bug 877178 - Tests for unregisterArea, r=jaws

--HG--
extra : rebase_source : a7ff14159918566306be0097ee0694941d07e30a
---
 .../customizableui/test/Makefile.in           |  1 +
 .../test/browser_877178_unregisterArea.js     | 64 +++++++++++++++++++
 .../components/customizableui/test/head.js    | 16 +++--
 3 files changed, 77 insertions(+), 4 deletions(-)
 create mode 100644 browser/components/customizableui/test/browser_877178_unregisterArea.js

diff --git a/browser/components/customizableui/test/Makefile.in b/browser/components/customizableui/test/Makefile.in
index 40f2a0dff198..7a6a814e03b9 100644
--- a/browser/components/customizableui/test/Makefile.in
+++ b/browser/components/customizableui/test/Makefile.in
@@ -12,6 +12,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MOCHITEST_BROWSER_FILES = \
   browser_873501_handle_specials.js \
+  browser_877178_unregisterArea.js \
   head.js \
   $(NULL)
 
diff --git a/browser/components/customizableui/test/browser_877178_unregisterArea.js b/browser/components/customizableui/test/browser_877178_unregisterArea.js
new file mode 100644
index 000000000000..ddaa7cd1aa53
--- /dev/null
+++ b/browser/components/customizableui/test/browser_877178_unregisterArea.js
@@ -0,0 +1,64 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+let gTests = [
+  {
+    desc: "Sanity checks",
+    run: function() {
+      SimpleTest.doesThrow(function() CustomizableUI.registerArea("@foo"),
+                           "Registering areas with an invalid ID should throw.");
+
+      SimpleTest.doesThrow(function() CustomizableUI.registerArea([]),
+                           "Registering areas with an invalid ID should throw.");
+
+      SimpleTest.doesThrow(function() CustomizableUI.registerArea(CustomizableUI.AREA_NAVBAR),
+                           "Registering an area with an ID that's already registered should throw.");
+
+      SimpleTest.doesThrow(function() CustomizableUI.unregisterArea("@foo"),
+                           "Unregistering areas with an invalid ID should throw.");
+
+      SimpleTest.doesThrow(function() CustomizableUI.unregisterArea([]),
+                           "Unregistering areas with an invalid ID should throw.");
+
+      SimpleTest.doesThrow(function() CustomizableUI.unregisterArea("unknown"),
+                           "Unregistering an area that's not registered should throw.");
+    }
+  },
+  {
+    desc: "Check areas are loaded with their default placements.",
+    run: function() {
+      ok(CustomizableUI.inDefaultState, "Everything should be in its default state.");
+    }
+  },
+  {
+    desc: "Check registering and unregistering a new area.",
+    run: function() {
+      const kToolbarId = "test-registration-toolbar";
+      const kButtonId = "test-registration-button";
+      createDummyXULButton(kButtonId);
+      createToolbarWithPlacements(kToolbarId, ["spring", kButtonId, "spring"]);
+      assertAreaPlacements(kToolbarId,
+                           [/customizableui-special-spring\d+/,
+                            kButtonId,
+                            /customizableui-special-spring\d+/]);
+      ok(CustomizableUI.inDefaultState, "With a new toolbar and default placements, " +
+                                        "everything should still be in a default state.");
+      removeCustomToolbars(); // Will call unregisterArea for us
+      ok(CustomizableUI.inDefaultState, "When the toolbar is unregistered, " +
+                                        "everything should still be in a default state.");
+    }
+  }
+];
+
+function cleanup() {
+  removeCustomToolbars();
+  resetCustomization();
+}
+
+function test() {
+  waitForExplicitFinish();
+  registerCleanupFunction(cleanup);
+  runTests(gTests);
+}
+
diff --git a/browser/components/customizableui/test/head.js b/browser/components/customizableui/test/head.js
index e163039aeb12..e55e558e2370 100644
--- a/browser/components/customizableui/test/head.js
+++ b/browser/components/customizableui/test/head.js
@@ -11,22 +11,30 @@ let {Task, CustomizableUI} = tmp;
 
 const kNSXUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
+function createDummyXULButton(id, label) {
+  let btn = document.createElementNS(kNSXUL, "toolbarbutton");
+  btn.id = id;
+  btn.setAttribute("label", label || id);
+  btn.className = "toolbarbutton-1 chromeclass-toolbar-additional";
+  window.gNavToolbox.palette.appendChild(btn);
+  return btn;
+}
+
 function createToolbarWithPlacements(id, placements) {
   let tb = document.createElementNS(kNSXUL, "toolbar");
   tb.id = id;
   tb.setAttribute("customizable", "true");
   document.getElementById("customToolbars").appendChild(tb);
   CustomizableUI.registerArea(id, {
-    type: CustomizableUI.TYPE_TOOLBAR
+    type: CustomizableUI.TYPE_TOOLBAR,
+    defaultPlacements: placements
   });
-  for (let p of placements) {
-    CustomizableUI.addWidgetToArea(p, id);
-  }
 }
 
 function removeCustomToolbars() {
   let customToolbarSet = document.getElementById("customToolbars");
   while (customToolbarSet.lastChild) {
+    CustomizableUI.unregisterArea(customToolbarSet.lastChild.id);
     customToolbarSet.lastChild.remove();
   }
 }

From c422ca9fe6c8311188c24488037343d3370f55c9 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Mon, 3 Jun 2013 22:12:06 +0200
Subject: [PATCH 193/230] Bug 877178 - Respect skipintoolbarset for existing
 items, r=jaws

--HG--
extra : rebase_source : 9a2c24cafa8c07b9010d9debc31e0ddcbbd2fc78
---
 browser/base/content/browser.xul                         | 2 +-
 browser/components/customizableui/src/CustomizableUI.jsm | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 49d1e5501881..02318befd753 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -732,7 +732,7 @@
                        oncommand="PanelUI.toggle(event);"/>
       </toolbaritem>
 
-      <hbox id="window-controls" hidden="true" pack="end">
+      <hbox id="window-controls" hidden="true" pack="end" skipintoolbarset="true">
         <toolbarbutton id="minimize-button"
                        tooltiptext="&fullScreenMinimize.tooltip;"
                        oncommand="window.minimize();"/>
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 55c11533524f..60b50d1f2fc4 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -137,14 +137,12 @@ let CustomizableUIInternal = {
         "urlbar-container",
         "reload-button",
         "stop-button",
-        "urlbar-search-splitter",
         "search-container",
         "webrtc-status-button",
         "bookmarks-menu-button",
         "downloads-button",
         "home-button",
         "social-share-button",
-        "social-toolbar-item",
       ]
     });
     this.registerArea(CustomizableUI.AREA_MENUBAR, {
@@ -345,7 +343,7 @@ let CustomizableUIInternal = {
             } else {
               container.removeChild(node);
             }
-          } else {
+          } else if (node.getAttribute("skipintoolbarset") != "true") {
             this.setLocationAttributes(currentNode, container, aArea);
             node.setAttribute("removable", false);
             LOG("Adding non-removable widget to placements of " + aArea + ": " +

From e57cfffcb32239fd6b99d0f4df762f6786d454bb Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Mon, 3 Jun 2013 22:13:34 +0200
Subject: [PATCH 194/230] Bug 878452 - dragging an item to an empty area should
 work, r=jaws

--HG--
extra : rebase_source : 5fe4a87f7660c8b9071eacb051fc1004aac1c6b2
---
 .../customizableui/src/CustomizeMode.jsm      |  3 +
 .../customizableui/test/Makefile.in           |  1 +
 .../test/browser_878452_drag_to_panel.js      | 81 +++++++++++++++++++
 .../components/customizableui/test/head.js    | 43 +++++++++-
 4 files changed, 126 insertions(+), 2 deletions(-)
 create mode 100644 browser/components/customizableui/test/browser_878452_drag_to_panel.js

diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index dca9a5346818..62fa0b2854ac 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -771,6 +771,9 @@ CustomizeMode.prototype = {
   },
 
   _setDragActive: function(aItem, aValue, aWidth, aAtEnd) {
+    if (!aItem) {
+      return;
+    }
     let node = aItem;
     let window = aItem.ownerDocument.defaultView;
     let direction = window.getComputedStyle(aItem, null).direction;
diff --git a/browser/components/customizableui/test/Makefile.in b/browser/components/customizableui/test/Makefile.in
index 7a6a814e03b9..fe74e7d83c29 100644
--- a/browser/components/customizableui/test/Makefile.in
+++ b/browser/components/customizableui/test/Makefile.in
@@ -13,6 +13,7 @@ include $(DEPTH)/config/autoconf.mk
 MOCHITEST_BROWSER_FILES = \
   browser_873501_handle_specials.js \
   browser_877178_unregisterArea.js \
+  browser_878452_drag_to_panel.js \
   head.js \
   $(NULL)
 
diff --git a/browser/components/customizableui/test/browser_878452_drag_to_panel.js b/browser/components/customizableui/test/browser_878452_drag_to_panel.js
new file mode 100644
index 000000000000..7150a2dc43c4
--- /dev/null
+++ b/browser/components/customizableui/test/browser_878452_drag_to_panel.js
@@ -0,0 +1,81 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+let gTests = [
+  {
+    desc: "Dragging an item from the palette to another button in the panel should work.",
+    setup: startCustomizing,
+    run: function() {
+      let btn = document.getElementById("developer-button");
+      let panel = document.getElementById(CustomizableUI.AREA_PANEL);
+      let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
+
+      let lastButtonIndex = placements.length - 1;
+      let lastButton = placements[lastButtonIndex];
+      let placementsAfterInsert = placements.slice(0, lastButtonIndex).concat(["developer-button", lastButton]);
+      let lastButtonNode = document.getElementById(lastButton);
+      simulateItemDrag(btn, lastButtonNode);
+      assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterInsert);
+      ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
+      let palette = document.getElementById("customization-palette");
+      simulateItemDrag(btn, palette);
+      ok(CustomizableUI.inDefaultState, "Should be in default state again.");
+    },
+    teardown: endCustomizing
+  },
+  {
+    desc: "Dragging an item from the palette to the panel itself should also work.",
+    setup: startCustomizing,
+    run: function() {
+      let btn = document.getElementById("developer-button");
+      let panel = document.getElementById(CustomizableUI.AREA_PANEL);
+      let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
+
+      let placementsAfterAppend = placements.concat(["developer-button"]);
+      simulateItemDrag(btn, panel);
+      assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
+      ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
+      let palette = document.getElementById("customization-palette");
+      simulateItemDrag(btn, palette);
+      ok(CustomizableUI.inDefaultState, "Should be in default state again.");
+    },
+    teardown: endCustomizing
+  },
+  {
+    desc: "Dragging an item from the palette to an empty panel should also work.",
+    setup: function() {
+      let widgetIds = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
+      while (widgetIds.length) {
+        CustomizableUI.removeWidgetFromArea(widgetIds.shift());
+      }
+      return startCustomizing()
+    },
+    run: function() {
+      let btn = document.getElementById("developer-button");
+      let panel = document.getElementById(CustomizableUI.AREA_PANEL);
+
+      assertAreaPlacements(panel.id, []);
+
+      let placementsAfterAppend = ["developer-button"];
+      simulateItemDrag(btn, panel);
+      assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
+      ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
+      let palette = document.getElementById("customization-palette");
+      simulateItemDrag(btn, palette);
+      assertAreaPlacements(panel.id, []);
+    },
+    teardown: endCustomizing
+  }
+];
+
+function cleanup() {
+  resetCustomization();
+}
+
+function test() {
+  waitForExplicitFinish();
+  registerCleanupFunction(cleanup);
+  runTests(gTests);
+}
+
diff --git a/browser/components/customizableui/test/head.js b/browser/components/customizableui/test/head.js
index e55e558e2370..4047c2f2b1e5 100644
--- a/browser/components/customizableui/test/head.js
+++ b/browser/components/customizableui/test/head.js
@@ -5,9 +5,16 @@
 
 // Avoid leaks by using tmp for imports...
 let tmp = {};
+Cu.import("resource://gre/modules/commonjs/sdk/core/promise.js", tmp);
 Cu.import("resource://gre/modules/Task.jsm", tmp);
 Cu.import("resource:///modules/CustomizableUI.jsm", tmp);
-let {Task, CustomizableUI} = tmp;
+let {Promise, Task, CustomizableUI} = tmp;
+
+let ChromeUtils = {};
+let scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader);
+scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", ChromeUtils);
+
+let {synthesizeDragStart, synthesizeDrop} = ChromeUtils;
 
 const kNSXUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
@@ -41,12 +48,15 @@ function removeCustomToolbars() {
 
 function resetCustomization() {
   CustomizableUI.reset();
+  if (document.documentElement.hasAttribute("customizing")) {
+    window.gCustomizeMode.exit();
+  }
 }
 
 function assertAreaPlacements(areaId, expectedPlacements) {
   let actualPlacements = getAreaWidgetIds(areaId);
   is(actualPlacements.length, expectedPlacements.length,
-     "Area " + areaId + " should have the right number of items.");
+     "Area " + areaId + " should have " + expectedPlacements.length + " items.");
   let minItems = Math.min(expectedPlacements.length, actualPlacements.length);
   for (let i = 0; i < minItems; i++) {
     if (typeof expectedPlacements[i] == "string") {
@@ -68,6 +78,35 @@ function getAreaWidgetIds(areaId) {
   return widgetAry.map(x => x.id);
 }
 
+function simulateItemDrag(toDrag, target) {
+  let docId = toDrag.ownerDocument.documentElement.id;
+  let dragData = [[{type: 'text/toolbarwrapper-id/' + docId,
+                    data: {id: toDrag.id, width: toDrag.getBoundingClientRect().width + 'px'}}]];
+  synthesizeDragStart(toDrag.parentNode, dragData);
+  synthesizeDrop(target, target, dragData);
+}
+
+function endCustomizing() {
+  let deferred = Promise.defer();
+  function onCustomizationEnds(ev) {
+    window.gNavToolbox.removeEventListener("aftercustomization", onCustomizationEnds);
+    deferred.resolve(ev);
+  }
+  window.gNavToolbox.addEventListener("aftercustomization", onCustomizationEnds);
+  window.gCustomizeMode.exit();
+  return deferred.promise;
+}
+function startCustomizing() {
+  let deferred = Promise.defer();
+  function onCustomizing() {
+    window.gNavToolbox.removeEventListener("customizationready", onCustomizing);
+    deferred.resolve();
+  }
+  window.gNavToolbox.addEventListener("customizationready", onCustomizing);
+  window.gCustomizeMode.enter();
+  return deferred.promise;
+}
+
 function testRunner(testAry) {
   for (let test of testAry) {
     info(test.desc);

From 0e7fa90a2e44d71623d9e7d132eff0e705167aeb Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 23 May 2013 16:33:47 +0200
Subject: [PATCH 195/230] Bug 870849 - Gap between the tab-strip and top of
 titlebar is too large when in restored mode, r=dao

--HG--
extra : rebase_source : c3721bdeb5c02360587e284ffa496a1ab637d09f
---
 browser/themes/windows/browser.css | 14 +++++++-------
 toolkit/content/xul.css            |  9 +++++++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 17b07223a0b5..89e07776eb81 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -26,15 +26,15 @@
   -moz-box-flex: 1; /* make menu items expand to fill toolbar height */
 }
 
-#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"][inactive="true"]:not([customizing="true"]) {
-  visibility: hidden;
+/* We want a 4px gap between the TabsToolbar and the toolbar-menubar when the
+   toolbar-menu is displayed, and a 16px gap when it is not. 1px is taken care
+   of by the (light) outer shadow of the tab, the remaining 3/15 are these margins. */
+#toolbar-menubar:not([inactive]) {
+  margin-bottom: 3px;
 }
 
-#main-window[sizemode="normal"] #toolbar-menubar,
-/* We want a 4px gap between the TabsToolbar and the toolbar-menubar when the
-   toolbar-menu is displayed in either restored or maximized mode. */
-#main-window:not([sizemode="fullscreen"]) #toolbar-menubar:-moz-any(:not([autohide="true"]), :not([inactive="true"])) {
-  margin-bottom: 4px;
+#main-window[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] {
+  margin-bottom: 15px;
 }
 
 #toolbar-menubar:not([autohide="true"]) {
diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css
index d88875d1ca77..6201a7c06060 100644
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -272,15 +272,20 @@ toolbar[customizing="true"][hidden="true"] {
 
 %ifdef XP_MACOSX
 toolbar[type="menubar"] {
-  visibility: collapse;
+  min-height: 0 !important;
+  border: 0 !important;
 }
 %else
 toolbar[type="menubar"][autohide="true"] {
   -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-menubar-autohide");
+  overflow: hidden;
 }
 
 toolbar[type="menubar"][autohide="true"][inactive="true"]:not([customizing="true"]) {
-  visibility: collapse;
+  min-height: 0 !important;
+  height: 0 !important;
+  -moz-appearance: none !important;
+  border-style: none !important;
 }
 %endif
 

From 4da58797572715fb4d5ef267ee97fb0c34f06d2c Mon Sep 17 00:00:00 2001
From: Brandon Cheng <bcheng.gt@gmail.com>
Date: Mon, 3 Jun 2013 17:37:55 -0400
Subject: [PATCH 196/230] Bug 873662 - Australis causes back button to have an
 incorrect gradient/clip-path on OSX. r=jaws.

---
 browser/base/content/browser.xul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 02318befd753..a06fba32099f 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1185,7 +1185,7 @@
       <svg:path d="M 0,0 C 0.15,0.12 0.25,0.3 0.25,0.5 0.25,0.7 0.15,0.88 0,1 L 1,1 1,0 0,0 z"/>
     </svg:clipPath>
     <svg:clipPath id="osx-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
-      <svg:path d="m 0,-5 0,4.03 C 3.6,1.8 6,6.1 6,11 6,16 3.6,20 0,23 l 0,27 10000,0 0,-55 L 0,-5 z"/>
+      <svg:path d="m 0,-5 0,9.03 C 3.6,6.8 6,11.1 6,16 6,21 3.6,25 0,28 l 0,27 10000,0 0,-55 L 0,-5 z"/>
     </svg:clipPath>
 #endif
   </svg:svg>

From a806fe5e3eafc70e9d3541aee84cc0a1a9fe0889 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Fri, 31 May 2013 05:05:14 -0700
Subject: [PATCH 197/230] Bug 877368 - App tabs are missing separators when
 there is tab overflow. r=dao

---
 browser/themes/shared/tabs.inc.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
index 5c655719435a..7098395d0e87 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -228,9 +228,10 @@
 
 /* Pinned tabs */
 
-/* pinned tabs need position: fixed for separator when overflowing */
+/* Pinned tab separators need position: absolute when positioned (during overflow). */
 #tabbrowser-tabs[positionpinnedtabs] > .tabbrowser-tab[pinned]::before {
-  position: fixed;
+  height: 100%;
+  position: absolute;
 }
 
 .tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) > .tab-stack > .tab-content {

From 93f5e0bc3a2e273688713ef049ff71c5d3e4e5fa Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Thu, 30 May 2013 23:24:31 -0700
Subject: [PATCH 198/230] Bug 875894 - Increase the size of the new tab
 button's clip-path to prevent clipping the image's stroke. r=Gijs
 ui-r=shorlander

---
 browser/base/content/browser.xul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index a06fba32099f..1cafea5acced 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1169,7 +1169,7 @@
       <svg:path d="m 0,0.0625 -0.05,0 0,0.938 1,0 0,-0.028 C 0.67917542,0.95840561 0.56569036,0.81970962 0.51599998,0.5625 0.48279998,0.3905 0.465,0.0659 0,0.0625 z"/>
     </svg:clipPath>
     <svg:clipPath id="tab-clip-path-outer" clipPathUnits="objectBoundingBox">
-      <svg:path d="m 0.2197,0 0,0.4264 c -0.0156,0.1238 -0.0201,0.2548 -0.0492,0.3730 C 0.1464,0.9030 0.0889,0.9397 0.0379,0.9355 L 0,1 1,1 0.9621,0.9355 c -0.0511,0.0042 -0.1085,-0.0322 -0.1326,-0.1361 -0.0292,-0.1152 -0.0334,-0.2486 -0.0492,-0.3730 L 0.7803,0 z"/>
+      <svg:path d="m 0.1894,0 0,0.4194 C 0.1742,0.5484 0.1667,0.6774 0.1364,0.7903 0.1123,0.8935 0,0.9032 0,0.9032 l 0,0.0968 1,0 0,-0.0968 c 0,0 -0.1121,0 -0.1364,-0.1129 C 0.8333,0.6774 0.8258,0.5452 0.8106,0.4194 l 0,-0.4194 z"/>
     </svg:clipPath>
 
 #ifndef XP_UNIX

From ef644200b586a0d54b0fc80814e746aab956e635 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Mon, 3 Jun 2013 18:35:30 -0400
Subject: [PATCH 199/230] Bug 877370 - Show blank targets in the menu panel
 while in customization mode. r=mconley

--HG--
extra : rebase_source : 1d3848444476e46bc38baae91bd22367f4102d40
---
 .../customizableui/src/CustomizeMode.jsm      | 95 ++++++++++++++-----
 .../customizableui/customizeMode.inc.css      | 23 +++--
 .../customizableui/panelUIOverlay.inc.css     |  3 +-
 3 files changed, 88 insertions(+), 33 deletions(-)

diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index 62fa0b2854ac..29d2de4dad33 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -12,6 +12,7 @@ const kPrefCustomizationDebug = "browser.uiCustomization.debug";
 const kPaletteId = "customization-palette";
 const kAboutURI = "about:customizing";
 const kDragDataTypePrefix = "text/toolbarwrapper-id/";
+const kPlaceholderClass = "panel-customization-placeholder";
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource:///modules/CustomizableUI.jsm");
@@ -56,6 +57,10 @@ CustomizeMode.prototype = {
     return this.document.getElementById("customization-reset-button");
   },
 
+  get panelUIContents() {
+    return this.document.getElementById("PanelUI-contents");
+  },
+
   init: function() {
     // There are two palettes - there's the palette that can be overlayed with
     // toolbar items in browser.xul. This is invisible, and never seen by the
@@ -122,6 +127,7 @@ CustomizeMode.prototype = {
     // while customizing.
     let panelHolder = document.getElementById("customization-panelHolder");
     panelHolder.appendChild(window.PanelUI.mainView);
+    this._showPanelCustomizationPlaceholders();
 
     let self = this;
     deck.addEventListener("transitionend", function customizeTransitionEnd() {
@@ -161,6 +167,7 @@ CustomizeMode.prototype = {
     this.window.PanelUI.menuButton.removeEventListener("click", this, false);
     this.window.PanelUI.menuButton.disabled = false;
 
+    this._removePanelCustomizationPlaceholders();
     this.depopulatePalette();
 
     this.visiblePalette.removeEventListener("dragstart", this, true);
@@ -456,6 +463,7 @@ CustomizeMode.prototype = {
   },
 
   reset: function() {
+    this._removePanelCustomizationPlaceholders();
     this.depopulatePalette();
     this._unwrapToolbarItems();
 
@@ -475,6 +483,7 @@ CustomizeMode.prototype = {
     }
 
     this.resetButton.hidden = CustomizableUI.inDefaultState;
+    this._showPanelCustomizationPlaceholders();
   },
 
   onWidgetMoved: function(aWidgetId, aArea, aOldPosition, aNewPosition) {
@@ -547,7 +556,8 @@ CustomizeMode.prototype = {
     __dumpDragData(aEvent);
     let item = aEvent.target;
     while (item && item.localName != "toolbarpaletteitem") {
-      if (item.localName == "toolbar") {
+      if (item.localName == "toolbar" ||
+          item.classList.contains(kPlaceholderClass)) {
         return;
       }
       item = item.parentNode;
@@ -565,6 +575,14 @@ CustomizeMode.prototype = {
 
     dt.mozSetDataAt(kDragDataTypePrefix + documentId, data, 0);
     dt.effectAllowed = "move";
+
+    // Hack needed so that the dragimage will still show the
+    // item as it appeared before it was hidden.
+    let win = aEvent.target.ownerDocument.defaultView;
+    win.setTimeout(function() {
+      item.hidden = true;
+      this._showPanelCustomizationPlaceholders();
+    }.bind(this), 0);
   },
 
   _onDragOver: function(aEvent) {
@@ -587,7 +605,7 @@ CustomizeMode.prototype = {
       return;
     }
 
-    // Do nothing if thw widget is not allowed to be removed.
+    // Do nothing if the widget is not allowed to be removed.
     if (targetArea.id == kPaletteId &&
        !CustomizableUI.isWidgetRemovable(draggedItemId)) {
       return;
@@ -618,15 +636,10 @@ CustomizeMode.prototype = {
       this._setDragActive(this._dragOverItem, false);
     }
 
-    // XXXjaws Only handling the toolbar case first.
-    if (targetArea.localName == "toolbar") {
-      let draggedItem = document.getElementById(draggedItemId);
-      if (getPlaceForItem(draggedItem) == "toolbar") {
-        draggedItem.hidden = true;
-      }
+    if (dragOverItem != this._dragOverItem) {
       this._setDragActive(dragOverItem, true, draggedItemWidth, atEnd);
+      this._dragOverItem = dragOverItem;
     }
-    this._dragOverItem = dragOverItem;
 
     aEvent.preventDefault();
     aEvent.stopPropagation();
@@ -636,6 +649,7 @@ CustomizeMode.prototype = {
     __dumpDragData(aEvent);
 
     this._setDragActive(this._dragOverItem, false);
+    this._removePanelCustomizationPlaceholders();
 
     let document = aEvent.target.ownerDocument;
     let documentId = document.documentElement.id;
@@ -643,10 +657,7 @@ CustomizeMode.prototype = {
       aEvent.dataTransfer.mozGetDataAt(kDragDataTypePrefix + documentId, 0);
     let draggedWrapper = document.getElementById("wrapper-" + draggedItemId);
 
-    let draggedItem = document.getElementById(draggedItemId);
-    if (getPlaceForItem(draggedItem) == "toolbar") {
-      draggedItem.hidden = false;
-    }
+    draggedWrapper.hidden = false;
     draggedWrapper.removeAttribute("mousedown");
 
     let targetArea = this._getCustomizableParent(aEvent.currentTarget);
@@ -684,6 +695,7 @@ CustomizeMode.prototype = {
       } else {
         this.visiblePalette.insertBefore(draggedWrapper, targetNode);
       }
+      this._showPanelCustomizationPlaceholders();
       return;
     }
 
@@ -697,22 +709,25 @@ CustomizeMode.prototype = {
       let widget = this.unwrapToolbarItem(draggedWrapper);
       CustomizableUI.addWidgetToArea(draggedItemId, targetArea.id);
       this.wrapToolbarItem(widget, getPlaceForItem(targetNode));
+      this._showPanelCustomizationPlaceholders();
       return;
     }
 
     // We need to determine the place that the widget is being dropped in
     // the target.
-    let targetNodeId = (targetNode.nodeName == "toolbarpaletteitem") ?
-                          targetNode.firstChild && targetNode.firstChild.id :
-                          targetNode.id;
-
-    let placement = CustomizableUI.getPlacementOfWidget(targetNodeId);
-    if (!placement) {
-      ERROR("Could not get a position for " + targetNodeId);
-      return;
+    let placement;
+    if (!targetNode.classList.contains(kPlaceholderClass)) {
+      let targetNodeId = (targetNode.nodeName == "toolbarpaletteitem") ?
+                            targetNode.firstChild && targetNode.firstChild.id :
+                            targetNode.id;
+      placement = CustomizableUI.getPlacementOfWidget(targetNodeId);
     }
+    if (!placement) {
+      LOG("Could not get a position for " + targetNode + "#" + targetNode.id + "." + targetNode.className);
+    }
+    let position = placement ? placement.position :
+                               targetArea.childElementCount;
 
-    let position = placement.position;
 
     // Is the target area the same as the origin? Since we've already handled
     // the possibility that the target is the customization palette, we know
@@ -727,6 +742,7 @@ CustomizeMode.prototype = {
       CustomizableUI.moveWidgetWithinArea(draggedItemId, position);
       this.wrapToolbarItem(targetWidget, properPlace);
       this.wrapToolbarItem(widget, properPlace);
+      this._showPanelCustomizationPlaceholders();
       return;
     }
 
@@ -740,6 +756,7 @@ CustomizeMode.prototype = {
     CustomizableUI.addWidgetToArea(draggedItemId, targetArea.id, position);
     this.wrapToolbarItem(targetWidget, properPlace);
     draggedWrapper = this.wrapToolbarItem(widget, properPlace);
+    this._showPanelCustomizationPlaceholders();
   },
 
   _onDragExit: function(aEvent) {
@@ -761,13 +778,11 @@ CustomizeMode.prototype = {
 
     let {id: draggedItemId} =
       aEvent.dataTransfer.mozGetDataAt(kDragDataTypePrefix + documentId, 0);
-    let draggedItem = document.getElementById(draggedItemId);
-    if (getPlaceForItem(draggedItem) == "toolbar") {
-      draggedItem.hidden = false;
-    }
 
     let draggedWrapper = document.getElementById("wrapper-" + draggedItemId);
+    draggedWrapper.hidden = false;
     draggedWrapper.removeAttribute("mousedown");
+    this._showPanelCustomizationPlaceholders();
   },
 
   _setDragActive: function(aItem, aValue, aWidth, aAtEnd) {
@@ -886,6 +901,34 @@ CustomizeMode.prototype = {
                this._customizing) {
       this.exit();
     }
+  },
+
+  _showPanelCustomizationPlaceholders: function() {
+    const kColumns = 3;
+    this._removePanelCustomizationPlaceholders();
+    let doc = this.document;
+    let contents = this.panelUIContents;
+    let visibleChildren = contents.querySelectorAll("toolbarpaletteitem:not([hidden])");
+    let hangingItems = visibleChildren.length % kColumns;
+    let newPlaceholders = kColumns - hangingItems;
+    while (newPlaceholders--) {
+      let placeholder = doc.createElement("toolbarpaletteitem");
+      placeholder.classList.add(kPlaceholderClass);
+      //XXXjaws The toolbarbutton child here is only necessary to get
+      //  the styling right here.
+      let placeholderChild = doc.createElement("toolbarbutton");
+      placeholderChild.classList.add(kPlaceholderClass + "-child");
+      placeholder.appendChild(placeholderChild);
+      contents.appendChild(placeholder);
+    }
+  },
+
+  _removePanelCustomizationPlaceholders: function() {
+    let contents = this.panelUIContents;
+    let oldPlaceholders = contents.getElementsByClassName(kPlaceholderClass);
+    while (oldPlaceholders.length) {
+      contents.removeChild(oldPlaceholders[0]);
+    }
   }
 };
 
diff --git a/browser/themes/shared/customizableui/customizeMode.inc.css b/browser/themes/shared/customizableui/customizeMode.inc.css
index 7eea0918b834..050f55c913d7 100644
--- a/browser/themes/shared/customizableui/customizeMode.inc.css
+++ b/browser/themes/shared/customizableui/customizeMode.inc.css
@@ -10,15 +10,27 @@
   transition-timing-function: ease-out;
 }
 
-#main-window[customizing] .customization-target,
-#main-window[customizing] #customization-panelHolder > #PanelUI-mainView {
-  border: 1px dashed transparent;
+#main-window[customizing] .customization-target {
   margin: 3px;
 }
 
+#main-window[customizing] .customization-target,
+#main-window[customizing] #customization-panelHolder > #PanelUI-mainView > #PanelUI-contents > .panel-customization-placeholder {
+  outline: 1px dashed transparent;
+}
+
 #main-window[customizing-movingItem] .customization-target,
-#main-window[customizing-movingItem] #customization-panelHolder > #PanelUI-mainView {
-  border-color: #bbb;
+#main-window[customizing-movingItem] #customization-panelHolder > #PanelUI-mainView > #PanelUI-contents > .panel-customization-placeholder {
+  outline-color: #bbb;
+}
+
+#PanelUI-contents > .panel-customization-placeholder {
+  cursor: auto;
+  outline-offset: -5px;
+}
+
+#PanelUI-contents > .panel-customization-placeholder > .panel-customization-placeholder-child {
+  list-style-image: none;
 }
 
 #main-window[customizing] .customization-target {
@@ -62,7 +74,6 @@
 }
 
 toolbarpaletteitem {
-  cursor: -moz-grab;
   transition: transform, background-color, border-color, box-shadow, border-width;
   transition-duration: 50ms, 10ms, 10ms, 10ms, 250ms;
   transition-timing-function: ease-in-out, linear, linear, linear, ease-in-out;
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index 8154440c4456..67d508c3ec00 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -101,7 +101,8 @@ panelview:not([mainview]) .toolbarbutton-text,
 }
 
 #PanelUI-contents[type="grid"] toolbarbutton,
-#customization-palette toolbarbutton {
+#customization-palette toolbarbutton,
+.panel-customization-placeholder {
   -moz-appearance: none;
   -moz-box-orient: vertical;
   min-width: 7em;

From aafe68cacee7478c617a9841b18a27b1ae0d8bde Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Tue, 4 Jun 2013 00:02:30 -0400
Subject: [PATCH 200/230] Bug 878300 - Switch CustomizeMode.jsm and
 CustomizableUI.jsm to use Console.jsm. r=Unfocused

---
 .../customizableui/src/CustomizableUI.jsm     | 28 ++++++-------------
 .../src/CustomizableWidgets.jsm               | 15 ++--------
 .../customizableui/src/CustomizeMode.jsm      | 15 ++--------
 .../components/customizableui/src/Makefile.in |  2 +-
 .../components/customizableui/src/logging.js  | 25 +++++++++++++++++
 5 files changed, 41 insertions(+), 44 deletions(-)
 create mode 100644 browser/components/customizableui/src/logging.js

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 60b50d1f2fc4..0ec74952f993 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -92,18 +92,8 @@ let gNewElementCount = 0;
 let gWrapperCache = new WeakMap();
 let gListeners = new Set();
 
-let gDebug = false;
-try {
-  gDebug = Services.prefs.getBoolPref(kPrefCustomizationDebug);
-} catch (e) {}
-
-function LOG(aMsg) {
-  if (gDebug) {
-    Services.console.logStringMessage("[CustomizableUI] " + aMsg);
-  }
-}
-function ERROR(aMsg) Cu.reportError("[CustomizableUI] " + aMsg);
-
+let gModuleName = "[CustomizableUI]";
+#include logging.js
 
 let CustomizableUIInternal = {
   initialize: function() {
@@ -449,8 +439,8 @@ let CustomizableUIInternal = {
 
     let placements = gPlacements.get(aArea);
     if (!placements) {
-      Cu.reportError("Could not find any placements for " + aArea +
-                     " when adding a widget.");
+      ERROR("Could not find any placements for " + aArea +
+            " when adding a widget.");
       return;
     }
 
@@ -508,8 +498,8 @@ let CustomizableUIInternal = {
 
     let placements = gPlacements.get(aArea);
     if (!placements) {
-      Cu.reportError("Could not find any placements for " + aArea +
-                     " when moving a widget.");
+      ERROR("Could not find any placements for " + aArea +
+            " when moving a widget.");
       return;
     }
 
@@ -768,7 +758,7 @@ let CustomizableUIInternal = {
         try {
           aWidget.onCommand.call(null, aEvent);
         } catch (e) {
-          Cu.reportError(e);
+          ERROR(e);
         }
       } else {
         //XXXunf Need to think this through more, and formalize.
@@ -1115,7 +1105,7 @@ let CustomizableUIInternal = {
           listener[aEvent].apply(listener, aArgs);
         }
       } catch (e) {
-        Cu.reportError(e + " -- " + e.fileName + ":" + e.lineNumber);
+        ERROR(e + " -- " + e.fileName + ":" + e.lineNumber);
       }
     }
   },
@@ -1376,7 +1366,7 @@ let CustomizableUIInternal = {
       }
     }
     catch (e) {
-      Cu.reportError(e);
+      ERROR(e);
       return;
     }
     data = JSON.parse(data);
diff --git a/browser/components/customizableui/src/CustomizableWidgets.jsm b/browser/components/customizableui/src/CustomizableWidgets.jsm
index a8c27906cb91..96e771ac55dc 100644
--- a/browser/components/customizableui/src/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/src/CustomizableWidgets.jsm
@@ -16,17 +16,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
 const kNSXUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 const kPrefCustomizationDebug = "browser.uiCustomization.debug";
 
-let gDebug = false;
-try {
-  gDebug = Services.prefs.getBoolPref(kPrefCustomizationDebug);
-} catch (e) {}
-
-function LOG(aMsg) {
-  if (gDebug) {
-    Services.console.logStringMessage("[CustomizableWidgets] " + aMsg);
-  }
-}
-function ERROR(aMsg) Cu.reportError("[CustomizableWidgets] " + aMsg);
+let gModuleName = "[CustomizableWidgets]";
+#include logging.js
 
 const CustomizableWidgets = [{
     id: "history-panelmenu",
@@ -84,7 +75,7 @@ const CustomizableWidgets = [{
                 item.setAttribute("image", "moz-anno:favicon:" + icon);
               fragment.appendChild(item);
             } catch (e) {
-              Cu.reportError("Error while showing history subview: " + e);
+              ERROR("Error while showing history subview: " + e);
             }
           }
           items.appendChild(fragment);
diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index 29d2de4dad33..5f32571c4a7c 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -16,19 +16,10 @@ const kPlaceholderClass = "panel-customization-placeholder";
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource:///modules/CustomizableUI.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
-let gDebug = false;
-try {
-  gDebug = Services.prefs.getBoolPref(kPrefCustomizationDebug);
-} catch (e) {}
-
-function LOG(str) {
-  if (gDebug) {
-    Services.console.logStringMessage("[CustomizeMode] " + str);
-  }
-}
-
-function ERROR(aMsg) Cu.reportError("[CustomizeMode] " + aMsg);
+let gModuleName = "[CustomizeMode]";
+#include logging.js
 
 function CustomizeMode(aWindow) {
   this.window = aWindow;
diff --git a/browser/components/customizableui/src/Makefile.in b/browser/components/customizableui/src/Makefile.in
index e64f9890b563..c32a33530fb0 100644
--- a/browser/components/customizableui/src/Makefile.in
+++ b/browser/components/customizableui/src/Makefile.in
@@ -9,7 +9,7 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_JS_MODULES = \
+EXTRA_PP_JS_MODULES = \
   CustomizableUI.jsm \
   CustomizableWidgets.jsm \
   CustomizeMode.jsm \
diff --git a/browser/components/customizableui/src/logging.js b/browser/components/customizableui/src/logging.js
new file mode 100644
index 000000000000..6998dc04e82d
--- /dev/null
+++ b/browser/components/customizableui/src/logging.js
@@ -0,0 +1,25 @@
+#if 0
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#endif
+
+XPCOMUtils.defineLazyModuleGetter(this, "console",
+  "resource://gre/modules/devtools/Console.jsm");
+
+let gDebug = false;
+try {
+  gDebug = Services.prefs.getBoolPref(kPrefCustomizationDebug);
+} catch (e) {}
+
+function LOG(...args) {
+  if (gDebug) {
+    args.unshift(gModuleName);
+    console.log.apply(console, args);
+  }
+}
+
+function ERROR(...args) {
+  args.unshift(gModuleName);
+  console.error.apply(console, args);
+}

From c118ab4499f15f2d078a4d0a85ab1f62d3c2b972 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Tue, 4 Jun 2013 09:18:33 +0200
Subject: [PATCH 201/230] Back out e878799f7d5a for browser-chrome bustage.

---
 .../customizableui/src/CustomizeMode.jsm      |  3 -
 .../customizableui/test/Makefile.in           |  1 -
 .../test/browser_878452_drag_to_panel.js      | 81 -------------------
 .../components/customizableui/test/head.js    | 43 +---------
 4 files changed, 2 insertions(+), 126 deletions(-)
 delete mode 100644 browser/components/customizableui/test/browser_878452_drag_to_panel.js

diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index 5f32571c4a7c..c705eba6b4cf 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -777,9 +777,6 @@ CustomizeMode.prototype = {
   },
 
   _setDragActive: function(aItem, aValue, aWidth, aAtEnd) {
-    if (!aItem) {
-      return;
-    }
     let node = aItem;
     let window = aItem.ownerDocument.defaultView;
     let direction = window.getComputedStyle(aItem, null).direction;
diff --git a/browser/components/customizableui/test/Makefile.in b/browser/components/customizableui/test/Makefile.in
index fe74e7d83c29..7a6a814e03b9 100644
--- a/browser/components/customizableui/test/Makefile.in
+++ b/browser/components/customizableui/test/Makefile.in
@@ -13,7 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 MOCHITEST_BROWSER_FILES = \
   browser_873501_handle_specials.js \
   browser_877178_unregisterArea.js \
-  browser_878452_drag_to_panel.js \
   head.js \
   $(NULL)
 
diff --git a/browser/components/customizableui/test/browser_878452_drag_to_panel.js b/browser/components/customizableui/test/browser_878452_drag_to_panel.js
deleted file mode 100644
index 7150a2dc43c4..000000000000
--- a/browser/components/customizableui/test/browser_878452_drag_to_panel.js
+++ /dev/null
@@ -1,81 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-let gTests = [
-  {
-    desc: "Dragging an item from the palette to another button in the panel should work.",
-    setup: startCustomizing,
-    run: function() {
-      let btn = document.getElementById("developer-button");
-      let panel = document.getElementById(CustomizableUI.AREA_PANEL);
-      let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
-
-      let lastButtonIndex = placements.length - 1;
-      let lastButton = placements[lastButtonIndex];
-      let placementsAfterInsert = placements.slice(0, lastButtonIndex).concat(["developer-button", lastButton]);
-      let lastButtonNode = document.getElementById(lastButton);
-      simulateItemDrag(btn, lastButtonNode);
-      assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterInsert);
-      ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
-      let palette = document.getElementById("customization-palette");
-      simulateItemDrag(btn, palette);
-      ok(CustomizableUI.inDefaultState, "Should be in default state again.");
-    },
-    teardown: endCustomizing
-  },
-  {
-    desc: "Dragging an item from the palette to the panel itself should also work.",
-    setup: startCustomizing,
-    run: function() {
-      let btn = document.getElementById("developer-button");
-      let panel = document.getElementById(CustomizableUI.AREA_PANEL);
-      let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
-
-      let placementsAfterAppend = placements.concat(["developer-button"]);
-      simulateItemDrag(btn, panel);
-      assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
-      ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
-      let palette = document.getElementById("customization-palette");
-      simulateItemDrag(btn, palette);
-      ok(CustomizableUI.inDefaultState, "Should be in default state again.");
-    },
-    teardown: endCustomizing
-  },
-  {
-    desc: "Dragging an item from the palette to an empty panel should also work.",
-    setup: function() {
-      let widgetIds = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
-      while (widgetIds.length) {
-        CustomizableUI.removeWidgetFromArea(widgetIds.shift());
-      }
-      return startCustomizing()
-    },
-    run: function() {
-      let btn = document.getElementById("developer-button");
-      let panel = document.getElementById(CustomizableUI.AREA_PANEL);
-
-      assertAreaPlacements(panel.id, []);
-
-      let placementsAfterAppend = ["developer-button"];
-      simulateItemDrag(btn, panel);
-      assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
-      ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
-      let palette = document.getElementById("customization-palette");
-      simulateItemDrag(btn, palette);
-      assertAreaPlacements(panel.id, []);
-    },
-    teardown: endCustomizing
-  }
-];
-
-function cleanup() {
-  resetCustomization();
-}
-
-function test() {
-  waitForExplicitFinish();
-  registerCleanupFunction(cleanup);
-  runTests(gTests);
-}
-
diff --git a/browser/components/customizableui/test/head.js b/browser/components/customizableui/test/head.js
index 4047c2f2b1e5..e55e558e2370 100644
--- a/browser/components/customizableui/test/head.js
+++ b/browser/components/customizableui/test/head.js
@@ -5,16 +5,9 @@
 
 // Avoid leaks by using tmp for imports...
 let tmp = {};
-Cu.import("resource://gre/modules/commonjs/sdk/core/promise.js", tmp);
 Cu.import("resource://gre/modules/Task.jsm", tmp);
 Cu.import("resource:///modules/CustomizableUI.jsm", tmp);
-let {Promise, Task, CustomizableUI} = tmp;
-
-let ChromeUtils = {};
-let scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader);
-scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", ChromeUtils);
-
-let {synthesizeDragStart, synthesizeDrop} = ChromeUtils;
+let {Task, CustomizableUI} = tmp;
 
 const kNSXUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
@@ -48,15 +41,12 @@ function removeCustomToolbars() {
 
 function resetCustomization() {
   CustomizableUI.reset();
-  if (document.documentElement.hasAttribute("customizing")) {
-    window.gCustomizeMode.exit();
-  }
 }
 
 function assertAreaPlacements(areaId, expectedPlacements) {
   let actualPlacements = getAreaWidgetIds(areaId);
   is(actualPlacements.length, expectedPlacements.length,
-     "Area " + areaId + " should have " + expectedPlacements.length + " items.");
+     "Area " + areaId + " should have the right number of items.");
   let minItems = Math.min(expectedPlacements.length, actualPlacements.length);
   for (let i = 0; i < minItems; i++) {
     if (typeof expectedPlacements[i] == "string") {
@@ -78,35 +68,6 @@ function getAreaWidgetIds(areaId) {
   return widgetAry.map(x => x.id);
 }
 
-function simulateItemDrag(toDrag, target) {
-  let docId = toDrag.ownerDocument.documentElement.id;
-  let dragData = [[{type: 'text/toolbarwrapper-id/' + docId,
-                    data: {id: toDrag.id, width: toDrag.getBoundingClientRect().width + 'px'}}]];
-  synthesizeDragStart(toDrag.parentNode, dragData);
-  synthesizeDrop(target, target, dragData);
-}
-
-function endCustomizing() {
-  let deferred = Promise.defer();
-  function onCustomizationEnds(ev) {
-    window.gNavToolbox.removeEventListener("aftercustomization", onCustomizationEnds);
-    deferred.resolve(ev);
-  }
-  window.gNavToolbox.addEventListener("aftercustomization", onCustomizationEnds);
-  window.gCustomizeMode.exit();
-  return deferred.promise;
-}
-function startCustomizing() {
-  let deferred = Promise.defer();
-  function onCustomizing() {
-    window.gNavToolbox.removeEventListener("customizationready", onCustomizing);
-    deferred.resolve();
-  }
-  window.gNavToolbox.addEventListener("customizationready", onCustomizing);
-  window.gCustomizeMode.enter();
-  return deferred.promise;
-}
-
 function testRunner(testAry) {
   for (let test of testAry) {
     info(test.desc);

From db328224b3f568989c0ad4151c6b210316250a31 Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Tue, 4 Jun 2013 12:33:11 +0200
Subject: [PATCH 202/230] Bug 870897: make the zoom controls customizable.
 r=mconley, sr=Unfocused

---
 browser/base/content/browser.xul              |  12 --
 .../customizableui/content/panelUI.inc.xul    |  21 +--
 .../customizableui/content/panelUI.js         |  23 +--
 .../customizableui/src/CustomizableUI.jsm     | 114 +++++++++------
 .../src/CustomizableWidgets.jsm               | 136 ++++++++++++++++++
 .../locales/en-US/chrome/browser/browser.dtd  |   5 -
 browser/themes/linux/browser.css              |   8 --
 .../linux/customizableui/panelUIOverlay.css   |   4 +-
 .../osx/customizableui/panelUIOverlay.css     |  31 ++--
 browser/themes/shared/browser.inc             |   2 +-
 .../customizableui/panelUIOverlay.inc.css     |  94 ++++++++++--
 .../windows/customizableui/panelUIOverlay.css |   6 +-
 12 files changed, 309 insertions(+), 147 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 1cafea5acced..0c4baabe2c4f 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1007,18 +1007,6 @@
                      label="&fullScreenCmd.label;"
                      tooltiptext="&fullScreenButton.tooltip;"/>
 
-      <toolbaritem id="zoom-controls" class="chromeclass-toolbar-additional"
-                   title="&zoomControls.label;">
-        <toolbarbutton id="zoom-out-button" class="toolbarbutton-1"
-                       label="&fullZoomReduceCmd.label;"
-                       command="cmd_fullZoomReduce"
-                       tooltiptext="&zoomOutButton.tooltip;"/>
-        <toolbarbutton id="zoom-in-button" class="toolbarbutton-1"
-                       label="&fullZoomEnlargeCmd.label;"
-                       command="cmd_fullZoomEnlarge"
-                       tooltiptext="&zoomInButton.tooltip;"/>
-      </toolbaritem>
-
       <toolbarbutton id="feed-button"
                      type="menu"
                      class="toolbarbutton-1 chromeclass-toolbar-additional"
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index 36b996016cb3..671e57ac639c 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -6,10 +6,11 @@
        role="group"
        type="arrow"
        level="top"
-       consumeoutsideclicks="true">
+       consumeoutsideclicks="true"
+       noautofocus="true">
   <panelmultiview id="PanelUI-multiView" mainViewId="PanelUI-mainView">
     <panelview id="PanelUI-mainView" flex="1">
-      <vbox class="PanelUI-pageControls" pack="center">
+      <vbox id="PanelUI-pageControls" pack="center">
         <hbox class="PanelUI-editControls">
           <toolbarbutton id="PanelUI-cut-btn" flex="1"
                          label="&cutCmd.label;"
@@ -27,22 +28,6 @@
                          class="panel-combined-button"
                          command="cmd_paste"/>
         </hbox>
-        <hbox class="PanelUI-zoomControls">
-          <toolbarbutton id="PanelUI-zoomOut-btn" flex="1"
-                         noautoclose="true" label="&fullZoomReduceCmd.label;"
-                         command="cmd_fullZoomReduce"
-                         class="panel-combined-button"
-                         tooltiptext="&zoomOutButton.tooltip;"/>
-          <toolbarbutton id="PanelUI-zoomReset-btn" flex="1"
-                         noautoclose="true" command="cmd_fullZoomReset"
-                         class="panel-combined-button"
-                         tooltiptext="&zoomReset.tooltip;"/>
-          <toolbarbutton id="PanelUI-zoomIn-btn" flex="1"
-                         noautoclose="true" label="&fullZoomEnlargeCmd.label;"
-                         command="cmd_fullZoomEnlarge"
-                         class="panel-combined-button"
-                         tooltiptext="&zoomInButton.tooltip;"/>
-        </hbox>
       </vbox>
 
       <vbox id="PanelUI-contents" type="grid"/>
diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
index 11206a88150b..6feee58def75 100644
--- a/browser/components/customizableui/content/panelUI.js
+++ b/browser/components/customizableui/content/panelUI.js
@@ -22,8 +22,7 @@ const PanelUI = {
       multiView: "PanelUI-multiView",
       helpView: "PanelUI-help",
       menuButton: "PanelUI-menu-button",
-      panel: "PanelUI-popup",
-      zoomResetButton: "PanelUI-zoomReset-btn"
+      panel: "PanelUI-popup"
     };
   },
 
@@ -42,12 +41,6 @@ const PanelUI = {
       this.panel.addEventListener(event, this);
     }
 
-    // Register ourselves with the service so we know when the zoom prefs change.
-    Services.obs.addObserver(this, "browser-fullZoom:zoomChange", false);
-    Services.obs.addObserver(this, "browser-fullZoom:zoomReset", false);
-
-    this._updateZoomResetButton();
-
     this.helpView.addEventListener("ViewShowing", this._onHelpViewShow, false);
     this.helpView.addEventListener("ViewHiding", this._onHelpViewHide, false);
   },
@@ -58,8 +51,6 @@ const PanelUI = {
     }
     this.helpView.removeEventListener("ViewShowing", this._onHelpViewShow);
     this.helpView.removeEventListener("ViewHiding", this._onHelpViewHide);
-    Services.obs.removeObserver(this, "browser-fullZoom:zoomChange");
-    Services.obs.removeObserver(this, "browser-fullZoom:zoomReset");
   },
 
   /**
@@ -118,13 +109,6 @@ const PanelUI = {
     }
   },
 
-  /**
-   * nsIObserver implementation, responding to zoom pref changes
-   */
-  observe: function (aSubject, aTopic, aData) {
-    this._updateZoomResetButton();
-  },
-
   /**
    * Registering the menu panel is done lazily for performance reasons. This
    * method is exposed so that CustomizationMode can force registration in the
@@ -213,11 +197,6 @@ const PanelUI = {
                            this.panel.state == "showing";
   },
 
-  _updateZoomResetButton: function() {
-    this.zoomResetButton.setAttribute("label", gNavigatorBundle
-      .getFormattedString("zoomReset.label", [Math.floor(ZoomManager.zoom * 100)]));
-  },
-
   _onWidgetPanelCommand: function(aEvent) {
     if (!aEvent.originalTarget.hasAttribute("noautoclose")) {
       aEvent.currentTarget.hidePopup();
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 0ec74952f993..3cb0a2deb8a4 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -62,7 +62,7 @@ let gFuturePlacements = new Map();
 
 //XXXunf Temporary. Need a nice way to abstract functions to build widgets
 //       of these types.
-let gSupportedWidgetTypes = new Set(["button", "view"]);
+let gSupportedWidgetTypes = new Set(["button", "view", "custom"]);
 
 /**
  * gSeenWidgets remembers which widgets the user has seen for the first time
@@ -76,6 +76,7 @@ let gSavedState = null;
 let gRestoring = false;
 let gDirty = false;
 let gInBatch = false;
+let gResetting = false;
 
 /**
  * gBuildAreas maps area IDs to actual area nodes within browser windows.
@@ -107,6 +108,7 @@ let CustomizableUIInternal = {
       anchor: "PanelUI-menu-button",
       type: CustomizableUI.TYPE_MENU_PANEL,
       defaultPlacements: [
+        "zoom-controls",
         "new-window-button",
         "privatebrowsing-button",
         "save-page-button",
@@ -311,6 +313,8 @@ let CustomizableUIInternal = {
       }
       this.insertWidgetBefore(node, currentNode, container, aArea);
       this._addParentFlex(node);
+      if (gResetting)
+        this.notifyListeners("onWidgetReset", id);
     }
 
     if (currentNode) {
@@ -570,8 +574,10 @@ let CustomizableUIInternal = {
       }
     }
 
-    for (let [,widget] of gPalette)
+    for (let [,widget] of gPalette) {
       widget.instances.delete(document);
+      this.notifyListeners("onWidgetInstanceRemoved", widget.id, document);
+    }
   },
 
   setLocationAttributes: function(aNode, aContainer, aArea) {
@@ -696,52 +702,66 @@ let CustomizableUIInternal = {
       throw new Error("buildWidget was passed a non-widget to build.");
     }
 
-    LOG("Building " + aWidget.id);
+    LOG("Building " + aWidget.id + " of type " + aWidget.type);
 
-    let node = aDocument.createElementNS(kNSXUL, "toolbarbutton");
-
-    node.setAttribute("id", aWidget.id);
-    node.setAttribute("widget-id", aWidget.id);
-    node.setAttribute("widget-type", aWidget.type);
-    if (aWidget.disabled) {
-      node.setAttribute("disabled", true);
-    }
-    node.setAttribute("removable", aWidget.removable);
-    node.setAttribute("label", aWidget.name);
-    node.setAttribute("tooltiptext", aWidget.description);
-    //XXXunf Need to hook this up to a <key> element or something.
-    if (aWidget.shortcut) {
-      node.setAttribute("acceltext", aWidget.shortcut);
-    }
-    node.setAttribute("class", "toolbarbutton-1 chromeclass-toolbar-additional");
-
-    let handler = this.handleWidgetClick.bind(this, aWidget, node);
-    node.addEventListener("command", handler, false);
-
-    // If the widget has a view, and has view showing / hiding listeners,
-    // hook those up to this widget.
-    if (aWidget.type == "view" &&
-        (aWidget.onViewShowing || aWidget.onViewHiding)) {
-      LOG("Widget " + aWidget.id + " has a view with showing and hiding events. Auto-registering event handlers.");
-      let viewNode = aDocument.getElementById(aWidget.viewId);
-
-      if (!viewNode) {
-        ERROR("Could not find the view node with id: " + aWidget.viewId);
-        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") {
-          viewNode.addEventListener(eventName, aWidget[handler], false);
+    let node;
+    if (aWidget.type == "custom") {
+      if (aWidget.onBuild) {
+        try {
+          node = aWidget.onBuild(aDocument);
+        } catch (ex) {
+          ERROR("Custom widget with id " + aWidget.id + " threw an error: " + ex.message);
         }
       }
+      if (!node || !(node instanceof aDocument.defaultView.XULElement))
+        ERROR("Custom widget with id " + aWidget.id + " does not return a valid node");
+    }
+    else {
+      node = aDocument.createElementNS(kNSXUL, "toolbarbutton");
 
-      LOG("Widget " + aWidget.id + " showing and hiding event handlers set.");
+      node.setAttribute("id", aWidget.id);
+      node.setAttribute("widget-id", aWidget.id);
+      node.setAttribute("widget-type", aWidget.type);
+      if (aWidget.disabled) {
+        node.setAttribute("disabled", true);
+      }
+      node.setAttribute("removable", aWidget.removable);
+      node.setAttribute("label", aWidget.name);
+      node.setAttribute("tooltiptext", aWidget.description);
+      //XXXunf Need to hook this up to a <key> element or something.
+      if (aWidget.shortcut) {
+        node.setAttribute("acceltext", aWidget.shortcut);
+      }
+      node.setAttribute("class", "toolbarbutton-1 chromeclass-toolbar-additional");
+
+      let handler = this.handleWidgetClick.bind(this, aWidget, node);
+      node.addEventListener("command", handler, false);
+
+      // If the widget has a view, and has view showing / hiding listeners,
+      // hook those up to this widget.
+      if (aWidget.type == "view" &&
+          (aWidget.onViewShowing || aWidget.onViewHiding)) {
+        LOG("Widget " + aWidget.id + " has a view with showing and hiding events. Auto-registering event handlers.");
+        let viewNode = aDocument.getElementById(aWidget.viewId);
+
+        if (!viewNode) {
+          ERROR("Could not find the view node with id: " + aWidget.viewId);
+          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") {
+            viewNode.addEventListener(eventName, aWidget[handler], false);
+          }
+        }
+
+        LOG("Widget " + aWidget.id + " showing and hiding event handlers set.");
+      }
     }
 
     aWidget.instances.set(aDocument, node);
@@ -1299,6 +1319,10 @@ let CustomizableUIInternal = {
       widget.onViewHiding = typeof aData.onViewHiding == "function" ? 
                                  aData.onViewHiding :
                                  null;
+    } else if (widget.type == "custom") {
+      widget.onBuild = typeof aData.onBuild == "function" ?
+                                 aData.onBuild :
+                                 null;
     }
 
     if (gPalette.has(widget.id)) {
@@ -1454,6 +1478,7 @@ let CustomizableUIInternal = {
   },
 
   reset: function() {
+    gResetting = true;
     Services.prefs.clearUserPref(kPrefCustomizationState);
     LOG("State reset");
 
@@ -1474,6 +1499,7 @@ let CustomizableUIInternal = {
         this.buildArea(areaId, placements, areaNode);
       }
     }
+    gResetting = false;
   },
 
   _addParentFlex: function(aElement) {
diff --git a/browser/components/customizableui/src/CustomizableWidgets.jsm b/browser/components/customizableui/src/CustomizableWidgets.jsm
index 96e771ac55dc..8042c2ba525a 100644
--- a/browser/components/customizableui/src/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/src/CustomizableWidgets.jsm
@@ -19,6 +19,17 @@ const kPrefCustomizationDebug = "browser.uiCustomization.debug";
 let gModuleName = "[CustomizableWidgets]";
 #include logging.js
 
+function setAttributes(aNode, aAttrs) {
+  for (let [name, value] of Iterator(aAttrs)) {
+    if (!value) {
+      if (aNode.hasAttribute(name))
+        aNode.removeAttribute(name);
+    } else {
+      aNode.setAttribute(name, value);
+    }
+  }
+}
+
 const CustomizableWidgets = [{
     id: "history-panelmenu",
     type: "view",
@@ -237,4 +248,129 @@ const CustomizableWidgets = [{
         win.openPreferences();
       }
     }
+  }, {
+    id: "zoom-controls",
+    name: "Zoom Controls",
+    type: "custom",
+    removable: true,
+    defaultArea: CustomizableUI.AREA_PANEL,
+    allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
+    onBuild: function(aDocument) {
+      let inPanel = (this.currentArea == CustomizableUI.AREA_PANEL);
+      let noautoclose = inPanel ? "true" : null;
+      let flex = inPanel ? "1" : null;
+      let cls = inPanel ? "panel-combined-button" : "toolbarbutton-1";
+      let buttons = [{
+        id: "zoom-out-button",
+        noautoclose: noautoclose,
+        command: "cmd_fullZoomReduce",
+        flex: flex,
+        class: cls,
+        label: "Zoom out",
+        tooltiptext: "Zoom out"
+      }, {
+        id: "zoom-reset-button",
+        noautoclose: noautoclose,
+        command: "cmd_fullZoomReset",
+        flex: flex,
+        class: cls,
+        tooltiptext: "Reset Zoom"
+      }, {
+        id: "zoom-in-button",
+        noautoclose: noautoclose,
+        command: "cmd_fullZoomEnlarge",
+        flex: flex,
+        class: cls,
+        label: "Zoom in",
+        tooltiptext: "Zoom in"
+      }];
+
+      let node = aDocument.createElementNS(kNSXUL, "toolbaritem");
+      node.setAttribute("id", "zoom-controls");
+      node.setAttribute("title", "Zoom Controls");
+      if (inPanel)
+        node.setAttribute("flex", "1");
+      node.classList.add("chromeclass-toolbar-additional");
+
+      buttons.forEach(function(aButton) {
+        let btnNode = aDocument.createElementNS(kNSXUL, "toolbarbutton");
+        setAttributes(btnNode, aButton);
+        node.appendChild(btnNode);
+      });
+
+      // The middle node is the 'Reset Zoom' button.
+      let zoomResetButton = node.childNodes[1];
+      let window = aDocument.defaultView;
+      function updateZoomResetButton() {
+        zoomResetButton.setAttribute("label", window.gNavigatorBundle
+          .getFormattedString("zoomReset.label", [Math.floor(window.ZoomManager.zoom * 100)]));
+      };
+
+      // Register ourselves with the service so we know when the zoom prefs change.
+      Services.obs.addObserver(updateZoomResetButton, "browser-fullZoom:zoomChange", false);
+      Services.obs.addObserver(updateZoomResetButton, "browser-fullZoom:zoomReset", false);
+
+      updateZoomResetButton();
+      if (!inPanel)
+        zoomResetButton.setAttribute("hidden", "true");
+
+      function updateWidgetStyle(aInPanel) {
+        let attrs = {
+          noautoclose: aInPanel ? "true" : null,
+          flex: aInPanel ? "1" : null,
+          class: aInPanel ? "panel-combined-button" : "toolbarbutton-1"
+        };
+        for (let i = 0, l = node.childNodes.length; i < l; ++i) {
+          setAttributes(node.childNodes[i], attrs);
+        }
+        zoomResetButton.setAttribute("hidden", aInPanel ? "false" : "true");
+        if (aInPanel)
+          node.setAttribute("flex", "1");
+        else if (node.hasAttribute("flex"))
+          node.removeAttribute("flex");
+      }
+
+      let listener = {
+        onWidgetAdded: function(aWidgetId, aArea, aPosition) {
+          if (aWidgetId != this.id)
+            return;
+
+          updateWidgetStyle(aArea == CustomizableUI.AREA_PANEL);
+        }.bind(this),
+
+        onWidgetRemoved: function(aWidgetId, aPrevArea) {
+          if (aWidgetId != this.id)
+            return;
+
+          // When a widget is demoted to the palette ('removed'), it's visual
+          // style should change.
+          updateWidgetStyle(false);
+          zoomResetButton.setAttribute("hidden", "true");
+        }.bind(this),
+
+        onWidgetReset: function(aWidgetId) {
+          if (aWidgetId != this.id)
+            return;
+          updateWidgetStyle(this.currentArea == CustomizableUI.AREA_PANEL);
+        }.bind(this),
+
+        onWidgetMoved: function(aWidgetId, aArea) {
+          if (aWidgetId != this.id)
+            return;
+          updateWidgetStyle(aArea == CustomizableUI.AREA_PANEL);
+        }.bind(this),
+
+        onWidgetInstanceRemoved: function(aWidgetId, aDoc) {
+          if (aWidgetId != this.id || aDoc != aDocument)
+            return;
+
+          CustomizableUI.removeListener(listener);
+          Services.obs.removeObserver(updateZoomResetButton, "browser-fullZoom:zoomChange");
+          Services.obs.removeObserver(updateZoomResetButton, "browser-fullZoom:zoomReset");
+        }.bind(this)
+      };
+      CustomizableUI.addListener(listener);
+
+      return node;
+    }
   }];
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 3ee00426af17..50e1690bb8cb 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -532,11 +532,6 @@ you can use these alternative items. Otherwise, their values should be empty.  -
 
 <!ENTITY fullScreenButton.tooltip       "Display the window in full screen">
 
-<!ENTITY zoomOutButton.tooltip          "Zoom out">
-<!ENTITY zoomInButton.tooltip           "Zoom in">
-<!ENTITY zoomControls.label             "Zoom Controls">
-<!ENTITY zoomReset.tooltip              "Reset Zoom">
-
 <!ENTITY quitApplicationCmdWin.label       "Exit"> 
 <!ENTITY quitApplicationCmdWin.accesskey   "x">
 <!ENTITY goBackCmd.commandKey "[">
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index f29d017a4229..0db9e4e68a02 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -683,14 +683,6 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   -moz-image-region: rect(0px 120px 24px 96px);
 }
 
-/* These buttons are going to be removed in later bugs, but until then
- * we're overriding the menuPanel-icons sprites with these ones with
- * !important.
- *
- * Here are the relevant removal bugs:
- * #zoom-out-button, #zoom-in-button - Bug 870897
- */
-
 #zoom-out-button {
   list-style-image: url("moz-icon://stock/gtk-zoom-out?size=toolbar") !important;
 }
diff --git a/browser/themes/linux/customizableui/panelUIOverlay.css b/browser/themes/linux/customizableui/panelUIOverlay.css
index 4c0ba6516319..60acde9fd093 100644
--- a/browser/themes/linux/customizableui/panelUIOverlay.css
+++ b/browser/themes/linux/customizableui/panelUIOverlay.css
@@ -28,13 +28,13 @@
   list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar&state=disabled");
 }
 
-#PanelUI-zoomOut-btn {
+#PanelUI-contents #zoom-out-button {
   list-style-image: url("moz-icon://stock/gtk-zoom-out?size=toolbar");
   padding-left: 12px;
   padding-right: 12px;
 }
 
-#PanelUI-zoomIn-btn {
+#PanelUI-contents #zoom-in-button {
   list-style-image: url("moz-icon://stock/gtk-zoom-in?size=toolbar");
   padding-left: 12px;
   padding-right: 12px;
diff --git a/browser/themes/osx/customizableui/panelUIOverlay.css b/browser/themes/osx/customizableui/panelUIOverlay.css
index ad050b8c7ef0..0e501186d690 100644
--- a/browser/themes/osx/customizableui/panelUIOverlay.css
+++ b/browser/themes/osx/customizableui/panelUIOverlay.css
@@ -18,6 +18,7 @@
     width: 20px;
   }
 
+  #PanelUI-contents #zoom-controls toolbarbutton,
   .panel-combined-button {
     list-style-image: url(chrome://browser/skin/customizableui/menuPanel-small-icons@2x.png);
   }
@@ -129,41 +130,37 @@
     -moz-image-region: rect(0 96px 32px 64px);
   }
 
-  #PanelUI-zoomOut-btn {
+  #PanelUI-contents #zoom-out-button {
     -moz-image-region: rect(0 128px 32px 96px);
   }
 
-  #PanelUI-zoomIn-btn {
+  #PanelUI-contents #zoom-in-button {
     -moz-image-region: rect(0 160px 32px 128px);
   }
 }
 
-.PanelUI-pageControls toolbarbutton:not(:first-child) {
+#PanelUI-pageControls toolbarbutton:not(:first-child),
+#PanelUI-contents #zoom-controls toolbarbutton:not(:first-child) {
   -moz-margin-start: 0;
 }
-.PanelUI-pageControls toolbarbutton:not(:last-child) {
+#PanelUI-pageControls toolbarbutton:not(:last-child),
+#PanelUI-contents #zoom-controls toolbarbutton:not(:last-child) {
   -moz-margin-end: 0;
 }
-.PanelUI-pageControls toolbarbutton:not(:first-child):not(:last-child) {
+#PanelUI-pageControls toolbarbutton:not(:first-child):not(:last-child),
+#PanelUI-contents #zoom-controls toolbarbutton:not(:first-child):not(:last-child) {
   margin-left: 0;
   margin-right: 0;
 }
 
-#PanelUI-zoomIn-btn,
-#PanelUI-zoomOut-btn {
+#PanelUI-contents #zoom-in-button,
+#PanelUI-contents #zoom-out-button {
   padding-left: 12px;
   padding-right: 12px;
 }
 
-.PanelUI-editControls #PanelUI-copy-btn,
-.PanelUI-zoomControls #PanelUI-zoomReset-btn {
-  border-left: none;
-  border-right: none;
-  border-radius: 0;
-}
-
-#PanelUI-zoomIn-btn .toolbarbutton-text,
-#PanelUI-zoomOut-btn .toolbarbutton-text,
-#PanelUI-zoomReset-btn .toolbarbutton-icon {
+#PanelUI-contents #zoom-in-button .toolbarbutton-text,
+#PanelUI-contents #zoom-out-button .toolbarbutton-text,
+#PanelUI-contents #zoom-reset-button .toolbarbutton-icon {
   display: none;
 }
diff --git a/browser/themes/shared/browser.inc b/browser/themes/shared/browser.inc
index 017d06ff1624..93b04a280a30 100644
--- a/browser/themes/shared/browser.inc
+++ b/browser/themes/shared/browser.inc
@@ -1,3 +1,3 @@
 %filter substitution
 
-%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #zoom-out-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button
+%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index 67d508c3ec00..593fb631e787 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -52,13 +52,30 @@
   font-size: 10px;
 }
 
-.PanelUI-pageControls {
+#PanelUI-contents #wrapper-zoom-controls {
+  margin-left: -1em;
+  margin-right: -1em;
+  width: calc(100% + 2em);
+}
+
+#PanelUI-contents #zoom-controls,
+#PanelUI-pageControls {
   padding: 1em 0 0;
 }
 
+#PanelUI-contents #zoom-controls {
+  -moz-margin-start: -1em;
+  -moz-box-align: stretch;
+  width: calc(100% + 2em);
+}
+
+#PanelUI-contents #wrapper-zoom-controls #zoom-controls {
+  -moz-margin-start: 0;
+}
+
 .PanelUI-footer,
 .PanelUI-editControls,
-.PanelUI-zoomControls,
+#PanelUI-contents #zoom-controls,
 #PanelUI-contents,
 .PanelUI-footer,
 .panel-mainview:not([panelid="PanelUI-popup"]) {
@@ -92,11 +109,8 @@ panelview:not([mainview]) .toolbarbutton-text,
   display: block;
 }
 
-.PanelUI-pageControls toolbarbutton {
-  min-width: 7em;
-}
-
-.PanelUI-pageControls toolbarbutton > .toolbarbutton-icon {
+#PanelUI-pageControls toolbarbutton > .toolbarbutton-icon,
+#PanelUI-contents #zoom-controls toolbarbutton > .toolbarbutton-icon {
   -moz-margin-end: 0;
 }
 
@@ -112,8 +126,30 @@ panelview:not([mainview]) .toolbarbutton-text,
   list-style-image: url(chrome://browser/skin/customizableui/menuPanel-icons.png);
 }
 
+#PanelUI-contents #zoom-controls toolbarbutton,
+#PanelUI-pageControls toolbarbutton {
+  -moz-box-orient: horizontal;
+  min-width: 7em;
+}
+
+#customization-palette #zoom-controls toolbarbutton,
+#PanelUI-contents #zoom-controls toolbarbutton {
+  max-width: none;
+  max-height: none;
+  height: auto;
+}
+
+#customization-palette #zoom-reset-button {
+  display: none;
+}
+
+#customization-palette #zoom-controls toolbarbutton {
+  min-width: 1em;
+}
+
 /* These smaller icons have different styling between the panel and the toolbar,
    hence not referencing toolbar.png for these icons. */
+#PanelUI-contents #zoom-controls toolbarbutton,
 .panel-combined-button {
   list-style-image: url(chrome://browser/skin/customizableui/menuPanel-small-icons.png);
 }
@@ -124,17 +160,23 @@ panelview:not([mainview]) .toolbarbutton-text,
   min-height: calc(8em / 3);
   margin: calc(5em / 12);
 }
+ 
+#PanelUI-contents #zoom-controls toolbarbutton > .toolbarbutton-icon {
+  min-width: 0;
+  min-height: 0;
+  margin: 0;
+}
 
 .PanelUI-editControls #PanelUI-copy-btn,
-.PanelUI-zoomControls #PanelUI-zoomReset-btn {
+#PanelUI-contents #zoom-controls #zoom-reset-button {
   border-left: none;
   border-right: none;
   border-radius: 0;
 }
 
-#PanelUI-zoomIn-btn .toolbarbutton-text,
-#PanelUI-zoomOut-btn .toolbarbutton-text,
-#PanelUI-zoomReset-btn .toolbarbutton-icon {
+#PanelUI-contents #zoom-in-button .toolbarbutton-text,
+#PanelUI-contents #zoom-out-button .toolbarbutton-text,
+#PanelUI-contents #zoom-reset-button .toolbarbutton-icon {
   display: none;
 }
 
@@ -179,7 +221,8 @@ panelview toolbarbutton,
 
 panelview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #widget-overflow-list > toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
-#PanelUI-mainView .PanelUI-pageControls toolbarbutton,
+#PanelUI-pageControls toolbarbutton,
+#PanelUI-contents #zoom-controls toolbarbutton,
 .customizationmode-button,
 #PanelUI-mainView #PanelUI-customize-btn {
   background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
@@ -342,18 +385,39 @@ toolbarbutton.panel-multiview-anchor {
   -moz-image-region: rect(0 48px 16px 32px);
 }
 
-#PanelUI-zoomOut-btn {
+#PanelUI-contents #zoom-out-button {
   -moz-image-region: rect(0 64px 16px 48px);
 }
 
-#PanelUI-zoomReset-btn {
+#PanelUI-contents #zoom-reset-button {
   list-style-image: none;
 }
 
-#PanelUI-zoomIn-btn {
+#PanelUI-contents #zoom-in-button {
   -moz-image-region: rect(0 80px 16px 64px);
 }
 
+#PanelUI-contents #zoom-out-button {
+  -moz-margin-end: none;
+}
+
+#PanelUI-contents #zoom-in-button {
+  -moz-border-start: 1px solid;
+  -moz-margin-start: none;
+}
+
+#PanelUI-contents #zoom-out-button:-moz-locale-dir(ltr),
+#PanelUI-contents #zoom-in-button:-moz-locale-dir(rtl) {
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+}
+
+#PanelUI-contents #zoom-out-button:-moz-locale-dir(rtl),
+#PanelUI-contents #zoom-in-button:-moz-locale-dir(ltr) {
+  border-top-left-radius: 2px;
+  border-bottom-left-radius: 2px;
+}
+
 /* These icons are missing from Toolbar.png, so this is a temporary
    hack until they are added. */
 toolbar > .customization-target > #find-button,
diff --git a/browser/themes/windows/customizableui/panelUIOverlay.css b/browser/themes/windows/customizableui/panelUIOverlay.css
index 990029662e64..d8d27762e530 100644
--- a/browser/themes/windows/customizableui/panelUIOverlay.css
+++ b/browser/themes/windows/customizableui/panelUIOverlay.css
@@ -7,7 +7,7 @@
 
 %include ../../shared/customizableui/panelUIOverlay.inc.css
 
-.PanelUI-pageControls toolbarbutton {
+#PanelUI-pageControls toolbarbutton {
   list-style-image: url("chrome://browser/skin/Toolbar.png");
 }
 
@@ -21,12 +21,12 @@
   -moz-image-region: rect(0, 252px, 18px, 234px);
 }
 
-#PanelUI-zoomOut-btn {
+#PanelUI-contents #zoom-out-btn {
   -moz-image-region: rect(0, 288px, 18px, 270px);
   padding-left: 12px;
   padding-right: 12px;
 }
-#PanelUI-zoomIn-btn {
+#PanelUI-contents #zoom-in-btn {
   -moz-image-region: rect(0, 306px, 18px, 288px);
   padding-left: 12px;
   padding-right: 12px;

From 308c0cb0e4b0bb328bb3559bfd772ba412e44ffc Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Tue, 4 Jun 2013 12:33:13 +0200
Subject: [PATCH 203/230] Bug 870901: Re-add edit controls and make them
 customizable. r=mconley

---
 .../customizableui/content/panelUI.inc.xul    | 20 ----
 .../customizableui/src/CustomizableUI.jsm     |  1 +
 .../src/CustomizableWidgets.jsm               | 98 +++++++++++++++++++
 .../locales/en-US/chrome/browser/browser.dtd  |  4 -
 browser/themes/linux/browser.css              | 42 ++++++++
 .../linux/customizableui/panelUIOverlay.css   | 12 +--
 browser/themes/osx/browser.css                | 67 +++++++++++++
 .../osx/customizableui/panelUIOverlay.css     | 13 +--
 browser/themes/shared/browser.inc             |  2 +-
 .../customizableui/panelUIOverlay.inc.css     | 37 ++++---
 browser/themes/windows/browser.css            | 12 +++
 .../windows/customizableui/panelUIOverlay.css |  8 +-
 12 files changed, 263 insertions(+), 53 deletions(-)

diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index 671e57ac639c..becd8cc90b16 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -10,26 +10,6 @@
        noautofocus="true">
   <panelmultiview id="PanelUI-multiView" mainViewId="PanelUI-mainView">
     <panelview id="PanelUI-mainView" flex="1">
-      <vbox id="PanelUI-pageControls" pack="center">
-        <hbox class="PanelUI-editControls">
-          <toolbarbutton id="PanelUI-cut-btn" flex="1"
-                         label="&cutCmd.label;"
-                         tooltiptext="&cutButton.tooltip;"
-                         class="panel-combined-button"
-                         command="cmd_cut"/>
-          <toolbarbutton id="PanelUI-copy-btn" flex="1"
-                         label="&copyCmd.label;"
-                         tooltiptext="&copyButton.tooltip;"
-                         class="panel-combined-button"
-                         command="cmd_copy"/>
-          <toolbarbutton id="PanelUI-paste-btn" flex="1"
-                         label="&pasteCmd.label;"
-                         tooltiptext="&pasteButton.tooltip;"
-                         class="panel-combined-button"
-                         command="cmd_paste"/>
-        </hbox>
-      </vbox>
-
       <vbox id="PanelUI-contents" type="grid"/>
 
       <vbox id="PanelUI-mainView-spring" flex="1"/>
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 3cb0a2deb8a4..5e58c7d7ee39 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -108,6 +108,7 @@ let CustomizableUIInternal = {
       anchor: "PanelUI-menu-button",
       type: CustomizableUI.TYPE_MENU_PANEL,
       defaultPlacements: [
+        "edit-controls",
         "zoom-controls",
         "new-window-button",
         "privatebrowsing-button",
diff --git a/browser/components/customizableui/src/CustomizableWidgets.jsm b/browser/components/customizableui/src/CustomizableWidgets.jsm
index 8042c2ba525a..5f74c5ccb2de 100644
--- a/browser/components/customizableui/src/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/src/CustomizableWidgets.jsm
@@ -371,6 +371,104 @@ const CustomizableWidgets = [{
       };
       CustomizableUI.addListener(listener);
 
+      return node;
+    }
+  }, {
+    id: "edit-controls",
+    name: "Edit Controls",
+    type: "custom",
+    removable: true,
+    defaultArea: CustomizableUI.AREA_PANEL,
+    allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
+    onBuild: function(aDocument) {
+      let inPanel = (this.currentArea == CustomizableUI.AREA_PANEL);
+      let flex = inPanel ? "1" : null;
+      let cls = inPanel ? "panel-combined-button" : "toolbarbutton-1";
+      let buttons = [{
+        id: "cut-button",
+        command: "cmd_cut",
+        flex: flex,
+        class: cls,
+        label: "Cut",
+        tooltiptext: "Cut"
+      }, {
+        id: "copy-button",
+        command: "cmd_copy",
+        flex: flex,
+        class: cls,
+        label: "Copy",
+        tooltiptext: "Copy"
+      }, {
+        id: "paste-button",
+        command: "cmd_paste",
+        flex: flex,
+        class: cls,
+        label: "Paste",
+        tooltiptext: "Paste"
+      }];
+
+      let node = aDocument.createElementNS(kNSXUL, "toolbaritem");
+      node.setAttribute("id", "edit-controls");
+      node.setAttribute("title", "Edit Controls");
+      if (inPanel)
+        node.setAttribute("flex", "1");
+      node.classList.add("chromeclass-toolbar-additional");
+
+      buttons.forEach(function(aButton) {
+        let btnNode = aDocument.createElementNS(kNSXUL, "toolbarbutton");
+        setAttributes(btnNode, aButton);
+        node.appendChild(btnNode);
+      });
+
+      function updateWidgetStyle(aInPanel) {
+        let attrs = {
+          flex: aInPanel ? "1" : null,
+          class: aInPanel ? "panel-combined-button" : "toolbarbutton-1"
+        };
+        for (let i = 0, l = node.childNodes.length; i < l; ++i) {
+          setAttributes(node.childNodes[i], attrs);
+        }
+        if (aInPanel)
+          node.setAttribute("flex", "1");
+        else if (node.hasAttribute("flex"))
+          node.removeAttribute("flex");
+      }
+
+      let listener = {
+        onWidgetAdded: function(aWidgetId, aArea, aPosition) {
+          if (aWidgetId != this.id)
+            return;
+          updateWidgetStyle(aArea == CustomizableUI.AREA_PANEL);
+        }.bind(this),
+
+        onWidgetRemoved: function(aWidgetId, aPrevArea) {
+          if (aWidgetId != this.id)
+            return;
+          // When a widget is demoted to the palette ('removed'), it's visual
+          // style should change.
+          updateWidgetStyle(false);
+        }.bind(this),
+
+        onWidgetReset: function(aWidgetId) {
+          if (aWidgetId != this.id)
+            return;
+          updateWidgetStyle(this.currentArea == CustomizableUI.AREA_PANEL);
+        }.bind(this),
+
+        onWidgetMoved: function(aWidgetId, aArea) {
+          if (aWidgetId != this.id)
+            return;
+          updateWidgetStyle(aArea == CustomizableUI.AREA_PANEL);
+        }.bind(this),
+
+        onWidgetInstanceRemoved: function(aWidgetId, aDoc) {
+          if (aWidgetId != this.id || aDoc != aDocument)
+            return;
+          CustomizableUI.removeListener(listener);
+        }.bind(this)
+      };
+      CustomizableUI.addListener(listener);
+
       return node;
     }
   }];
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 50e1690bb8cb..445488b6ed21 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -526,10 +526,6 @@ you can use these alternative items. Otherwise, their values should be empty.  -
 <!ENTITY newWindowButton.tooltip        "Open a new window">
 <!ENTITY sidebarCloseButton.tooltip     "Close sidebar">
 
-<!ENTITY cutButton.tooltip              "Cut">
-<!ENTITY copyButton.tooltip             "Copy">
-<!ENTITY pasteButton.tooltip            "Paste">
-
 <!ENTITY fullScreenButton.tooltip       "Display the window in full screen">
 
 <!ENTITY quitApplicationCmdWin.label       "Exit"> 
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 0db9e4e68a02..1bba6096e4db 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -683,6 +683,27 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   -moz-image-region: rect(0px 120px 24px 96px);
 }
 
+#cut-button {
+  list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar") !important;
+}
+#cut-button[disabled="true"] {
+  list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar&state=disabled") !important;
+}
+
+#copy-button {
+  list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar") !important;
+}
+#copy-button[disabled="true"] {
+  list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar&state=disabled") !important;
+}
+
+#paste-button {
+  list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar") !important;
+}
+#paste-button[disabled="true"] {
+  list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar&state=disabled") !important;
+}
+
 #zoom-out-button {
   list-style-image: url("moz-icon://stock/gtk-zoom-out?size=toolbar") !important;
 }
@@ -819,6 +840,27 @@ toolbar[iconsize="small"] #new-window-button {
   -moz-image-region: rect(0px 80px 16px 64px);
 }
 
+toolbar[iconsize="small"] #cut-button {
+  list-style-image: url("moz-icon://stock/gtk-cut?size=menu");
+}
+toolbar[iconsize="small"] #cut-button[disabled="true"] {
+  list-style-image: url("moz-icon://stock/gtk-cut?size=menu&state=disabled");
+}
+
+toolbar[iconsize="small"] #copy-button {
+  list-style-image: url("moz-icon://stock/gtk-copy?size=menu");
+}
+toolbar[iconsize="small"] #copy-button[disabled="true"] {
+  list-style-image: url("moz-icon://stock/gtk-copy?size=menu&state=disabled");
+}
+
+toolbar[iconsize="small"] #paste-button {
+  list-style-image: url("moz-icon://stock/gtk-paste?size=menu");
+}
+toolbar[iconsize="small"] #paste-button[disabled="true"] {
+  list-style-image: url("moz-icon://stock/gtk-paste?size=menu&state=disabled");
+}
+
 toolbar[iconsize="small"] #fullscreen-button {
   list-style-image: url("moz-icon://stock/gtk-fullscreen?size=menu");
 }
diff --git a/browser/themes/linux/customizableui/panelUIOverlay.css b/browser/themes/linux/customizableui/panelUIOverlay.css
index 60acde9fd093..96f93789e914 100644
--- a/browser/themes/linux/customizableui/panelUIOverlay.css
+++ b/browser/themes/linux/customizableui/panelUIOverlay.css
@@ -7,24 +7,24 @@
 
 %include ../../shared/customizableui/panelUIOverlay.inc.css
 
-#PanelUI-cut-btn {
+#PanelUI-contents #cut-button {
   list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar");
 }
-#PanelUI-cut-btn[disabled="true"] {
+#PanelUI-contents #cut-button[disabled="true"] {
   list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar&state=disabled");
 }
 
-#PanelUI-copy-btn {
+#PanelUI-contents #copy-button {
   list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar");
 }
-#PanelUI-copy-btn[disabled="true"] {
+#PanelUI-contents #copy-button[disabled="true"] {
   list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar&state=disabled");
 }
 
-#PanelUI-paste-btn {
+#PanelUI-contents #paste-button {
   list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar");
 }
-#PanelUI-paste-btn[disabled="true"] {
+#PanelUI-contents #paste-button[disabled="true"] {
   list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar&state=disabled");
 }
 
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 88e4e3494568..270fa233236c 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -947,6 +947,73 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   }
 }
 
+/* cut button */
+
+#cut-button {
+  -moz-image-region: rect(0, 260px, 20px, 240px);
+}
+
+@media (min-resolution: 2dppx) {
+  #cut-button {
+    -moz-image-region: rect(0, 520px, 40px, 480px);
+  }
+}
+
+#edit-controls {
+  -moz-box-align: center;
+}
+
+/* copy button */
+
+#copy-button {
+  -moz-image-region: rect(0, 280px, 20px, 260px);
+}
+
+@media (min-resolution: 2dppx) {
+  #copy-button {
+    -moz-image-region: rect(0, 560px, 40px, 520px);
+  }
+}
+
+/* paste button */
+
+#paste-button {
+  -moz-image-region: rect(0, 300px, 20px, 280px);
+}
+
+@media (min-resolution: 2dppx) {
+  #paste-button {
+    -moz-image-region: rect(0, 600px, 40px, 560px);
+  }
+}
+
+#cut-button {
+  -moz-margin-end: 0;
+}
+
+#paste-button {
+  -moz-border-start: none;
+  -moz-margin-start: 0;
+}
+
+#cut-button:-moz-locale-dir(ltr),
+#paste-button:-moz-locale-dir(rtl) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+#cut-button:-moz-locale-dir(rtl),
+#paste-button:-moz-locale-dir(ltr) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+#copy-button {
+  border-radius: 0;
+  margin-right: 0;
+  margin-left: 0;
+}
+
 /* alltabs button */
 
 #alltabs-button {
diff --git a/browser/themes/osx/customizableui/panelUIOverlay.css b/browser/themes/osx/customizableui/panelUIOverlay.css
index 0e501186d690..f06e09709aea 100644
--- a/browser/themes/osx/customizableui/panelUIOverlay.css
+++ b/browser/themes/osx/customizableui/panelUIOverlay.css
@@ -18,6 +18,7 @@
     width: 20px;
   }
 
+  #PanelUI-contents #edit-controls toolbarbutton,
   #PanelUI-contents #zoom-controls toolbarbutton,
   .panel-combined-button {
     list-style-image: url(chrome://browser/skin/customizableui/menuPanel-small-icons@2x.png);
@@ -118,15 +119,15 @@
     -moz-image-region: rect(384px 128px 448px 64px);
   }
 
-  #PanelUI-cut-btn {
+  #PanelUI-contents #cut-button {
     -moz-image-region: rect(0 32px 32px 0);
   }
 
-  #PanelUI-copy-btn {
+  #PanelUI-contents #copy-button {
     -moz-image-region: rect(0 64px 32px 32px);
   }
 
-  #PanelUI-paste-btn {
+  #PanelUI-contents #paste-button {
     -moz-image-region: rect(0 96px 32px 64px);
   }
 
@@ -139,15 +140,15 @@
   }
 }
 
-#PanelUI-pageControls toolbarbutton:not(:first-child),
+#PanelUI-contents #edit-controls toolbarbutton:not(:first-child),
 #PanelUI-contents #zoom-controls toolbarbutton:not(:first-child) {
   -moz-margin-start: 0;
 }
-#PanelUI-pageControls toolbarbutton:not(:last-child),
+#PanelUI-contents #edit-controls toolbarbutton:not(:last-child),
 #PanelUI-contents #zoom-controls toolbarbutton:not(:last-child) {
   -moz-margin-end: 0;
 }
-#PanelUI-pageControls toolbarbutton:not(:first-child):not(:last-child),
+#PanelUI-contents #edit-controls toolbarbutton:not(:first-child):not(:last-child),
 #PanelUI-contents #zoom-controls toolbarbutton:not(:first-child):not(:last-child) {
   margin-left: 0;
   margin-right: 0;
diff --git a/browser/themes/shared/browser.inc b/browser/themes/shared/browser.inc
index 93b04a280a30..84cf27d5cb6c 100644
--- a/browser/themes/shared/browser.inc
+++ b/browser/themes/shared/browser.inc
@@ -1,3 +1,3 @@
 %filter substitution
 
-%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button
+%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index 593fb631e787..edef46ac4837 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -52,29 +52,32 @@
   font-size: 10px;
 }
 
+#PanelUI-contents #wrapper-edit-controls,
 #PanelUI-contents #wrapper-zoom-controls {
   margin-left: -1em;
   margin-right: -1em;
   width: calc(100% + 2em);
 }
 
-#PanelUI-contents #zoom-controls,
-#PanelUI-pageControls {
+#PanelUI-contents #edit-controls,
+#PanelUI-contents #zoom-controls {
   padding: 1em 0 0;
 }
 
+#PanelUI-contents #edit-controls,
 #PanelUI-contents #zoom-controls {
   -moz-margin-start: -1em;
   -moz-box-align: stretch;
   width: calc(100% + 2em);
 }
 
+#PanelUI-contents #wrapper-edit-controls #edit-controls,
 #PanelUI-contents #wrapper-zoom-controls #zoom-controls {
   -moz-margin-start: 0;
 }
 
 .PanelUI-footer,
-.PanelUI-editControls,
+#PanelUI-contents #edit-controls,
 #PanelUI-contents #zoom-controls,
 #PanelUI-contents,
 .PanelUI-footer,
@@ -109,7 +112,7 @@ panelview:not([mainview]) .toolbarbutton-text,
   display: block;
 }
 
-#PanelUI-pageControls toolbarbutton > .toolbarbutton-icon,
+#PanelUI-contents #edit-controls toolbarbutton > .toolbarbutton-icon,
 #PanelUI-contents #zoom-controls toolbarbutton > .toolbarbutton-icon {
   -moz-margin-end: 0;
 }
@@ -126,12 +129,14 @@ panelview:not([mainview]) .toolbarbutton-text,
   list-style-image: url(chrome://browser/skin/customizableui/menuPanel-icons.png);
 }
 
-#PanelUI-contents #zoom-controls toolbarbutton,
-#PanelUI-pageControls toolbarbutton {
+#PanelUI-contents #edit-controls toolbarbutton,
+#PanelUI-contents #zoom-controls toolbarbutton {
   -moz-box-orient: horizontal;
   min-width: 7em;
 }
 
+#customization-palette #edit-controls toolbarbutton,
+#PanelUI-contents #edit-controls toolbarbutton,
 #customization-palette #zoom-controls toolbarbutton,
 #PanelUI-contents #zoom-controls toolbarbutton {
   max-width: none;
@@ -143,12 +148,14 @@ panelview:not([mainview]) .toolbarbutton-text,
   display: none;
 }
 
+#customization-palette #edit-controls toolbarbutton,
 #customization-palette #zoom-controls toolbarbutton {
   min-width: 1em;
 }
 
 /* These smaller icons have different styling between the panel and the toolbar,
    hence not referencing toolbar.png for these icons. */
+#PanelUI-contents #edit-controls toolbarbutton,
 #PanelUI-contents #zoom-controls toolbarbutton,
 .panel-combined-button {
   list-style-image: url(chrome://browser/skin/customizableui/menuPanel-small-icons.png);
@@ -160,14 +167,15 @@ panelview:not([mainview]) .toolbarbutton-text,
   min-height: calc(8em / 3);
   margin: calc(5em / 12);
 }
- 
+
+#PanelUI-contents #edit-controls toolbarbutton > .toolbarbutton-icon,
 #PanelUI-contents #zoom-controls toolbarbutton > .toolbarbutton-icon {
   min-width: 0;
   min-height: 0;
   margin: 0;
 }
 
-.PanelUI-editControls #PanelUI-copy-btn,
+#PanelUI-contents #edit-controls #copy-button,
 #PanelUI-contents #zoom-controls #zoom-reset-button {
   border-left: none;
   border-right: none;
@@ -221,7 +229,7 @@ panelview toolbarbutton,
 
 panelview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
 #widget-overflow-list > toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):hover,
-#PanelUI-pageControls toolbarbutton,
+#PanelUI-contents #edit-controls toolbarbutton,
 #PanelUI-contents #zoom-controls toolbarbutton,
 .customizationmode-button,
 #PanelUI-mainView #PanelUI-customize-btn {
@@ -373,15 +381,15 @@ toolbarbutton.panel-multiview-anchor {
   -moz-image-region: rect(192px 64px 224px 32px);
 }
 
-#PanelUI-cut-btn {
+#PanelUI-contents #cut-button {
   -moz-image-region: rect(0 16px 16px 0);
 }
 
-#PanelUI-copy-btn {
+#PanelUI-contents #copy-button {
   -moz-image-region: rect(0 32px 16px 16px);
 }
 
-#PanelUI-paste-btn {
+#PanelUI-contents #paste-button {
   -moz-image-region: rect(0 48px 16px 32px);
 }
 
@@ -401,17 +409,22 @@ toolbarbutton.panel-multiview-anchor {
   -moz-margin-end: none;
 }
 
+#PanelUI-contents #paste-button,
 #PanelUI-contents #zoom-in-button {
   -moz-border-start: 1px solid;
   -moz-margin-start: none;
 }
 
+#PanelUI-contents #cut-button:-moz-locale-dir(ltr),
+#PanelUI-contents #paste-button:-moz-locale-dir(rtl),
 #PanelUI-contents #zoom-out-button:-moz-locale-dir(ltr),
 #PanelUI-contents #zoom-in-button:-moz-locale-dir(rtl) {
   border-top-right-radius: 2px;
   border-bottom-right-radius: 2px;
 }
 
+#PanelUI-contents #cut-button:-moz-locale-dir(rtl),
+#PanelUI-contents #paste-button:-moz-locale-dir(ltr),
 #PanelUI-contents #zoom-out-button:-moz-locale-dir(rtl),
 #PanelUI-contents #zoom-in-button:-moz-locale-dir(ltr) {
   border-top-left-radius: 2px;
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 89e07776eb81..ccff49f023b3 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -717,6 +717,18 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   -moz-image-region: rect(0, 198px, 18px, 180px);
 }
 
+#cut-button {
+  -moz-image-region: rect(0, 216px, 18px, 198px);
+}
+
+#copy-button {
+  -moz-image-region: rect(0, 234px, 18px, 216px);
+}
+
+#paste-button {
+  -moz-image-region: rect(0, 252px, 18px, 234px);
+}
+
 #fullscreen-button {
   -moz-image-region: rect(0, 270px, 18px, 252px);
 }
diff --git a/browser/themes/windows/customizableui/panelUIOverlay.css b/browser/themes/windows/customizableui/panelUIOverlay.css
index d8d27762e530..01560ef80a36 100644
--- a/browser/themes/windows/customizableui/panelUIOverlay.css
+++ b/browser/themes/windows/customizableui/panelUIOverlay.css
@@ -7,17 +7,17 @@
 
 %include ../../shared/customizableui/panelUIOverlay.inc.css
 
-#PanelUI-pageControls toolbarbutton {
+#PanelUI-contents #edit-controls toolbarbutton {
   list-style-image: url("chrome://browser/skin/Toolbar.png");
 }
 
-#PanelUI-cut-btn {
+#PanelUI-contents #cut-button {
   -moz-image-region: rect(0, 216px, 18px, 198px);
 }
-#PanelUI-copy-btn {
+#PanelUI-contents #copy-button {
   -moz-image-region: rect(0, 234px, 18px, 216px);
 }
-#PanelUI-paste-btn {
+#PanelUI-contents #paste-button {
   -moz-image-region: rect(0, 252px, 18px, 234px);
 }
 

From 571f89e2214afb5034e5f0f6b22645a7a13f8fd0 Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Tue, 4 Jun 2013 12:44:03 +0200
Subject: [PATCH 204/230] Bug 868433: make widgets use localization strings.
 r=mconley

---
 .../customizableui/src/CustomizableUI.jsm     | 47 ++++++++++++--
 .../src/CustomizableWidgets.jsm               | 53 +++++----------
 .../en-US/chrome/browser/browser.properties   |  3 -
 .../customizableWidgets.properties            | 64 +++++++++++++++++++
 browser/locales/jar.mn                        |  1 +
 5 files changed, 122 insertions(+), 46 deletions(-)
 create mode 100644 browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 5e58c7d7ee39..0362942ad013 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -15,6 +15,10 @@ XPCOMUtils.defineLazyModuleGetter(this, "CustomizableWidgets",
   "resource:///modules/CustomizableWidgets.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "DeferredTask",
   "resource://gre/modules/DeferredTask.jsm");
+XPCOMUtils.defineLazyGetter(this, "gWidgetsBundle", function() {
+  const kUrl = "chrome://browser/locale/customizableui/customizableWidgets.properties";
+  return Services.strings.createBundle(kUrl);
+});
 
 const kNSXUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
@@ -727,11 +731,12 @@ let CustomizableUIInternal = {
         node.setAttribute("disabled", true);
       }
       node.setAttribute("removable", aWidget.removable);
-      node.setAttribute("label", aWidget.name);
-      node.setAttribute("tooltiptext", aWidget.description);
+      node.setAttribute("label", this.getLocalizedProperty(aWidget, "label"));
+      node.setAttribute("tooltiptext", this.getLocalizedProperty(aWidget, "tooltiptext"));
       //XXXunf Need to hook this up to a <key> element or something.
-      if (aWidget.shortcut) {
-        node.setAttribute("acceltext", aWidget.shortcut);
+      let shortcut = this.getLocalizedProperty(aWidget, "shortcut");
+      if (shortcut) {
+        node.setAttribute("acceltext", shortcut);
       }
       node.setAttribute("class", "toolbarbutton-1 chromeclass-toolbar-additional");
 
@@ -769,6 +774,30 @@ let CustomizableUIInternal = {
     return node;
   },
 
+  getLocalizedProperty: function(aWidget, aProp, aFormatArgs, aDef) {
+    if (typeof aWidget == "string") {
+      aWidget = gPalette.get(aWidget);
+    }
+    if (!aWidget) {
+      throw new Error("getLocalizedProperty was passed a non-widget to work with.");
+    }
+    if (typeof aWidget[aProp] == "string") {
+      return aWidget[aProp];
+    }
+    let def = aDef || "";
+    let name = aWidget.id + "." + aProp;
+    try {
+      if (Array.isArray(aFormatArgs) && aFormatArgs.length) {
+        return gWidgetsBundle.formatStringFromName(name, aFormatArgs,
+          aFormatArgs.length) || def;
+      }
+      return gWidgetsBundle.GetStringFromName(name) || def;
+    } catch(ex) {
+      ERROR("Could not localize property '" + name + "'.");
+    }
+    return def;
+  },
+
   handleWidgetClick: function(aWidget, aNode, aEvent) {
     LOG("handleWidgetClick");
 
@@ -1257,15 +1286,17 @@ let CustomizableUIInternal = {
       return null;
     }
 
-    const kReqStringProps = ["id", "name"];
+    const kReqStringProps = ["id"];
     for (let prop of kReqStringProps) {
       if (typeof aData[prop] != "string") {
+        ERROR("Missing required property '" + prop + "' in normalizeWidget: "
+              + aData.id);
         return null;
       }
       widget[prop] = aData[prop];
     }
 
-    const kOptStringProps = ["description", "shortcut"];
+    const kOptStringProps = ["name", "tooltiptext", "shortcut"];
     for (let prop of kOptStringProps) {
       if (typeof aData[prop] == "string") {
         widget[prop] = aData[prop];
@@ -1687,6 +1718,10 @@ this.CustomizableUI = {
   },
   get inDefaultState() {
     return CustomizableUIInternal.inDefaultState;
+  },
+  getLocalizedProperty: function(aWidget, aProp, aFormatArgs, aDef) {
+    return CustomizableUIInternal.getLocalizedProperty(aWidget, aProp,
+      aFormatArgs, aDef);
   }
 };
 Object.freeze(this.CustomizableUI);
diff --git a/browser/components/customizableui/src/CustomizableWidgets.jsm b/browser/components/customizableui/src/CustomizableWidgets.jsm
index 5f74c5ccb2de..0ddff1ca0a80 100644
--- a/browser/components/customizableui/src/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/src/CustomizableWidgets.jsm
@@ -25,6 +25,8 @@ function setAttributes(aNode, aAttrs) {
       if (aNode.hasAttribute(name))
         aNode.removeAttribute(name);
     } else {
+      if (name == "label" || name == "tooltiptext")
+        value = CustomizableUI.getLocalizedProperty(aAttrs, name);
       aNode.setAttribute(name, value);
     }
   }
@@ -34,8 +36,6 @@ const CustomizableWidgets = [{
     id: "history-panelmenu",
     type: "view",
     viewId: "PanelUI-history",
-    name: "History...",
-    description: "History",
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
@@ -104,8 +104,6 @@ const CustomizableWidgets = [{
     }
   }, {
     id: "privatebrowsing-button",
-    name: "Private Browsing\u2026",
-    description: "Open a new Private Browsing window",
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL],
@@ -124,9 +122,6 @@ const CustomizableWidgets = [{
     }
   }, {
     id: "save-page-button",
-    name: "Save Page",
-    shortcut: "Ctrl+S",
-    description: "Save this page",
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL],
@@ -145,9 +140,6 @@ const CustomizableWidgets = [{
     }
   }, {
     id: "find-button",
-    name: "Find",
-    shortcut: "Ctrl+F",
-    description: "Find in this page",
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL],
@@ -166,9 +158,6 @@ const CustomizableWidgets = [{
     }
   }, {
     id: "open-file-button",
-    name: "Open File",
-    shortcut: "Ctrl+O",
-    description: "Open file",
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL],
@@ -187,9 +176,6 @@ const CustomizableWidgets = [{
     }
   }, {
     id: "developer-button",
-    name: "Developer",
-    shortcut: "Shift+F11",
-    description: "Toggle Developer Tools",
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL],
@@ -208,9 +194,6 @@ const CustomizableWidgets = [{
     }
   }, {
     id: "add-ons-button",
-    name: "Add-ons",
-    shortcut: "Ctrl+Shift+A",
-    description: "Add-ons Manager",
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL],
@@ -229,9 +212,6 @@ const CustomizableWidgets = [{
     }
   }, {
     id: "preferences-button",
-    name: "Preferences",
-    shortcut: "Ctrl+Shift+O",
-    description: "Preferences\u2026",
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL],
@@ -250,7 +230,6 @@ const CustomizableWidgets = [{
     }
   }, {
     id: "zoom-controls",
-    name: "Zoom Controls",
     type: "custom",
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
@@ -266,23 +245,23 @@ const CustomizableWidgets = [{
         command: "cmd_fullZoomReduce",
         flex: flex,
         class: cls,
-        label: "Zoom out",
-        tooltiptext: "Zoom out"
+        label: true,
+        tooltiptext: true
       }, {
         id: "zoom-reset-button",
         noautoclose: noautoclose,
         command: "cmd_fullZoomReset",
         flex: flex,
         class: cls,
-        tooltiptext: "Reset Zoom"
+        tooltiptext: true
       }, {
         id: "zoom-in-button",
         noautoclose: noautoclose,
         command: "cmd_fullZoomEnlarge",
         flex: flex,
         class: cls,
-        label: "Zoom in",
-        tooltiptext: "Zoom in"
+        label: true,
+        tooltiptext: true
       }];
 
       let node = aDocument.createElementNS(kNSXUL, "toolbaritem");
@@ -302,8 +281,9 @@ const CustomizableWidgets = [{
       let zoomResetButton = node.childNodes[1];
       let window = aDocument.defaultView;
       function updateZoomResetButton() {
-        zoomResetButton.setAttribute("label", window.gNavigatorBundle
-          .getFormattedString("zoomReset.label", [Math.floor(window.ZoomManager.zoom * 100)]));
+        zoomResetButton.setAttribute("label", CustomizableUI.getLocalizedProperty(
+          buttons[1], "label", [Math.floor(window.ZoomManager.zoom * 100)]
+        ));
       };
 
       // Register ourselves with the service so we know when the zoom prefs change.
@@ -375,7 +355,6 @@ const CustomizableWidgets = [{
     }
   }, {
     id: "edit-controls",
-    name: "Edit Controls",
     type: "custom",
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
@@ -389,22 +368,22 @@ const CustomizableWidgets = [{
         command: "cmd_cut",
         flex: flex,
         class: cls,
-        label: "Cut",
-        tooltiptext: "Cut"
+        label: true,
+        tooltiptext: true
       }, {
         id: "copy-button",
         command: "cmd_copy",
         flex: flex,
         class: cls,
-        label: "Copy",
-        tooltiptext: "Copy"
+        label: true,
+        tooltiptext: true
       }, {
         id: "paste-button",
         command: "cmd_paste",
         flex: flex,
         class: cls,
-        label: "Paste",
-        tooltiptext: "Paste"
+        label: true,
+        tooltiptext: true
       }];
 
       let node = aDocument.createElementNS(kNSXUL, "toolbaritem");
diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties
index 09e3132c7ac1..9707161df451 100644
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -465,6 +465,3 @@ slowStartup.helpButton.label = Learn How to Speed It Up
 slowStartup.helpButton.accesskey = L
 slowStartup.disableNotificationButton.label = Don't Tell Me Again
 slowStartup.disableNotificationButton.accesskey = A
-
-# LOCALIZATION NOTE(zoomReset.label): %S is the current zoom level.
-zoomReset.label = %S%%
diff --git a/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties b/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties
new file mode 100644
index 000000000000..af4bb723b1cf
--- /dev/null
+++ b/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties
@@ -0,0 +1,64 @@
+# 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/.
+
+history-panelmenu.label = History
+# LOCALIZATION NOTE (history-panelmenu.tooltiptext): Use the unicode ellipsis char,
+# \u2026, or use "..." if \u2026 doesn't suit traditions in your locale.
+history-panelmenu.tooltiptext = History…
+
+# LOCALIZATION NOTE (privatebrowsing-button.label): Use the unicode ellipsis char,
+# \u2026, or use "..." if \u2026 doesn't suit traditions in your locale.
+privatebrowsing-button.label = Private Browsing…
+privatebrowsing-button.tooltiptext = Open a new Private Browsing window
+
+save-page-button.label = Save Page
+save-page-button.tooltiptext = Save this page
+save-page-button.shortcut = Ctrl+S
+
+find-button.label = Find
+find-button.tooltiptext = Find in this page
+find-button.shortcut = Ctrl+F
+
+open-file-button.label = Open File
+open-file-button.tooltiptext = Open file
+open-file-button.shortcut = Ctrl+O
+
+developer-button.label = Developer
+developer-button.tooltiptext = Toggle Developer Tools
+developer-button.shortcut = Shift+F11
+
+add-ons-button.label = Add-ons
+add-ons-button.tooltiptext = Add-ons Manager
+add-ons-button.shortcut = Ctrl+Shift+A
+
+preferences-button.label = Preferences
+# LOCALIZATION NOTE (preferences-button.tooltiptext): Use the unicode ellipsis char,
+# \u2026, or use "..." if \u2026 doesn't suit traditions in your locale.
+preferences-button.tooltiptext = Preferences…
+preferences-button.shortcut = Ctrl+Shift+O
+
+zoom-controls.label = Zoom Controls
+zoom-controls.tooltiptext = Zoom Controls
+
+zoom-out-button.label = Zoom out
+zoom-out-button.tooltiptext = Zoom out
+
+# LOCALIZATION NOTE(zoom-reset-button.label): %S is the current zoom level.
+zoom-reset-button.label = %S%%
+zoom-reset-button.tooltiptext = Reset zoom level
+
+zoom-in-button.label = Zoom in
+zoom-in-button.tooltiptext = Zoom in
+
+edit-controls.label = Edit Controls
+edit-controls.tooltiptext = Edit Controls
+
+cut-button.label = Cut
+cut-button.tooltiptext = Cut
+
+copy-button.label = Copy
+copy-button.tooltiptext = Copy
+
+paste-button.label = Paste
+paste-button.tooltiptext = Paste
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
index 41757b27f993..18b2a7338611 100644
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -22,6 +22,7 @@
     locale/browser/browser.dtd                     (%chrome/browser/browser.dtd)
     locale/browser/baseMenuOverlay.dtd             (%chrome/browser/baseMenuOverlay.dtd)
     locale/browser/browser.properties              (%chrome/browser/browser.properties)
+    locale/browser/customizableui/customizableWidgets.properties (%chrome/browser/customizableui/customizableWidgets.properties)
     locale/browser/devtools/appcacheutils.properties  (%chrome/browser/devtools/appcacheutils.properties)
     locale/browser/devtools/debugger.dtd              (%chrome/browser/devtools/debugger.dtd)
     locale/browser/devtools/debugger.properties       (%chrome/browser/devtools/debugger.properties)

From 0dcd765c65d9aab84ded8656a987a4abf528f7b1 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Tue, 4 Jun 2013 12:52:50 +0200
Subject: [PATCH 205/230] Bug 879162 - menubar gap is too small when
 always-showing the menubar from the toolbar context menu, r=dao

---
 browser/components/customizableui/content/toolbar.xml | 3 +++
 toolkit/content/widgets/toolbar.xml                   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/browser/components/customizableui/content/toolbar.xml b/browser/components/customizableui/content/toolbar.xml
index 728b9d3076fe..3ad58962e91d 100644
--- a/browser/components/customizableui/content/toolbar.xml
+++ b/browser/components/customizableui/content/toolbar.xml
@@ -156,6 +156,9 @@
       <constructor>
         this._setInactive();
       </constructor>
+      <destructor>
+        this._setActive();
+      </destructor>
 
       <field name="_inactiveTimeout">null</field>
 
diff --git a/toolkit/content/widgets/toolbar.xml b/toolkit/content/widgets/toolbar.xml
index 45902f75881e..dc655153b124 100644
--- a/toolkit/content/widgets/toolbar.xml
+++ b/toolkit/content/widgets/toolbar.xml
@@ -409,6 +409,9 @@
       <constructor>
         this._setInactive();
       </constructor>
+      <destructor>
+        this._setActive();
+      </destructor>
 
       <field name="_inactiveTimeout">null</field>
 

From 7f1f361f6661679d71d3400c1addba4458b60f8d Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Mon, 3 Jun 2013 18:46:42 +0200
Subject: [PATCH 206/230] Bug 878824: check when edit controls are present,
 r=mconley

---
 browser/base/content/browser.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 1b435477e131..939206bb0c87 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -3354,14 +3354,13 @@ function updateEditUIVisibility()
   // The UI is visible if the Edit menu is opening or open, if the context menu
   // is open, or if the toolbar has been customized to include the Cut, Copy,
   // or Paste toolbar buttons.
-  // XXXgijs: this needs to be updated with the unified cut/copy/paste toolbarbutton
-  // once that is customizable! See bug 870901.
   gEditUIVisible = editMenuPopupState == "showing" ||
                    editMenuPopupState == "open" ||
                    contextMenuPopupState == "showing" ||
                    contextMenuPopupState == "open" ||
                    placesContextMenuPopupState == "showing" ||
-                   placesContextMenuPopupState == "open";
+                   placesContextMenuPopupState == "open" ||
+                   document.getElementById("edit-controls") ? true : false;
 
   // If UI is visible, update the edit commands' enabled state to reflect
   // whether or not they are actually enabled for the current focus/selection.

From c92703837cc57a15f8f115b534d0fc9206b46fd0 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Mon, 3 Jun 2013 22:13:34 +0200
Subject: [PATCH 207/230] Bug 878452 - dragging an item to an empty area should
 work, r=jaws

---
 .../customizableui/src/CustomizeMode.jsm      |  3 +
 .../customizableui/test/Makefile.in           |  1 +
 .../test/browser_878452_drag_to_panel.js      | 81 +++++++++++++++++++
 .../components/customizableui/test/head.js    | 43 +++++++++-
 4 files changed, 126 insertions(+), 2 deletions(-)
 create mode 100644 browser/components/customizableui/test/browser_878452_drag_to_panel.js

diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index c705eba6b4cf..5f32571c4a7c 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -777,6 +777,9 @@ CustomizeMode.prototype = {
   },
 
   _setDragActive: function(aItem, aValue, aWidth, aAtEnd) {
+    if (!aItem) {
+      return;
+    }
     let node = aItem;
     let window = aItem.ownerDocument.defaultView;
     let direction = window.getComputedStyle(aItem, null).direction;
diff --git a/browser/components/customizableui/test/Makefile.in b/browser/components/customizableui/test/Makefile.in
index 7a6a814e03b9..fe74e7d83c29 100644
--- a/browser/components/customizableui/test/Makefile.in
+++ b/browser/components/customizableui/test/Makefile.in
@@ -13,6 +13,7 @@ include $(DEPTH)/config/autoconf.mk
 MOCHITEST_BROWSER_FILES = \
   browser_873501_handle_specials.js \
   browser_877178_unregisterArea.js \
+  browser_878452_drag_to_panel.js \
   head.js \
   $(NULL)
 
diff --git a/browser/components/customizableui/test/browser_878452_drag_to_panel.js b/browser/components/customizableui/test/browser_878452_drag_to_panel.js
new file mode 100644
index 000000000000..7150a2dc43c4
--- /dev/null
+++ b/browser/components/customizableui/test/browser_878452_drag_to_panel.js
@@ -0,0 +1,81 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+let gTests = [
+  {
+    desc: "Dragging an item from the palette to another button in the panel should work.",
+    setup: startCustomizing,
+    run: function() {
+      let btn = document.getElementById("developer-button");
+      let panel = document.getElementById(CustomizableUI.AREA_PANEL);
+      let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
+
+      let lastButtonIndex = placements.length - 1;
+      let lastButton = placements[lastButtonIndex];
+      let placementsAfterInsert = placements.slice(0, lastButtonIndex).concat(["developer-button", lastButton]);
+      let lastButtonNode = document.getElementById(lastButton);
+      simulateItemDrag(btn, lastButtonNode);
+      assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterInsert);
+      ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
+      let palette = document.getElementById("customization-palette");
+      simulateItemDrag(btn, palette);
+      ok(CustomizableUI.inDefaultState, "Should be in default state again.");
+    },
+    teardown: endCustomizing
+  },
+  {
+    desc: "Dragging an item from the palette to the panel itself should also work.",
+    setup: startCustomizing,
+    run: function() {
+      let btn = document.getElementById("developer-button");
+      let panel = document.getElementById(CustomizableUI.AREA_PANEL);
+      let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
+
+      let placementsAfterAppend = placements.concat(["developer-button"]);
+      simulateItemDrag(btn, panel);
+      assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
+      ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
+      let palette = document.getElementById("customization-palette");
+      simulateItemDrag(btn, palette);
+      ok(CustomizableUI.inDefaultState, "Should be in default state again.");
+    },
+    teardown: endCustomizing
+  },
+  {
+    desc: "Dragging an item from the palette to an empty panel should also work.",
+    setup: function() {
+      let widgetIds = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
+      while (widgetIds.length) {
+        CustomizableUI.removeWidgetFromArea(widgetIds.shift());
+      }
+      return startCustomizing()
+    },
+    run: function() {
+      let btn = document.getElementById("developer-button");
+      let panel = document.getElementById(CustomizableUI.AREA_PANEL);
+
+      assertAreaPlacements(panel.id, []);
+
+      let placementsAfterAppend = ["developer-button"];
+      simulateItemDrag(btn, panel);
+      assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
+      ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
+      let palette = document.getElementById("customization-palette");
+      simulateItemDrag(btn, palette);
+      assertAreaPlacements(panel.id, []);
+    },
+    teardown: endCustomizing
+  }
+];
+
+function cleanup() {
+  resetCustomization();
+}
+
+function test() {
+  waitForExplicitFinish();
+  registerCleanupFunction(cleanup);
+  runTests(gTests);
+}
+
diff --git a/browser/components/customizableui/test/head.js b/browser/components/customizableui/test/head.js
index e55e558e2370..4047c2f2b1e5 100644
--- a/browser/components/customizableui/test/head.js
+++ b/browser/components/customizableui/test/head.js
@@ -5,9 +5,16 @@
 
 // Avoid leaks by using tmp for imports...
 let tmp = {};
+Cu.import("resource://gre/modules/commonjs/sdk/core/promise.js", tmp);
 Cu.import("resource://gre/modules/Task.jsm", tmp);
 Cu.import("resource:///modules/CustomizableUI.jsm", tmp);
-let {Task, CustomizableUI} = tmp;
+let {Promise, Task, CustomizableUI} = tmp;
+
+let ChromeUtils = {};
+let scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader);
+scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", ChromeUtils);
+
+let {synthesizeDragStart, synthesizeDrop} = ChromeUtils;
 
 const kNSXUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
@@ -41,12 +48,15 @@ function removeCustomToolbars() {
 
 function resetCustomization() {
   CustomizableUI.reset();
+  if (document.documentElement.hasAttribute("customizing")) {
+    window.gCustomizeMode.exit();
+  }
 }
 
 function assertAreaPlacements(areaId, expectedPlacements) {
   let actualPlacements = getAreaWidgetIds(areaId);
   is(actualPlacements.length, expectedPlacements.length,
-     "Area " + areaId + " should have the right number of items.");
+     "Area " + areaId + " should have " + expectedPlacements.length + " items.");
   let minItems = Math.min(expectedPlacements.length, actualPlacements.length);
   for (let i = 0; i < minItems; i++) {
     if (typeof expectedPlacements[i] == "string") {
@@ -68,6 +78,35 @@ function getAreaWidgetIds(areaId) {
   return widgetAry.map(x => x.id);
 }
 
+function simulateItemDrag(toDrag, target) {
+  let docId = toDrag.ownerDocument.documentElement.id;
+  let dragData = [[{type: 'text/toolbarwrapper-id/' + docId,
+                    data: {id: toDrag.id, width: toDrag.getBoundingClientRect().width + 'px'}}]];
+  synthesizeDragStart(toDrag.parentNode, dragData);
+  synthesizeDrop(target, target, dragData);
+}
+
+function endCustomizing() {
+  let deferred = Promise.defer();
+  function onCustomizationEnds(ev) {
+    window.gNavToolbox.removeEventListener("aftercustomization", onCustomizationEnds);
+    deferred.resolve(ev);
+  }
+  window.gNavToolbox.addEventListener("aftercustomization", onCustomizationEnds);
+  window.gCustomizeMode.exit();
+  return deferred.promise;
+}
+function startCustomizing() {
+  let deferred = Promise.defer();
+  function onCustomizing() {
+    window.gNavToolbox.removeEventListener("customizationready", onCustomizing);
+    deferred.resolve();
+  }
+  window.gNavToolbox.addEventListener("customizationready", onCustomizing);
+  window.gCustomizeMode.enter();
+  return deferred.promise;
+}
+
 function testRunner(testAry) {
   for (let test of testAry) {
     info(test.desc);

From 61caece9c9fca0cfdeffa8d4799262ad1fd38ddc Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Tue, 4 Jun 2013 21:07:14 +0200
Subject: [PATCH 208/230] Bug 879098 - fix test failures caused by bug 878452,
 r=mconley

---
 .../components/customizableui/test/head.js    | 33 ++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/browser/components/customizableui/test/head.js b/browser/components/customizableui/test/head.js
index 4047c2f2b1e5..8fb856ce7efb 100644
--- a/browser/components/customizableui/test/head.js
+++ b/browser/components/customizableui/test/head.js
@@ -47,9 +47,11 @@ function removeCustomToolbars() {
 }
 
 function resetCustomization() {
-  CustomizableUI.reset();
   if (document.documentElement.hasAttribute("customizing")) {
+    window.gCustomizeMode.reset();
     window.gCustomizeMode.exit();
+  } else {
+    CustomizableUI.reset();
   }
 }
 
@@ -87,15 +89,36 @@ function simulateItemDrag(toDrag, target) {
 }
 
 function endCustomizing() {
-  let deferred = Promise.defer();
-  function onCustomizationEnds(ev) {
+  let deferredEndCustomizing = Promise.defer();
+  function onCustomizationEnds() {
     window.gNavToolbox.removeEventListener("aftercustomization", onCustomizationEnds);
-    deferred.resolve(ev);
+    deferredEndCustomizing.resolve();
   }
   window.gNavToolbox.addEventListener("aftercustomization", onCustomizationEnds);
   window.gCustomizeMode.exit();
-  return deferred.promise;
+
+  let deferredLoadNewTab = Promise.defer();
+
+  //XXXgijs so some tests depend on this tab being about:blank. Make it so.
+  let newTabBrowser = window.gBrowser.selectedBrowser;
+  newTabBrowser.stop();
+
+  // If we stop early enough, this might actually be about:blank.
+  if (newTabBrowser.contentDocument.location.href == "about:blank") {
+    return deferredEndCustomizing.promise;
+  }
+
+  // Otherwise, make it be about:blank, and wait for that to be done.
+  function onNewTabLoaded(e) {
+    newTabBrowser.removeEventListener("load", onNewTabLoaded, true);
+    deferredLoadNewTab.resolve();
+  }
+  newTabBrowser.addEventListener("load", onNewTabLoaded, true);
+  newTabBrowser.contentDocument.location.replace("about:blank");
+
+  return Promise.all(deferredEndCustomizing.promise, deferredLoadNewTab.promise);
 }
+
 function startCustomizing() {
   let deferred = Promise.defer();
   function onCustomizing() {

From 84f1bd6b3db4b78291485b56a8168681dba2c9ba Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Tue, 4 Jun 2013 00:24:29 -0700
Subject: [PATCH 209/230] Bug 879147 - Don't move OS X titlebar placeholders in
 RTL mode. r=dao,mconley

---
 browser/base/content/browser.xul | 13 ++++---------
 browser/themes/osx/browser.css   | 10 ++++++++++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 0c4baabe2c4f..e345e815ab31 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -485,15 +485,13 @@
 
 #ifdef CAN_DRAW_IN_TITLEBAR
       <hbox class="titlebar-placeholder" type="caption-buttons"
-#ifdef XP_MACOSX
-            ordinal="0"
-#else
+#ifndef XP_MACOSX
             ordinal="1000"
 #endif
       />
 
 #ifdef XP_MACOSX
-      <hbox class="titlebar-placeholder" type="fullscreen-button" ordinal="1000"/>
+      <hbox class="titlebar-placeholder" type="fullscreen-button"/>
 #endif
 #endif
     </toolbar>
@@ -856,16 +854,13 @@
 
 #ifdef CAN_DRAW_IN_TITLEBAR
       <hbox class="titlebar-placeholder" type="caption-buttons"
-#ifdef XP_MACOSX
-            ordinal="0"
-#else
+#ifndef XP_MACOSX
             ordinal="1000"
 #endif
       />
 
 #ifdef XP_MACOSX
-      <hbox class="titlebar-placeholder" type="fullscreen-button"
-            ordinal="1000"/>
+      <hbox class="titlebar-placeholder" type="fullscreen-button"/>
 #endif
 #endif
     </toolbar>
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 270fa233236c..664036ace972 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -48,6 +48,16 @@
   display: none;
 }
 
+/* Fullscreen and caption buttons don't move with RTL on OS X so override the automatic ordering. */
+.titlebar-placeholder[type="fullscreen-button"]:-moz-locale-dir(ltr),
+.titlebar-placeholder[type="caption-buttons"]:-moz-locale-dir(rtl) {
+  -moz-box-ordinal-group: 1000;
+}
+.titlebar-placeholder[type="caption-buttons"]:-moz-locale-dir(ltr),
+.titlebar-placeholder[type="fullscreen-button"]:-moz-locale-dir(rtl) {
+  -moz-box-ordinal-group: 0;
+}
+
 #titlebar {
   padding-top: 9px;
 }

From 0bcd532042f10330b6bbfd39826b0cfc1de19809 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Tue, 4 Jun 2013 18:08:55 -0400
Subject: [PATCH 210/230] Bug 755593 - Remove tabs-on-bottom mode. r=dao

---
 browser/app/profile/firefox.js                |   1 -
 browser/base/content/browser-fullScreen.js    |   4 +-
 browser/base/content/browser-menubar.inc      |   5 -
 browser/base/content/browser-sets.inc         |   1 -
 browser/base/content/browser.css              |  16 --
 browser/base/content/browser.js               |  54 -------
 browser/base/content/browser.xul              | 144 +++++++++---------
 browser/base/content/tabbrowser.xml           |   7 +-
 .../base/content/test/browser_bug462289.js    |  13 +-
 .../locales/en-US/chrome/browser/browser.dtd  |   2 -
 browser/themes/linux/browser.css              |  30 +---
 browser/themes/osx/browser.css                |  83 ++--------
 browser/themes/windows/browser-aero.css       |  94 +++---------
 browser/themes/windows/browser.css            |  12 +-
 .../windows/downloads/downloads-aero.css      |  21 +--
 15 files changed, 121 insertions(+), 366 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index daf28545ad94..4c19be630532 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -413,7 +413,6 @@ pref("browser.tabs.loadDivertedInBackground", false);
 pref("browser.tabs.loadBookmarksInBackground", false);
 pref("browser.tabs.tabClipWidth", 140);
 pref("browser.tabs.animate", true);
-pref("browser.tabs.onTop", true);
 #ifdef UNIX_BUT_NOT_MAC
 pref("browser.tabs.drawInTitlebar", false);
 #else
diff --git a/browser/base/content/browser-fullScreen.js b/browser/base/content/browser-fullScreen.js
index 83357c01af0d..7c7ba383e75c 100644
--- a/browser/base/content/browser-fullScreen.js
+++ b/browser/base/content/browser-fullScreen.js
@@ -571,11 +571,9 @@ var FullScreen = {
       document.documentElement.setAttribute("inFullscreen", true);
     }
 
-    // In tabs-on-top mode, move window controls to the tab bar,
-    // and in tabs-on-bottom mode, move them back to the navigation toolbar.
     var fullscreenctls = document.getElementById("window-controls");
     var navbar = document.getElementById("nav-bar");
-    var ctlsOnTabbar = window.toolbar.visible && (navbar.collapsed || TabsOnTop.enabled);
+    var ctlsOnTabbar = window.toolbar.visible;
     if (fullscreenctls.parentNode == navbar && ctlsOnTabbar) {
       fullscreenctls.removeAttribute("flex");
       document.getElementById("TabsToolbar").appendChild(fullscreenctls);
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index 56cf72ceb8d9..bf565647ef48 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -185,11 +185,6 @@
                       accesskey="&viewToolbarsMenu.accesskey;">
                   <menupopup onpopupshowing="onViewToolbarsPopupShowing(event);">
                     <menuseparator/>
-                    <menuitem id="menu_tabsOnTop"
-                              command="cmd_ToggleTabsOnTop"
-                              type="checkbox"
-                              label="&viewTabsOnTop.label;"
-                              accesskey="&viewTabsOnTop.accesskey;"/>
                     <menuitem id="menu_customizeToolbars"
                               label="&viewCustomizeToolbar.label;"
                               accesskey="&viewCustomizeToolbar.accesskey;"
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 66191182e5df..6fda74085a68 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -32,7 +32,6 @@
     <command id="cmd_printPreview" oncommand="PrintUtils.printPreview(PrintPreviewListener);"/>
     <command id="cmd_close" oncommand="BrowserCloseTabOrWindow()"/>
     <command id="cmd_closeWindow" oncommand="BrowserTryToCloseWindow()"/>
-    <command id="cmd_ToggleTabsOnTop" oncommand="TabsOnTop.toggle()"/>
     <command id="cmd_CustomizeToolbars" oncommand="BrowserCustomizeToolbar()"/>
     <command id="cmd_quitApplication" oncommand="goQuitApplication()"/>
 
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 89b8cdc5fd4f..0f140e4a5cae 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -117,14 +117,6 @@ toolbar[printpreview="true"] {
   -moz-binding: url("chrome://global/content/printPreviewBindings.xml#printpreviewtoolbar");
 }
 
-#toolbar-menubar {
-  -moz-box-ordinal-group: 5;
-}
-
-#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar) {
-  -moz-box-ordinal-group: 50;
-}
-
 toolbar[overflowable] > .customization-target {
   overflow: hidden;
 }
@@ -134,14 +126,6 @@ toolbar[overflowable]:not([overflowing]) > .overflow-button {
   display: none;
 }
 
-#TabsToolbar {
-  -moz-box-ordinal-group: 100;
-}
-
-#TabsToolbar[tabsontop="true"] {
-  -moz-box-ordinal-group: 10;
-}
-
 %ifdef CAN_DRAW_IN_TITLEBAR
 #main-window[inFullscreen] > #titlebar,
 #main-window[inFullscreen] .titlebar-placeholder,
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 939206bb0c87..91c5a3724003 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -949,7 +949,6 @@ var gBrowserInit = {
 
     // Misc. inits.
     CombinedStopReload.init();
-    TabsOnTop.init();
     gPrivateBrowsingUI.init();
     TabsInTitlebar.init();
     retrieveToolbarIconsizesFromTheme();
@@ -1302,8 +1301,6 @@ var gBrowserInit = {
 
     BookmarkingUI.uninit();
 
-    TabsOnTop.uninit();
-
     TabsInTitlebar.uninit();
 
     var enumerator = Services.wm.getEnumerator(null);
@@ -4326,57 +4323,6 @@ function setToolbarVisibility(toolbar, isVisible) {
 #endif
 }
 
-var TabsOnTop = {
-  init: function TabsOnTop_init() {
-    Services.prefs.addObserver(this._prefName, this, false);
-
-    // Only show the toggle UI if the user disabled tabs on top.
-    if (Services.prefs.getBoolPref(this._prefName)) {
-      for (let item of document.querySelectorAll("menuitem[command=cmd_ToggleTabsOnTop]"))
-        item.parentNode.removeChild(item);
-    }
-  },
-
-  uninit: function TabsOnTop_uninit() {
-    Services.prefs.removeObserver(this._prefName, this);
-  },
-
-  toggle: function () {
-    this.enabled = !Services.prefs.getBoolPref(this._prefName);
-  },
-
-  syncUI: function () {
-    let userEnabled = Services.prefs.getBoolPref(this._prefName);
-    let enabled = userEnabled && gBrowser.tabContainer.visible;
-
-    document.getElementById("cmd_ToggleTabsOnTop")
-            .setAttribute("checked", userEnabled);
-
-    document.documentElement.setAttribute("tabsontop", enabled);
-    document.getElementById("navigator-toolbox").setAttribute("tabsontop", enabled);
-    document.getElementById("TabsToolbar").setAttribute("tabsontop", enabled);
-    document.getElementById("nav-bar").setAttribute("tabsontop", enabled);
-    gBrowser.tabContainer.setAttribute("tabsontop", enabled);
-    TabsInTitlebar.allowedBy("tabs-on-top", enabled);
-  },
-
-  get enabled () {
-    return gNavToolbox.getAttribute("tabsontop") == "true";
-  },
-
-  set enabled (val) {
-    Services.prefs.setBoolPref(this._prefName, !!val);
-    return val;
-  },
-
-  observe: function (subject, topic, data) {
-    if (topic == "nsPref:changed")
-      this.syncUI();
-  },
-
-  _prefName: "browser.tabs.onTop"
-}
-
 var TabsInTitlebar = {
   init: function () {
 #ifdef CAN_DRAW_IN_TITLEBAR
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index e345e815ab31..421e627021c1 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -243,10 +243,6 @@
     <menupopup id="toolbar-context-menu"
                onpopupshowing="onViewToolbarsPopupShowing(event);">
       <menuseparator/>
-      <menuitem command="cmd_ToggleTabsOnTop"
-                type="checkbox"
-                label="&viewTabsOnTop.label;"
-                accesskey="&viewTabsOnTop.accesskey;"/>
       <menuitem command="cmd_CustomizeToolbars"
                 label="&viewCustomizeToolbar.label;"
                 accesskey="&viewCustomizeToolbar.accesskey;"/>
@@ -490,6 +486,76 @@
 #endif
       />
 
+#ifdef XP_MACOSX
+      <hbox class="titlebar-placeholder" type="fullscreen-button"/>
+#endif
+#endif
+    </toolbar>
+
+    <toolbar id="TabsToolbar"
+             class="toolbar-primary"
+             fullscreentoolbar="true"
+             customizable="true"
+             mode="icons" lockmode="true"
+             iconsize="small" defaulticonsize="small" lockiconsize="true"
+             aria-label="&tabsToolbar.label;"
+             context="toolbar-context-menu"
+             defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton"
+             collapsed="true">
+
+      <tabs id="tabbrowser-tabs"
+            class="tabbrowser-tabs"
+            tabbrowser="content"
+            flex="1"
+            setfocus="false"
+            tooltip="tabbrowser-tab-tooltip"
+            stopwatchid="FX_TAB_CLICK_MS">
+        <tab class="tabbrowser-tab" selected="true" fadein="true"/>
+      </tabs>
+
+      <toolbarbutton id="new-tab-button"
+                     class="toolbarbutton-1 chromeclass-toolbar-additional"
+                     label="&tabCmd.label;"
+                     command="cmd_newNavigatorTab"
+                     onclick="checkForMiddleClick(this, event);"
+                     tooltiptext="&newTabButton.tooltip;"
+                     ondrop="newTabButtonObserver.onDrop(event)"
+                     ondragover="newTabButtonObserver.onDragOver(event)"
+                     ondragenter="newTabButtonObserver.onDragOver(event)"
+                     ondragexit="newTabButtonObserver.onDragExit(event)"
+                     removable="true"/>
+
+      <toolbarbutton id="alltabs-button"
+                     class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button"
+                     type="menu"
+                     label="&listAllTabs.label;"
+                     tooltiptext="&listAllTabs.label;"
+                     removable="true">
+        <menupopup id="alltabs-popup"
+                   position="after_end">
+          <menuitem id="menu_tabview"
+                    class="menuitem-iconic"
+                    key="key_tabview"
+                    label="&viewTabGroups.label;"
+                    command="Browser:ToggleTabView"
+                    observes="tabviewGroupsNumber"/>
+          <menuseparator id="alltabs-popup-separator"/>
+        </menupopup>
+      </toolbarbutton>
+
+      <toolbarbutton id="tabs-closebutton"
+                     class="close-button tabs-closebutton"
+                     command="cmd_close"
+                     label="&closeTab.label;"
+                     tooltiptext="&closeTab.label;"/>
+
+#ifdef CAN_DRAW_IN_TITLEBAR
+      <hbox class="titlebar-placeholder" type="caption-buttons"
+#ifndef XP_MACOSX
+            ordinal="1000"
+#endif
+      />
+
 #ifdef XP_MACOSX
       <hbox class="titlebar-placeholder" type="fullscreen-button"/>
 #endif
@@ -795,76 +861,6 @@
       </toolbaritem>
     </toolbar>
 
-    <toolbar id="TabsToolbar"
-             class="toolbar-primary"
-             fullscreentoolbar="true"
-             customizable="true"
-             mode="icons" lockmode="true"
-             iconsize="small" defaulticonsize="small" lockiconsize="true"
-             aria-label="&tabsToolbar.label;"
-             context="toolbar-context-menu"
-             defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton"
-             collapsed="true">
-
-      <tabs id="tabbrowser-tabs"
-            class="tabbrowser-tabs"
-            tabbrowser="content"
-            flex="1"
-            setfocus="false"
-            tooltip="tabbrowser-tab-tooltip"
-            stopwatchid="FX_TAB_CLICK_MS">
-        <tab class="tabbrowser-tab" selected="true" fadein="true"/>
-      </tabs>
-
-      <toolbarbutton id="new-tab-button"
-                     class="toolbarbutton-1 chromeclass-toolbar-additional"
-                     label="&tabCmd.label;"
-                     command="cmd_newNavigatorTab"
-                     onclick="checkForMiddleClick(this, event);"
-                     tooltiptext="&newTabButton.tooltip;"
-                     ondrop="newTabButtonObserver.onDrop(event)"
-                     ondragover="newTabButtonObserver.onDragOver(event)"
-                     ondragenter="newTabButtonObserver.onDragOver(event)"
-                     ondragexit="newTabButtonObserver.onDragExit(event)"
-                     removable="true"/>
-
-      <toolbarbutton id="alltabs-button"
-                     class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button"
-                     type="menu"
-                     label="&listAllTabs.label;"
-                     tooltiptext="&listAllTabs.label;"
-                     removable="true">
-        <menupopup id="alltabs-popup"
-                   position="after_end">
-          <menuitem id="menu_tabview"
-                    class="menuitem-iconic"
-                    key="key_tabview"
-                    label="&viewTabGroups.label;"
-                    command="Browser:ToggleTabView"
-                    observes="tabviewGroupsNumber"/>
-          <menuseparator id="alltabs-popup-separator"/>
-        </menupopup>
-      </toolbarbutton>
-
-      <toolbarbutton id="tabs-closebutton"
-                     class="close-button tabs-closebutton"
-                     command="cmd_close"
-                     label="&closeTab.label;"
-                     tooltiptext="&closeTab.label;"/>
-
-#ifdef CAN_DRAW_IN_TITLEBAR
-      <hbox class="titlebar-placeholder" type="caption-buttons"
-#ifndef XP_MACOSX
-            ordinal="1000"
-#endif
-      />
-
-#ifdef XP_MACOSX
-      <hbox class="titlebar-placeholder" type="fullscreen-button"/>
-#endif
-#endif
-    </toolbar>
-
     <toolbarpalette id="BrowserToolbarPalette">
 
 # Update primaryToolbarButtons in browser/themes/shared/browser.inc when adding
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 29bd7a7d9733..cd1806e7b865 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -3144,10 +3144,6 @@
           document.getElementById("menu_close").setAttribute("label",
             this.tabbrowser.mStringBundle.getString(visible ? "tabs.closeTab" : "tabs.close"));
 
-          goSetCommandEnabled("cmd_ToggleTabsOnTop", visible);
-
-          TabsOnTop.syncUI();
-
           TabsInTitlebar.allowedBy("tabs-visible", visible);
         ]]></body>
       </method>
@@ -3788,8 +3784,7 @@
         // When the tabbar has an unified appearance with the titlebar
         // and menubar, a double-click in it should have the same behavior
         // as double-clicking the titlebar
-        if (TabsInTitlebar.enabled ||
-            (TabsOnTop.enabled && this.parentNode._dragBindingAlive))
+        if (TabsInTitlebar.enabled || this.parentNode._dragBindingAlive)
           return;
 #endif
 
diff --git a/browser/base/content/test/browser_bug462289.js b/browser/base/content/test/browser_bug462289.js
index fcde120ffc64..eee46c01e117 100644
--- a/browser/base/content/test/browser_bug462289.js
+++ b/browser/base/content/test/browser_bug462289.js
@@ -34,16 +34,9 @@ function step3()
   is(gBrowser.selectedTab, tab1, "2nd click on selected tab1 keeps tab selected");
   isnot(document.activeElement, tab1, "2nd click on selected tab1 does not activate tab");
 
-  if (gNavToolbox.getAttribute("tabsontop") == "true") {
-    ok(true, "[tabsontop=true] focusing URLBar then sending 1 Shift+Tab.");
-    gURLBar.focus();
-    EventUtils.synthesizeKey("VK_TAB", {shiftKey: true});
-  } else {
-    ok(true, "[tabsontop=false] focusing SearchBar then sending Tab(s) until out of nav-bar.");
-    document.getElementById("searchbar").focus();
-    while (focus_in_navbar())
-      EventUtils.synthesizeKey("VK_TAB", { });
-  }
+  ok(true, "focusing URLBar then sending 1 Shift+Tab.");
+  gURLBar.focus();
+  EventUtils.synthesizeKey("VK_TAB", {shiftKey: true});
   is(gBrowser.selectedTab, tab1, "tab key to selected tab1 keeps tab selected");
   is(document.activeElement, tab1, "tab key to selected tab1 activates tab");
 
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 445488b6ed21..c3dcb0e07671 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -304,8 +304,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY viewSidebarMenu.accesskey "e">
 <!ENTITY viewCustomizeToolbar.label       "Customize…"> 
 <!ENTITY viewCustomizeToolbar.accesskey     "C">
-<!ENTITY viewTabsOnTop.label            "Tabs on Top">
-<!ENTITY viewTabsOnTop.accesskey        "T">
 
 <!ENTITY historyMenu.label "History">
 <!ENTITY historyMenu.accesskey "s">
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 1bba6096e4db..1d65fdbd69fc 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -31,14 +31,10 @@
   -moz-appearance: none;
   background-color: transparent;
   border-top: none;
-}
-
-#navigator-toolbox[tabsontop=true] {
   border-bottom: 1px solid ThreeDShadow;
 }
 
-#navigator-toolbox[tabsontop=true] > toolbar:not(:-moz-lwtheme):not(#toolbar-menubar):not(#TabsToolbar),
-#navigator-toolbox[tabsontop=false] > toolbar:not(:-moz-lwtheme):not(#toolbar-menubar) {
+#navigator-toolbox > toolbar:not(:-moz-lwtheme):not(#toolbar-menubar):not(#TabsToolbar) {
   -moz-appearance: none;
   border-style: none;
   background-color: -moz-Dialog;
@@ -49,18 +45,10 @@
   padding-bottom: 1px;
 }
 
-#nav-bar:not(:-moz-lwtheme),
-#nav-bar[collapsed=true] + toolbar:not(:-moz-lwtheme),
-#nav-bar[collapsed=true] + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme),
-#nav-bar[tabsontop=true],
-#nav-bar[tabsontop=true][collapsed=true] + toolbar,
-#nav-bar[tabsontop=true][collapsed=true] + #customToolbars + #PersonalToolbar {
+#nav-bar,
+#nav-bar[collapsed=true] + toolbar,
+#nav-bar[collapsed=true] + #customToolbars + #PersonalToolbar {
   background-image: linear-gradient(@toolbarHighlight@, rgba(255,255,255,0));
-}
-
-#nav-bar[tabsontop=true],
-#nav-bar[tabsontop=true][collapsed=true] + toolbar,
-#nav-bar[tabsontop=true][collapsed=true] + #customToolbars + #PersonalToolbar {
   box-shadow: 0 1px 0 @toolbarHighlight@ inset;
   margin-top: -1px; /* Move up 1px into the TabsToolbar */
   /* Position the toolbar above the bottom of background tabs */
@@ -1621,24 +1609,20 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   border-bottom: 1px solid hsla(0,0%,0%,.3);
 }
 
-#TabsToolbar[tabsontop=true]:not(:-moz-lwtheme) {
+#TabsToolbar:not(:-moz-lwtheme) {
   -moz-appearance: menubar;
   color: -moz-menubartext;
 }
 
 #toolbar-menubar:not([autohide="true"]):not(:-moz-lwtheme):-moz-system-metric(menubar-drag),
-#TabsToolbar[tabsontop=true]:not(:-moz-lwtheme):-moz-system-metric(menubar-drag) {
+#TabsToolbar:not(:-moz-lwtheme):-moz-system-metric(menubar-drag) {
   -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-drag");
 }
 
-#TabsToolbar[tabsontop=true]:not(:-moz-lwtheme) > #tabbrowser-tabs > .tabbrowser-tab:not([selected]) {
+#TabsToolbar:not(:-moz-lwtheme) > #tabbrowser-tabs > .tabbrowser-tab:not([selected]) {
   color: -moz-menubartext;
 }
 
-#TabsToolbar[tabsontop=false] {
-  background-image: linear-gradient(to top, rgba(0,0,0,.3) 1px, rgba(0,0,0,.05) 1px, transparent 50%);
-}
-
 .tabbrowser-tab:-moz-lwtheme {
   color: inherit;
 }
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 664036ace972..f64702ffd070 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -26,19 +26,12 @@
   height: 2px;
   margin-top: -2px;
 }
-#navigator-toolbox[tabsontop=false]::after {
-  visibility: collapse;
-}
 
 #navigator-toolbox toolbarbutton:-moz-lwtheme {
   color: inherit;
   text-shadow: inherit;
 }
 
-#main-window[privatebrowsingmode=temporary] #nav-bar[tabsontop=false] {
-  -moz-appearance: none !important;
-}
-
 #main-window {
   -moz-appearance: none;
   background-color: #eeeeee;
@@ -85,7 +78,7 @@ toolbarseparator {
   min-height: 22px;
 }
 
-toolbox[tabsontop=true] > toolbar:not(#TabsToolbar):not(#nav-bar):not(:-moz-lwtheme) {
+#navigator-toolbox > toolbar:not(#TabsToolbar):not(#nav-bar):not(:-moz-lwtheme) {
   -moz-appearance: none;
   background: url(chrome://browser/skin/Toolbar-background-noise.png) hsl(0,0%,83%);
 }
@@ -94,9 +87,9 @@ toolbox[tabsontop=true] > toolbar:not(#TabsToolbar):not(#nav-bar):not(:-moz-lwth
   padding-bottom: 4px !important;
 }
 
-#nav-bar[tabsontop=true],
-#nav-bar[tabsontop=true][collapsed=true] + toolbar,
-#nav-bar[tabsontop=true][collapsed=true] + #customToolbars + #PersonalToolbar {
+#nav-bar,
+#nav-bar[collapsed=true] + toolbar,
+#nav-bar[collapsed=true] + #customToolbars + #PersonalToolbar {
   -moz-appearance: none;
   padding-top: 4px !important;
   background: url(chrome://browser/skin/Toolbar-background-noise.png),
@@ -110,15 +103,15 @@ toolbox[tabsontop=true] > toolbar:not(#TabsToolbar):not(#nav-bar):not(:-moz-lwth
   z-index: 1;
 }
 
-#navigator-toolbox[tabsontop=true] > toolbar:not(#TabsToolbar):-moz-lwtheme {
+#navigator-toolbox > toolbar:not(#TabsToolbar):-moz-lwtheme {
   background-color: @toolbarColorLWT@;
   background-image: url(chrome://browser/skin/Toolbar-background-noise.png);
 }
 
 #PersonalToolbar:not(:-moz-lwtheme):-moz-window-inactive,
-#nav-bar[tabsontop=true]:not(:-moz-lwtheme):-moz-window-inactive,
-#nav-bar[tabsontop=true][collapsed=true] + toolbar:not(:-moz-lwtheme):-moz-window-inactive,
-#nav-bar[tabsontop=true][collapsed=true] + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme):-moz-window-inactive {
+#nav-bar:not(:-moz-lwtheme):-moz-window-inactive,
+#nav-bar[collapsed=true] + toolbar:not(:-moz-lwtheme):-moz-window-inactive,
+#nav-bar[collapsed=true] + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme):-moz-window-inactive {
   background-color: -moz-mac-chrome-inactive;
 }
 
@@ -1508,14 +1501,6 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   -moz-image-region: rect(11px, 16px, 22px, 0);
 }
 
-window[tabsontop="false"] richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-icon {
-  -moz-image-region: rect(0, 32px, 11px, 16px);
-}
-
-window[tabsontop="false"] richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-box > .ac-action-icon {
-  -moz-image-region: rect(11px, 32px, 22px, 16px);
-}
-
 @media (min-resolution: 2dppx) {
   .ac-result-type-bookmark {
     list-style-image: url("chrome://browser/skin/places/star-icons@2x.png");
@@ -1540,14 +1525,6 @@ window[tabsontop="false"] richlistitem[type~="action"][actiontype="switchtab"][s
   richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-box > .ac-action-icon {
     -moz-image-region: rect(22px, 32px, 44px, 0);
   }
-
-  window[tabsontop="false"] richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-icon {
-    -moz-image-region: rect(0, 64px, 22px, 32px);
-  }
-
-  window[tabsontop="false"] richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-box > .ac-action-icon {
-    -moz-image-region: rect(22px, 64px, 44px, 32px);
-  }
 }
 
 .autocomplete-treebody::-moz-tree-cell-text(treecolAutoCompleteComment) {
@@ -2268,9 +2245,6 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   color: #333;
 }
 
-%define TABSONTOP_NEWTAB_BUTTON #tabbrowser-tabs[tabsontop="true"] > .tabbrowser-arrowscrollbox > .tabs-newtab-button
-%define TABSONBOTTOM_NEWTAB_BUTTON #tabbrowser-tabs[tabsontop="false"] > .tabbrowser-arrowscrollbox > .tabs-newtab-button
-
 .tabbrowser-tabs[closebuttons="hidden"] > * > * > * > .tab-close-button:not([pinned]) {
   display: -moz-box;
   visibility: hidden;
@@ -2291,7 +2265,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   text-shadow: inherit;
 }
 
-#main-window:not([privatebrowsingmode=temporary]):not([customizing]):not([customize-exiting]) #navigator-toolbox[tabsontop="true"]:not(:-moz-lwtheme)::before {
+#main-window:not([privatebrowsingmode=temporary]):not([customizing]):not([customize-exiting]) #navigator-toolbox:not(:-moz-lwtheme)::before {
   /* We want the titlebar to be unified, but we still want to be able
    * to give #TabsToolbar a background. So we can't set -moz-appearance:
    * toolbar on #TabsToolbar itself. Instead, we set it on a box of the
@@ -2310,11 +2284,6 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   background-repeat: repeat-x;
 }
 
-#TabsToolbar[tabsontop="false"] {
-  margin-top: -2px;
-  padding-top: 2px;
-}
-
 /*
  * Draw the bottom border of the tabstrip:
  */
@@ -2334,29 +2303,14 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   border-bottom: 1px solid hsla(0,0%,0%,.3);
 }
 
-/* In tabs-on-bottom mode, fill the whole toolbar with the chrome
- * background color.
- */
-#TabsToolbar[tabsontop="false"]:not(:-moz-lwtheme) {
-  background: -moz-mac-chrome-active;
-}
-
-#TabsToolbar[tabsontop="false"]:not(:-moz-lwtheme):-moz-window-inactive {
-  background: -moz-mac-chrome-inactive;
-}
-
 #tabbrowser-tabs {
   -moz-box-align: stretch;
 }
 
-@TABSONTOP_NEWTAB_BUTTON@ > .toolbarbutton-icon {
+.tabs-newtab-button > .toolbarbutton-icon {
   padding: 6px 0 4px;
 }
 
-@TABSONBOTTOM_NEWTAB_BUTTON@ > .toolbarbutton-icon {
-  padding: 4px 0 6px;
-}
-
 /**
  * Tab Drag and Drop
  */
@@ -2426,13 +2380,6 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   border: none;
 }
 
-#tabbrowser-tabs[tabsontop=false] > .tabbrowser-arrowscrollbox > .scrollbutton-up,
-#tabbrowser-tabs[tabsontop=false] > .tabbrowser-arrowscrollbox > .scrollbutton-down,
-#tabbrowser-tabs[tabsontop=false] > .tabbrowser-arrowscrollbox > .scrollbutton-up > .toolbarbutton-icon,
-#tabbrowser-tabs[tabsontop=false] > .tabbrowser-arrowscrollbox > .scrollbutton-down > .toolbarbutton-icon {
-  transform: scaleY(-1);
-}
-
 .tabbrowser-arrowscrollbox > .scrollbutton-up {
   -moz-border-end: 2px solid transparent;
 }
@@ -3328,7 +3275,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 
 /* Lion Fullscreen window styling */
 @media (-moz-mac-lion-theme) {
-  #navigator-toolbox[inFullscreen][tabsontop="true"]:not(:-moz-lwtheme)::before {
+  #navigator-toolbox[inFullscreen]:not(:-moz-lwtheme)::before {
     height: 36px;
   }
   #main-window[inFullscreen]:-moz-lwtheme {
@@ -3907,12 +3854,8 @@ panel[type="arrow"][popupid="click-to-play-plugins"] > .panel-arrowcontainer > .
   background-color: -moz-mac-chrome-inactive;
 }
 
-#main-window[privatebrowsingmode=temporary][inFullscreen] #nav-bar[tabsontop=false] {
-  -moz-padding-end: 50px !important;
-}
-
 @media (-moz-mac-lion-theme) {
-  #main-window[privatebrowsingmode=temporary][inFullscreen] #TabsToolbar[tabsontop=true] {
+  #main-window[privatebrowsingmode=temporary][inFullscreen] #TabsToolbar {
     -moz-padding-end: 50px;
   }
 }
@@ -3922,7 +3865,7 @@ panel[type="arrow"][popupid="click-to-play-plugins"] > .panel-arrowcontainer > .
     background-position: top right 10px;
   }
 
-  #main-window[privatebrowsingmode=temporary][inFullscreen][tabsontop=true] #window-controls {
+  #main-window[privatebrowsingmode=temporary][inFullscreen] #window-controls {
     -moz-padding-end: 50px;
   }
 }
diff --git a/browser/themes/windows/browser-aero.css b/browser/themes/windows/browser-aero.css
index 349160bffb50..e38f6d133775 100644
--- a/browser/themes/windows/browser-aero.css
+++ b/browser/themes/windows/browser-aero.css
@@ -42,18 +42,18 @@
     background-color: #aabccf;
   }
 
-  #navigator-toolbox[tabsontop=true] #urlbar:not(:-moz-lwtheme),
-  #navigator-toolbox[tabsontop=true] .searchbar-textbox:not(:-moz-lwtheme) {
+  #urlbar:not(:-moz-lwtheme),
+  .searchbar-textbox:not(:-moz-lwtheme) {
     border-color: hsla(210,54%,20%,.25) hsla(210,54%,20%,.27) hsla(210,54%,20%,.3);
   }
 
-  #navigator-toolbox[tabsontop=true] #urlbar:not(:-moz-lwtheme):not([focused]):hover,
-  #navigator-toolbox[tabsontop=true] .searchbar-textbox:not(:-moz-lwtheme):not([focused]):hover {
+  #urlbar:not(:-moz-lwtheme):not([focused]):hover,
+  .searchbar-textbox:not(:-moz-lwtheme):not([focused]):hover {
     border-color: hsla(210,54%,20%,.35) hsla(210,54%,20%,.37) hsla(210,54%,20%,.4);
   }
 
-  #navigator-toolbox[tabsontop=true] #urlbar:not(:-moz-lwtheme)[focused],
-  #navigator-toolbox[tabsontop=true] .searchbar-textbox:not(:-moz-lwtheme)[focused] {
+  #urlbar:not(:-moz-lwtheme)[focused],
+  .searchbar-textbox:not(:-moz-lwtheme)[focused] {
     border-color: hsla(206,100%,60%,.65) hsla(206,100%,55%,.65) hsla(206,100%,50%,.65);
   }
 
@@ -120,9 +120,7 @@
   }
 
   #toolbar-menubar:not(:-moz-lwtheme),
-  #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme),
-  #nav-bar[tabsontop=false]:not(:-moz-lwtheme),
-  #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child:not(:-moz-lwtheme) {
+  #TabsToolbar:not(:-moz-lwtheme) {
     background-color: transparent !important;
     color: black;
     text-shadow: 0 0 .5em white, 0 0 .5em white, 0 1px 0 rgba(255,255,255,.4);
@@ -130,22 +128,9 @@
     border-right-style: none !important;
   }
 
-  #navigator-toolbox[tabsontop=false] > :-moz-any(#toolbar-menubar, #nav-bar) :-moz-any(@primaryToolbarButtons@):not(:-moz-any(#alltabs-button,#tabview-button,#sync-button[status],#bookmarks-menu-button)) > .toolbarbutton-icon:not(:-moz-lwtheme),
-  #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child :-moz-any(@primaryToolbarButtons@):not(:-moz-any(#alltabs-button,#tabview-button,#new-tab-button,#sync-button[status],#bookmarks-menu-button)) > .toolbarbutton-icon:not(:-moz-lwtheme) {
-    list-style-image: url("chrome://browser/skin/Toolbar-inverted.png");
-  }
-
-  #navigator-toolbox[tabsontop=false] > :-moz-any(#toolbar-menubar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menu-dropmarker:not(:-moz-lwtheme),
-  #navigator-toolbox[tabsontop=false] > :-moz-any(#toolbar-menubar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:not(:-moz-lwtheme),
-  #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child .toolbarbutton-1 > .toolbarbutton-menu-dropmarker:not(:-moz-lwtheme),
-  #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:not(:-moz-lwtheme) {
-    list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png");
-  }
-
   /* Vertical toolbar border */
   #main-window[sizemode=normal] #navigator-toolbox::after,
-  #main-window[sizemode=normal] #navigator-toolbox[tabsontop=true] > toolbar:not(#toolbar-menubar):not(#TabsToolbar),
-  #main-window[sizemode=normal] #navigator-toolbox[tabsontop=false] > toolbar:not(#toolbar-menubar):not(#nav-bar) {
+  #main-window[sizemode=normal] #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar) {
     border-left: 1px solid @toolbarShadowColor@;
     border-right: 1px solid @toolbarShadowColor@;
     background-clip: padding-box;
@@ -162,22 +147,17 @@
     background-clip: padding-box;
   }
 
-  #main-window[sizemode=normal][tabsontop=false] #PersonalToolbar:not(:-moz-lwtheme) {
-    border-top-left-radius: 2.5px;
-    border-top-right-radius: 2.5px;
-  }
-
   /* Toolbar shadow behind tabs */
-  #nav-bar[tabsontop=true] {
+  #nav-bar {
     border-top: 1px solid @toolbarShadowColor@ !important;
     background-clip: padding-box;
   }
 
   /* This code is only needed for restored windows (i.e. sizemode=normal)
      because of the border radius on the toolbar below the tab bar. */
-  #main-window[sizemode=normal] #nav-bar[tabsontop=true],
-  #main-window[sizemode=normal] #nav-bar[tabsontop=true][collapsed=true] + toolbar,
-  #main-window[sizemode=normal] #nav-bar[tabsontop=true][collapsed=true] + #customToolbars + #PersonalToolbar {
+  #main-window[sizemode=normal] #nav-bar,
+  #main-window[sizemode=normal] #nav-bar[collapsed=true] + toolbar,
+  #main-window[sizemode=normal] #nav-bar[collapsed=true] + #customToolbars + #PersonalToolbar {
     border-top: 1px solid @toolbarShadowColor@;
     border-top-left-radius: 2.5px;
     border-top-right-radius: 2.5px;
@@ -185,34 +165,18 @@
   }
 
   /* Cover the top border of the adjacent toolbar */
-  #TabsToolbar[tabsontop=true] {
+  #TabsToolbar {
     margin-bottom: -1px;
   }
 
-  #navigator-toolbox[tabsontop=false] > #PersonalToolbar {
-    margin-top: 3px;
-  }
-  #navigator-toolbox[tabsontop=false] > #PersonalToolbar:not(:-moz-lwtheme) {
-    margin-top: 2px;
-    border-top: 1px solid @toolbarShadowColor@;
-    background-image: linear-gradient(@toolbarHighlight@, rgba(255,255,255,0));
-  }
-
-  #main-window[sizemode=normal] #TabsToolbar[tabsontop=true] {
+  #main-window[sizemode=normal] #TabsToolbar {
     padding-left: 1px;
     padding-right: 1px;
   }
 
-  #main-window[sizemode=normal] #TabsToolbar[tabsontop=false] {
-    padding-left: 2px;
-    padding-right: 2px;
-  }
-
   /* Make the window draggable by glassed toolbars (bug 555081) */
   #toolbar-menubar:not([autohide="true"]),
-  #TabsToolbar[tabsontop="true"],
-  #nav-bar[tabsontop=false],
-  #nav-bar + #customToolbars + #PersonalToolbar[collapsed="true"] + #TabsToolbar[tabsontop="false"]:last-child,
+  #TabsToolbar,
   #navigator-toolbox > toolbar:not(#toolbar-menubar):-moz-lwtheme {
     -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-drag");
   }
@@ -226,29 +190,6 @@
     border-radius: 4px;
   }
 
-  #navigator-toolbox[tabsontop=false] #urlbar:not(:-moz-lwtheme),
-  #navigator-toolbox[tabsontop=false] .searchbar-textbox:not(:-moz-lwtheme) {
-    background-color: rgba(255,255,255,.725);
-    @navbarTextboxCustomBorder@
-    color: black;
-  }
-
-  #navigator-toolbox[tabsontop=false] html|*.urlbar-input:not(:-moz-lwtheme)::-moz-placeholder,
-  #navigator-toolbox[tabsontop=false] .searchbar-textbox > .autocomplete-textbox-container > .textbox-input-box > html|*.textbox-input:not(:-moz-lwtheme)::-moz-placeholder {
-    opacity: 1.0;
-    color: #777;
-  }
-
-  #navigator-toolbox[tabsontop=false] #urlbar:not(:-moz-lwtheme):hover,
-  #navigator-toolbox[tabsontop=false] .searchbar-textbox:not(:-moz-lwtheme):hover {
-    background-color: rgba(255,255,255,.898);
-  }
-
-  #navigator-toolbox[tabsontop=false] #urlbar:not(:-moz-lwtheme)[focused],
-  #navigator-toolbox[tabsontop=false] .searchbar-textbox:not(:-moz-lwtheme)[focused] {
-    background-color: white;
-  }
-
   .tabbrowser-tab:not(:-moz-lwtheme) {
     text-shadow: none;
   }
@@ -303,7 +244,7 @@
     z-index: -1;
   }
 
-  #main-window[sizemode=normal] #tabbrowser-tabs[tabsontop=true] > .tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox > .scrollbox-innerbox:not(:-moz-lwtheme) {
+  #main-window[sizemode=normal] .tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox > .scrollbox-innerbox:not(:-moz-lwtheme) {
     position: relative;
   }
 
@@ -321,8 +262,7 @@
     }
 
     #toolbar-menubar:not([autohide=true]):not(:-moz-lwtheme),
-    #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme),
-    #navigator-toolbox[tabsontop=false] > toolbar:not(#toolbar-menubar):not(:-moz-lwtheme) {
+    #TabsToolbar:not(:-moz-lwtheme) {
       -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-drag");
       background-color: transparent;
     }
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index ccff49f023b3..3d645ed89965 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -54,9 +54,6 @@
   height: 1px;
   background-color: ThreeDShadow;
 }
-#navigator-toolbox[tabsontop=false]::after {
-  visibility: collapse;
-}
 
 #navigator-toolbox > toolbar:not(:-moz-lwtheme) {
   -moz-appearance: none;
@@ -95,9 +92,9 @@
 }
 %endif
 
-#nav-bar[tabsontop=true],
-#nav-bar[tabsontop=true][collapsed=true] + toolbar,
-#nav-bar[tabsontop=true][collapsed=true] + #customToolbars + #PersonalToolbar {
+#nav-bar,
+#nav-bar[collapsed=true] + toolbar,
+#nav-bar[collapsed=true] + #customToolbars + #PersonalToolbar {
   background-image: linear-gradient(@toolbarHighlight@, rgba(255,255,255,0));
   box-shadow: 0 1px 0 @toolbarHighlight@ inset;
   margin-top: -1px; /* Move up 1px into the TabsToolbar */
@@ -1528,8 +1525,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   padding: 0;
 }
 
-#TabsToolbar:not(:-moz-lwtheme),
-#TabsToolbar[tabsontop=false] {
+#TabsToolbar:not(:-moz-lwtheme) {
   background-image: linear-gradient(to top, @toolbarShadowColor@ 2px, rgba(0,0,0,.05) 2px, transparent 50%);
 }
 
diff --git a/browser/themes/windows/downloads/downloads-aero.css b/browser/themes/windows/downloads/downloads-aero.css
index 68dbfc1117dc..a807e5e3f4d8 100644
--- a/browser/themes/windows/downloads/downloads-aero.css
+++ b/browser/themes/windows/downloads/downloads-aero.css
@@ -25,30 +25,19 @@
   /* The following rules are for the downloads indicator when in its normal,
      non-downloading, non-paused state (ie, it's just showing the downloads
      button icon). */
-  #toolbar-menubar #downloads-indicator:not([attention]) > #downloads-indicator-anchor > #downloads-indicator-icon:not(:-moz-lwtheme),
-  #TabsToolbar[tabsontop=true] #downloads-indicator:not([attention]) > #downloads-indicator-anchor > #downloads-indicator-icon:not(:-moz-lwtheme),
-  #navigator-toolbox[tabsontop=false] > #nav-bar #downloads-indicator:not([attention]) > #downloads-indicator-anchor > #downloads-indicator-icon:not(:-moz-lwtheme),
-  #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child #downloads-indicator:not([attention]) > #downloads-indicator-anchor > #downloads-indicator-icon:not(:-moz-lwtheme),
+  :-moz-any(#toolbar-menubar, #TabsToolbar) #downloads-indicator:not([attention]) > #downloads-indicator-anchor > #downloads-indicator-icon:not(:-moz-lwtheme),
 
   /* The following rules are for the downloads indicator when in its paused
      or undetermined progress state. We use :not([counter]) as a shortcut for
      :-moz-any([progress], [paused]). */
 
-  /* This is the case where the downloads indicator has been moved next to the menubar */
-  #toolbar-menubar #downloads-indicator:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter,
-  /* This is the case where the downloads indicator is in the tabstrip toolbar with tabs on top. */
-  #TabsToolbar[tabsontop=true] #downloads-indicator:not(:-moz-lwtheme):not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter,
-  /* This is the case where the downloads indicator is anywhere in the nav-bar with tabs on bottom. */
-  #navigator-toolbox[tabsontop=false] > #nav-bar #downloads-indicator:not(:-moz-lwtheme):not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter,
-  /* This is the case where the downloads indicator is in the tabstrip when the tabstrip is the last item in the toolbox (and is therefore over glass) */
-  #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child #downloads-indicator:not(:-moz-lwtheme):not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
+  /* This is the case where the downloads indicator has been moved next to the menubar as well as
+     the case where the downloads indicator is in the tabstrip toolbar. */
+  :-moz-any(#toolbar-menubar #downloads-indicator:not([counter]), #TabsToolbar #downloads-indicator:not(:-moz-lwtheme):not([counter])) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
     background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"), 0, 108, 18, 90);
   }
 
-  #toolbar-menubar #downloads-indicator-counter:not(:-moz-lwtheme),
-  #TabsToolbar[tabsontop=true] #downloads-indicator-counter:not(:-moz-lwtheme),
-  #navigator-toolbox[tabsontop=false] > #nav-bar #downloads-indicator-counter:not(:-moz-lwtheme),
-  #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child #downloads-indicator-counter:not(:-moz-lwtheme) {
+  :-moz-any(#toolbar-menubar, #TabsToolbar) #downloads-indicator-counter:not(:-moz-lwtheme) {
     color: white;
     text-shadow: 0 0 1px rgba(0,0,0,.7),
                  0 1px 1.5px rgba(0,0,0,.5);

From 4507bc6b9534fa8cce36316dbb6234a9970e1093 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Wed, 5 Jun 2013 11:31:37 +0200
Subject: [PATCH 211/230] Bug 870471 - context menu for customization panel,
 r=bmcbride,dao

---
 .../customizableui/content/panelUI.inc.xul    | 22 ++++++++++++++-
 .../customizableui/src/CustomizableUI.jsm     | 28 +++++++++++++++++++
 .../customizableui/src/CustomizeMode.jsm      | 14 ++++++++++
 .../locales/en-US/chrome/browser/browser.dtd  |  7 +++++
 4 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index becd8cc90b16..a4be3b4326cd 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -9,7 +9,7 @@
        consumeoutsideclicks="true"
        noautofocus="true">
   <panelmultiview id="PanelUI-multiView" mainViewId="PanelUI-mainView">
-    <panelview id="PanelUI-mainView" flex="1">
+    <panelview id="PanelUI-mainView" flex="1" contextmenu="customizationPanelContextMenu">
       <vbox id="PanelUI-contents" type="grid"/>
 
       <vbox id="PanelUI-mainView-spring" flex="1"/>
@@ -45,6 +45,26 @@
       <vbox id="PanelUI-helpItems"/>
     </panelview>
   </panelmultiview>
+  <popupset id="customizationContextMenus">
+    <menupopup id="customizationContextMenu">
+      <menuitem oncommand="gCustomizeMode.addToToolbar(document.popupNode)"
+                accesskey="&customizeMenu.addToToolbar.accesskey;"
+                label="&customizeMenu.addToToolbar.label;"/>
+      <menuitem oncommand="gCustomizeMode.removeFromPanel(document.popupNode)"
+                accesskey="&customizeMenu.removeFromMenu.accesskey;"
+                label="&customizeMenu.removeFromMenu.label;"/>
+      <menuseparator/>
+      <menuitem command="cmd_CustomizeToolbars"
+                accesskey="&viewCustomizeToolbar.accesskey;"
+                label="&viewCustomizeToolbar.label;"/>
+    </menupopup>
+
+    <menupopup id="customizationPanelContextMenu">
+      <menuitem command="cmd_CustomizeToolbars"
+                accesskey="&customizeMenu.addMoreItems.accesskey;"
+                label="&customizeMenu.addMoreItems.label;"/>
+    </menupopup>
+  </popupset>
 </panel>
 
 <panel id="widget-overflow"
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 0362942ad013..a8cd3afac178 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -24,6 +24,10 @@ const kNSXUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
 const kSpecialWidgetPfx = "customizableui-special-";
 
+const kCustomizationContextMenu = "customizationContextMenu";
+const kContextMenuBackup        = "customization-old-context";
+
+
 const kPrefCustomizationState        = "browser.uiCustomization.state";
 const kPrefCustomizationAutoAdd      = "browser.uiCustomization.autoAdd";
 const kPrefCustomizationDebug        = "browser.uiCustomization.debug";
@@ -316,6 +320,8 @@ let CustomizableUIInternal = {
           aArea == CustomizableUI.AREA_PANEL) {
         this.ensureButtonClosesPanel(node);
       }
+      this.ensureButtonContextMenu(node, aArea == CustomizableUI.AREA_PANEL);
+
       this.insertWidgetBefore(node, currentNode, container, aArea);
       this._addParentFlex(node);
       if (gResetting)
@@ -370,6 +376,25 @@ let CustomizableUIInternal = {
     aNode.addEventListener("keypress", this.maybeAutoHidePanel, false);
   },
 
+  ensureButtonContextMenu: function(aNode, ourContextMenu) {
+    if (ourContextMenu) {
+      let currentCtxt = aNode.getAttribute("context");
+      // Need to save widget's own context menu if we're replacing it:
+      if (currentCtxt && currentCtxt != kCustomizationContextMenu) {
+        aNode.setAttribute(kContextMenuBackup, currentCtxt);
+      }
+      aNode.setAttribute("context", kCustomizationContextMenu);
+    } else if (aNode.getAttribute("context") == kCustomizationContextMenu) {
+      let oldCtxt = aNode.getAttribute(kContextMenuBackup);
+      if (oldCtxt) {
+        aNode.setAttribute("context", oldCtxt);
+        aNode.removeAttribute(kContextMenuBackup);
+      } else {
+        aNode.removeAttribute("context");
+      }
+    }
+  },
+
   getWidgetProvider: function(aWidgetId) {
     if (this.isSpecialWidget(aWidgetId)) {
       return CustomizableUI.PROVIDER_SPECIAL;
@@ -430,6 +455,7 @@ let CustomizableUIInternal = {
       if (!btn.hasAttribute("noautoclose")) {
         this.ensureButtonClosesPanel(btn);
       }
+      this.ensureButtonContextMenu(btn, true);
     }
 
     aPanel.toolbox = document.getElementById("navigator-toolbox");
@@ -467,6 +493,8 @@ let CustomizableUIInternal = {
         this.ensureButtonClosesPanel(widgetNode);
       }
 
+      this.ensureButtonContextMenu(widgetNode, aArea == CustomizableUI.AREA_PANEL);
+
       let nextNode = nextNodeId ? container.querySelector(idToSelector(nextNodeId))
                                 : null;
       this.insertWidgetBefore(widgetNode, nextNode, container, aArea);
diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index 5f32571c4a7c..f6a892a72398 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -129,6 +129,7 @@ CustomizeMode.prototype = {
     this._wrapToolbarItems();
     this.populatePalette();
 
+    window.PanelUI.mainView.addEventListener("contextmenu", this, true);
     this.visiblePalette.addEventListener("dragstart", this, true);
     this.visiblePalette.addEventListener("dragover", this, true);
     this.visiblePalette.addEventListener("dragexit", this, true);
@@ -161,6 +162,7 @@ CustomizeMode.prototype = {
     this._removePanelCustomizationPlaceholders();
     this.depopulatePalette();
 
+    this.window.PanelUI.mainView.removeEventListener("contextmenu", this, true);
     this.visiblePalette.removeEventListener("dragstart", this, true);
     this.visiblePalette.removeEventListener("dragover", this, true);
     this.visiblePalette.removeEventListener("dragexit", this, true);
@@ -249,6 +251,14 @@ CustomizeMode.prototype = {
     let result = this.window.gNavToolbox.dispatchEvent(evt);
   },
 
+  addToToolbar: function(aNode) {
+    CustomizableUI.addWidgetToArea(aNode.id, CustomizableUI.AREA_NAVBAR);
+  },
+
+  removeFromPanel: function(aNode) {
+    CustomizableUI.removeWidgetFromArea(aNode.id);
+  },
+
   populatePalette: function() {
     let toolboxPalette = this.window.gNavToolbox.palette;
 
@@ -503,6 +513,10 @@ CustomizeMode.prototype = {
 
   handleEvent: function(aEvent) {
     switch(aEvent.type) {
+      case "contextmenu":
+        aEvent.preventDefault();
+        aEvent.stopPropagation();
+        break;
       case "dragstart":
         this._onDragStart(aEvent);
         break;
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index c3dcb0e07671..2b2ad0bd111f 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -323,6 +323,13 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY appMenuHistory.clearRecent.label "Clear Recent History…">
 <!ENTITY appMenuHistory.restoreSession.label "Restore Previous Session">
 
+<!ENTITY customizeMenu.addToToolbar.label "Add to Toolbar">
+<!ENTITY customizeMenu.addToToolbar.accesskey "A">
+<!ENTITY customizeMenu.removeFromMenu.label "Remove from Menu">
+<!ENTITY customizeMenu.removeFromMenu.accesskey "R">
+<!ENTITY customizeMenu.addMoreItems.label "Add More Items…">
+<!ENTITY customizeMenu.addMoreItems.accesskey "A">
+
 <!ENTITY openCmd.commandkey           "l">
 <!ENTITY urlbar.placeholder2          "Search or enter address">
 <!ENTITY urlbar.accesskey             "d">

From 79ddd1f66c41c1bb0010d6bf587084fcddb0f3f7 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Tue, 4 Jun 2013 22:59:50 +0200
Subject: [PATCH 212/230] Bug 871279 - Some pop-up windows show the tabs too
 high in the titlebar, r=mconley

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

diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 3d645ed89965..5882dfc000b9 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -29,12 +29,12 @@
 /* We want a 4px gap between the TabsToolbar and the toolbar-menubar when the
    toolbar-menu is displayed, and a 16px gap when it is not. 1px is taken care
    of by the (light) outer shadow of the tab, the remaining 3/15 are these margins. */
-#toolbar-menubar:not([inactive]) {
-  margin-bottom: 3px;
+#toolbar-menubar:not([inactive]) ~ #TabsToolbar {
+  margin-top: 3px;
 }
 
-#main-window[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] {
-  margin-bottom: 15px;
+#main-window[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] ~ #TabsToolbar {
+  margin-top: 15px;
 }
 
 #toolbar-menubar:not([autohide="true"]) {

From 05115743fe8ec91d3daa179b28e3b96ef840bebd Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Tue, 4 Jun 2013 18:08:09 +0200
Subject: [PATCH 213/230] Bug 879295: switch hardcoded strings to use localized
 alternatives. r=jaws

---
 browser/components/customizableui/src/CustomizableWidgets.jsm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/components/customizableui/src/CustomizableWidgets.jsm b/browser/components/customizableui/src/CustomizableWidgets.jsm
index 0ddff1ca0a80..2d5654c589d1 100644
--- a/browser/components/customizableui/src/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/src/CustomizableWidgets.jsm
@@ -266,7 +266,7 @@ const CustomizableWidgets = [{
 
       let node = aDocument.createElementNS(kNSXUL, "toolbaritem");
       node.setAttribute("id", "zoom-controls");
-      node.setAttribute("title", "Zoom Controls");
+      node.setAttribute("title", CustomizableUI.getLocalizedProperty(this, "tooltiptext"));
       if (inPanel)
         node.setAttribute("flex", "1");
       node.classList.add("chromeclass-toolbar-additional");
@@ -388,7 +388,7 @@ const CustomizableWidgets = [{
 
       let node = aDocument.createElementNS(kNSXUL, "toolbaritem");
       node.setAttribute("id", "edit-controls");
-      node.setAttribute("title", "Edit Controls");
+      node.setAttribute("title", CustomizableUI.getLocalizedProperty(this, "tooltiptext"));
       if (inPanel)
         node.setAttribute("flex", "1");
       node.classList.add("chromeclass-toolbar-additional");

From f83eff1d8bed230f8c2c2e55efbeadd47571939b Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Wed, 5 Jun 2013 14:24:16 +0200
Subject: [PATCH 214/230] Bug 879162 - Adjust CSS to fix gap between menubar
 and tabs in autohide vs. permanent cases, r=dao

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

diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 5882dfc000b9..b41494f44687 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -29,7 +29,8 @@
 /* We want a 4px gap between the TabsToolbar and the toolbar-menubar when the
    toolbar-menu is displayed, and a 16px gap when it is not. 1px is taken care
    of by the (light) outer shadow of the tab, the remaining 3/15 are these margins. */
-#toolbar-menubar:not([inactive]) ~ #TabsToolbar {
+#toolbar-menubar:not([autohide="true"]) ~ #TabsToolbar,
+#toolbar-menubar[autohide="true"]:not([inactive]) ~ #TabsToolbar {
   margin-top: 3px;
 }
 

From c1c3d1e43cae43f95e699bb9af710c207892efa0 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Wed, 5 Jun 2013 21:39:36 +0200
Subject: [PATCH 215/230] Bug 851001 - Update global/icons/close[@2x].png for
 Australis, r=jaws

---
 browser/base/content/browser.xul              |   5 +-
 browser/base/content/newtab/newTab.xul        |   1 +
 browser/base/content/sync/notification.xml    |   2 +-
 browser/base/content/tabbrowser.xml           |   2 +-
 browser/base/content/urlbarBindings.xml       |  12 +--
 browser/themes/osx/browser.css                |  92 ------------------
 browser/themes/osx/newtab/newTab.css          |  10 --
 browser/themes/windows/browser.css            |  46 ---------
 browser/themes/windows/newtab/newTab.css      |  10 --
 .../alerts/resources/content/alert.xul        |   2 +-
 toolkit/content/widgets/findbar.xml           |   2 +-
 toolkit/content/widgets/notification.xml      |   6 +-
 toolkit/themes/osx/global/alerts/alert.css    |  11 ---
 toolkit/themes/osx/global/findBar.css         |  23 -----
 toolkit/themes/osx/global/global.css          |  30 ++++++
 toolkit/themes/osx/global/icons/close.png     | Bin 771 -> 812 bytes
 toolkit/themes/osx/global/notification.css    |  23 -----
 .../themes/windows/global/alerts/alert.css    |  11 ---
 toolkit/themes/windows/global/findBar.css     |  10 --
 toolkit/themes/windows/global/global.css      |  35 +++++++
 .../windows/global/icons/close-lunaBlue.png   | Bin 0 -> 905 bytes
 .../windows/global/icons/close-lunaOlive.png  | Bin 0 -> 909 bytes
 .../windows/global/icons/close-lunaSilver.png | Bin 0 -> 901 bytes
 .../windows/global/icons/close-win8.png       | Bin 0 -> 838 bytes
 toolkit/themes/windows/global/icons/close.png | Bin 1149 -> 1016 bytes
 toolkit/themes/windows/global/jar.mn          |   3 +
 .../themes/windows/global/notification.css    |  15 ---
 27 files changed, 85 insertions(+), 266 deletions(-)
 create mode 100644 toolkit/themes/windows/global/icons/close-lunaBlue.png
 create mode 100644 toolkit/themes/windows/global/icons/close-lunaOlive.png
 create mode 100644 toolkit/themes/windows/global/icons/close-lunaSilver.png
 create mode 100644 toolkit/themes/windows/global/icons/close-win8.png

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 421e627021c1..940f289c4914 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -544,7 +544,7 @@
       </toolbarbutton>
 
       <toolbarbutton id="tabs-closebutton"
-                     class="close-button tabs-closebutton"
+                     class="close-button tabs-closebutton close-icon"
                      command="cmd_close"
                      label="&closeTab.label;"
                      tooltiptext="&closeTab.label;"/>
@@ -1036,7 +1036,7 @@
         <sidebarheader id="sidebar-header" align="center">
           <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
           <image id="sidebar-throbber"/>
-          <toolbarbutton class="tabs-closebutton" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/>
+          <toolbarbutton class="tabs-closebutton close-icon" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/>
         </sidebarheader>
         <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true"
                   style="min-width: 14em; width: 18em; max-width: 36em;"/>
@@ -1134,6 +1134,7 @@
              defaultset="addonbar-closebutton,spring,status-bar"
              key="key_toggleAddonBar">
       <toolbarbutton id="addonbar-closebutton"
+                     class="close-icon"
                      tooltiptext="&addonBarCloseButton.tooltip;"
                      oncommand="setToolbarVisibility(this.parentNode, false);"/>
       <statusbar id="status-bar" ordinal="1000"/>
diff --git a/browser/base/content/newtab/newTab.xul b/browser/base/content/newtab/newTab.xul
index bab2c28e79cb..6fc202f296ef 100644
--- a/browser/base/content/newtab/newTab.xul
+++ b/browser/base/content/newtab/newTab.xul
@@ -31,6 +31,7 @@
                       label="&newtab.undo.restoreButton;"
                       class="newtab-undo-button" />
           <xul:toolbarbutton id="newtab-undo-close-button" tabindex="-1"
+                             class="close-icon"
                              tooltiptext="&newtab.undo.closeTooltip;" />
         </div>
       </div>
diff --git a/browser/base/content/sync/notification.xml b/browser/base/content/sync/notification.xml
index 94e83f141817..7a2b773821cf 100644
--- a/browser/base/content/sync/notification.xml
+++ b/browser/base/content/sync/notification.xml
@@ -83,7 +83,7 @@
     <content>
       <xul:hbox class="notification-inner outset" flex="1" xbl:inherits="type">
         <xul:toolbarbutton ondblclick="event.stopPropagation();"
-                           class="messageCloseButton tabbable"
+                           class="messageCloseButton close-icon tabbable"
                            xbl:inherits="hidden=hideclose"
                            tooltiptext="&closeNotification.tooltip;"
                            oncommand="document.getBindingParent(this).close()"/>
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 09f55589f2a1..151e3b869c6d 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -4290,7 +4290,7 @@
                      role="presentation"/>
           <xul:toolbarbutton anonid="close-button"
                              xbl:inherits="fadein,pinned,selected"
-                             class="tab-close-button"/>
+                             class="tab-close-button close-icon"/>
         </xul:hbox>
       </xul:stack>
     </content>
diff --git a/browser/base/content/urlbarBindings.xml b/browser/base/content/urlbarBindings.xml
index 6f81fcc392b5..b1779a73a9c8 100644
--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -925,7 +925,7 @@
             <xul:menupopup anonid="menupopup"
                            xbl:inherits="oncommand=menucommand">
               <children/>
-              <xul:menuitem class="menuitem-iconic popup-notification-closeitem"
+              <xul:menuitem class="menuitem-iconic popup-notification-closeitem close-icon"
                             label="&closeNotificationItem.label;"
                             xbl:inherits="oncommand=closeitemcommand"/>
             </xul:menupopup>
@@ -934,7 +934,7 @@
       </xul:vbox>
       <xul:vbox pack="start">
         <xul:toolbarbutton anonid="closebutton"
-                           class="messageCloseButton popup-notification-closebutton tabbable"
+                           class="messageCloseButton close-icon popup-notification-closebutton tabbable"
                            xbl:inherits="oncommand=closebuttoncommand"
                            tooltiptext="&closeNotification.tooltip;"/>
       </xul:vbox>
@@ -1157,7 +1157,7 @@
             <xul:menupopup anonid="menupopup"
                            xbl:inherits="oncommand=menucommand">
               <children/>
-              <xul:menuitem class="menuitem-iconic popup-notification-closeitem"
+              <xul:menuitem class="menuitem-iconic popup-notification-closeitem close-icon"
                             label="&closeNotificationItem.label;"
                             xbl:inherits="oncommand=closeitemcommand"/>
             </xul:menupopup>
@@ -1166,7 +1166,7 @@
       </xul:vbox>
       <xul:vbox pack="start">
         <xul:toolbarbutton anonid="closebutton"
-                           class="messageCloseButton popup-notification-closebutton tabbable"
+                           class="messageCloseButton close-icon popup-notification-closebutton tabbable"
                            xbl:inherits="oncommand=closebuttoncommand"
                            tooltiptext="&closeNotification.tooltip;"/>
       </xul:vbox>
@@ -1443,7 +1443,7 @@
               <xul:menupopup anonid="menupopup"
                              xbl:inherits="oncommand=menucommand">
                 <children/>
-                <xul:menuitem class="menuitem-iconic popup-notification-closeitem"
+                <xul:menuitem class="menuitem-iconic popup-notification-closeitem close-icon"
                               label="&closeNotificationItem.label;"
                               xbl:inherits="oncommand=closeitemcommand"/>
               </xul:menupopup>
@@ -1527,7 +1527,7 @@
                              onclick="document.getBindingParent(this).onLinkClick();"/>
           </xul:description>
         </xul:hbox>
-        <xul:toolbarbutton class="panel-promo-closebutton"
+        <xul:toolbarbutton class="panel-promo-closebutton close-icon"
                            oncommand="document.getBindingParent(this).onCloseButtonCommand();"
                            tooltiptext="&closeNotification.tooltip;"/>
       </xul:hbox>
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index f64702ffd070..19699a4ba6b5 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -2027,40 +2027,17 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 }
 
 .panel-promo-closebutton {
-  list-style-image: url("chrome://global/skin/icons/close.png");
-  -moz-image-region: rect(0, 16px, 16px, 0);
   border: none;
   -moz-margin-end: -14px;
   margin-top: -8px;
 }
 
-.panel-promo-closebutton:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-.panel-promo-closebutton:hover:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
-}
-
 .panel-promo-closebutton > .toolbarbutton-text {
   padding: 0;
   margin: 0;
 }
 
 @media (min-resolution: 2dppx) {
-  .panel-promo-closebutton {
-    list-style-image: url("chrome://global/skin/icons/close@2x.png");
-    -moz-image-region: rect(0, 32px, 32px, 0);
-  }
-
-  .panel-promo-closebutton:hover {
-    -moz-image-region: rect(0, 64px, 32px, 32px);
-  }
-
-  .panel-promo-closebutton:hover:active {
-    -moz-image-region: rect(0, 96px, 32px, 64px);
-  }
-
   .panel-promo-closebutton > .toolbarbutton-icon {
     width: 16px;
   }
@@ -2337,36 +2314,13 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 }
 
 .tab-close-button {
-  list-style-image: url("chrome://global/skin/icons/close.png");
   -moz-appearance: none;
   border: none !important;
   background: none;
   cursor: default;
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-.tab-close-button:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-.tab-close-button:hover:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
 @media (min-resolution: 2dppx) {
-  .tab-close-button {
-    list-style-image: url("chrome://global/skin/icons/close@2x.png");
-    -moz-image-region: rect(0, 32px, 32px, 0);
-  }
-
-  .tab-close-button:hover {
-    -moz-image-region: rect(0, 64px, 32px, 32px);
-  }
-
-  .tab-close-button:hover:active {
-    -moz-image-region: rect(0, 96px, 32px, 64px);
-  }
-
   .tab-close-button > .toolbarbutton-icon {
     width: 16px;
   }
@@ -2626,8 +2580,6 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 /* Tabstrip close button */
 .tabs-closebutton {
   -moz-padding-end: 4px;
-  list-style-image: url("chrome://global/skin/icons/close.png");
-  -moz-image-region: rect(0, 16px, 16px, 0);
   border: none;
 }
 
@@ -2635,28 +2587,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   list-style-image: url("chrome://global/skin/icons/close-sidebar.png");
 }
 
-.tabs-closebutton:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-.tabs-closebutton:hover:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
-}
-
 @media (min-resolution: 2dppx) {
-  :not(#sidebar-header) > .tabs-closebutton {
-    list-style-image: url("chrome://global/skin/icons/close@2x.png");
-    -moz-image-region: rect(0, 32px, 32px, 0);
-  }
-
-  :not(#sidebar-header) > .tabs-closebutton:hover {
-    -moz-image-region: rect(0, 64px, 32px, 32px);
-  }
-
-  :not(#sidebar-header) > .tabs-closebutton:hover:active {
-    -moz-image-region: rect(0, 96px, 32px, 64px);
-  }
-
   :not(#sidebar-header) > .tabs-closebutton > .toolbarbutton-icon {
     width: 16px;
   }
@@ -3215,33 +3146,10 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 #addonbar-closebutton {
   padding: 0;
   margin: 0 6px;
-  list-style-image: url("chrome://global/skin/icons/close.png");
   border: none;
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-#addonbar-closebutton:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-#addonbar-closebutton:hover:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
 @media (min-resolution: 2dppx) {
-  #addonbar-closebutton {
-    list-style-image: url("chrome://global/skin/icons/close@2x.png");
-    -moz-image-region: rect(0, 32px, 32px, 0);
-  }
-
-  #addonbar-closebutton:hover {
-    -moz-image-region: rect(0, 64px, 32px, 32px);
-  }
-
-  #addonbar-closebutton:hover:active {
-    -moz-image-region: rect(0, 96px, 32px, 64px);
-  }
-
   #addonbar-closebutton > .toolbarbutton-icon {
     width: 16px;
   }
diff --git a/browser/themes/osx/newtab/newTab.css b/browser/themes/osx/newtab/newTab.css
index 61e229fccc39..b418e0ec76b1 100644
--- a/browser/themes/osx/newtab/newTab.css
+++ b/browser/themes/osx/newtab/newTab.css
@@ -53,19 +53,9 @@
 #newtab-undo-close-button {
   padding: 0;
   border: none;
-  list-style-image: url("chrome://global/skin/icons/close.png");
-  -moz-image-region: rect(0, 16px, 16px, 0);
   -moz-user-focus: normal;
 }
 
-#newtab-undo-close-button:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-#newtab-undo-close-button:hover:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
-}
-
 #newtab-undo-close-button > .toolbarbutton-text {
   display: none;
 }
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index b41494f44687..8f22c7f0eb8c 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1489,21 +1489,11 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 .panel-promo-closebutton {
   -moz-appearance: none;
-  list-style-image: url("chrome://global/skin/icons/close.png");
-  -moz-image-region: rect(0, 16px, 16px, 0);
   border: none;
   -moz-margin-end: -10px;
   margin-top: -5px;
 }
 
-.panel-promo-closebutton:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-.panel-promo-closebutton:hover:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
-}
-
 .panel-promo-closebutton > .toolbarbutton-text {
   padding: 0;
   margin: 0;
@@ -1612,23 +1602,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 /* Tab close button */
 .tab-close-button {
   -moz-appearance: none;
-  -moz-image-region: rect(0, 16px, 16px, 0);
   border: none;
-  list-style-image: url("chrome://global/skin/icons/close.png");
-}
-
-.tab-close-button:hover,
-.tab-close-button:hover[selected="true"] {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-.tab-close-button:hover:active,
-.tab-close-button:hover:active[selected="true"] {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
-}
-
-.tab-close-button[selected="true"] {
-  -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 /* Tab scrollbox arrow, tabstrip new tab and all-tabs buttons */
@@ -1732,8 +1706,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 /* Tabstrip close button */
 .tabs-closebutton {
   -moz-appearance: none;
-  list-style-image: url("chrome://global/skin/icons/close.png");
-  -moz-image-region: rect(0, 16px, 16px, 0);
   padding: 4px 2px;
   margin: 0px;
   border: none;
@@ -1745,14 +1717,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   -moz-padding-start: 2px !important;
 }
 
-.tabs-closebutton:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-.tabs-closebutton:hover:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
-}
-
 toolbarbutton.chevron {
   list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important;
 }
@@ -2207,17 +2171,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 #addonbar-closebutton {
   border: none;
   padding: 0 5px;
-  list-style-image: url("chrome://global/skin/icons/close.png");
   -moz-appearance: none;
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-#addonbar-closebutton:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-#addonbar-closebutton:hover:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
 /* Status panel */
diff --git a/browser/themes/windows/newtab/newTab.css b/browser/themes/windows/newtab/newTab.css
index 5605a983d27b..d0403004a995 100644
--- a/browser/themes/windows/newtab/newTab.css
+++ b/browser/themes/windows/newtab/newTab.css
@@ -59,19 +59,9 @@
   -moz-appearance: none;
   padding: 0;
   border: none;
-  list-style-image: url("chrome://global/skin/icons/close.png");
-  -moz-image-region: rect(0, 16px, 16px, 0);
   -moz-user-focus: normal;
 }
 
-#newtab-undo-close-button:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-#newtab-undo-close-button:hover:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
-}
-
 #newtab-undo-close-button > .toolbarbutton-text {
   display: none;
 }
diff --git a/toolkit/components/alerts/resources/content/alert.xul b/toolkit/components/alerts/resources/content/alert.xul
index 7538be0afbde..6850aa50a271 100644
--- a/toolkit/components/alerts/resources/content/alert.xul
+++ b/toolkit/components/alerts/resources/content/alert.xul
@@ -36,7 +36,7 @@
     </box>
 
     <vbox class="alertCloseBox">
-      <toolbarbutton class="alertCloseButton"
+      <toolbarbutton class="alertCloseButton close-icon"
                      tooltiptext="&closeAlert.tooltip;"
                      onclick="event.stopPropagation();"
                      oncommand="close();"/>
diff --git a/toolkit/content/widgets/findbar.xml b/toolkit/content/widgets/findbar.xml
index e4c540fff39f..9c590a0e6527 100644
--- a/toolkit/content/widgets/findbar.xml
+++ b/toolkit/content/widgets/findbar.xml
@@ -179,7 +179,7 @@
     <content hidden="true">
     <xul:hbox anonid="findbar-container" class="findbar-container" flex="1" align="center">
       <xul:toolbarbutton anonid="find-closebutton"
-                         class="findbar-closebutton"
+                         class="findbar-closebutton close-icon"
                          tooltiptext="&findCloseButton.tooltip;"
                          oncommand="close();"/>
       <xul:label anonid="find-label" class="findbar-find-fast" control="findbar-textbox"/>
diff --git a/toolkit/content/widgets/notification.xml b/toolkit/content/widgets/notification.xml
index f159b4016b81..946fdadcd4b6 100644
--- a/toolkit/content/widgets/notification.xml
+++ b/toolkit/content/widgets/notification.xml
@@ -370,7 +370,7 @@
           <children/>
         </xul:hbox>
         <xul:toolbarbutton ondblclick="event.stopPropagation();"
-                           class="messageCloseButton tabbable"
+                           class="messageCloseButton close-icon tabbable"
                            xbl:inherits="hidden=hideclose"
                            tooltiptext="&closeNotification.tooltip;"
                            oncommand="document.getBindingParent(this).close();"/>
@@ -474,7 +474,7 @@
             <xul:menupopup anonid="menupopup"
                            xbl:inherits="oncommand=menucommand">
               <children/>
-              <xul:menuitem class="menuitem-iconic popup-notification-closeitem"
+              <xul:menuitem class="menuitem-iconic popup-notification-closeitem close-icon"
                             label="&closeNotificationItem.label;"
                             xbl:inherits="oncommand=closeitemcommand"/>
             </xul:menupopup>
@@ -483,7 +483,7 @@
       </xul:vbox>
       <xul:vbox pack="start">
         <xul:toolbarbutton anonid="closebutton"
-                           class="messageCloseButton popup-notification-closebutton tabbable"
+                           class="messageCloseButton close-icon popup-notification-closebutton tabbable"
                            xbl:inherits="oncommand=closebuttoncommand"
                            tooltiptext="&closeNotification.tooltip;"/>
       </xul:vbox>
diff --git a/toolkit/themes/osx/global/alerts/alert.css b/toolkit/themes/osx/global/alerts/alert.css
index e19d881e77fd..8e30e1885306 100644
--- a/toolkit/themes/osx/global/alerts/alert.css
+++ b/toolkit/themes/osx/global/alerts/alert.css
@@ -92,20 +92,9 @@ label {
   -moz-appearance: none;
   padding: 0;
   margin: 2px;
-  list-style-image: url("chrome://global/skin/icons/close.png");
   border: none;
-  -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 .alertCloseButton > .toolbarbutton-text {
   display: none;
 }
-
-.alertCloseButton:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-.alertCloseButton:hover:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
-}
-
diff --git a/toolkit/themes/osx/global/findBar.css b/toolkit/themes/osx/global/findBar.css
index ba409035c9c9..41b78dbe38b6 100644
--- a/toolkit/themes/osx/global/findBar.css
+++ b/toolkit/themes/osx/global/findBar.css
@@ -46,33 +46,10 @@ label.findbar-find-fast:-moz-lwtheme,
 .findbar-closebutton {
   padding: 0;
   margin: 0 4px;
-  list-style-image: url("chrome://global/skin/icons/close.png");
   border: none;
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-.findbar-closebutton:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-.findbar-closebutton:hover:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
 @media (min-resolution: 2dppx) {
-  .findbar-closebutton {
-    list-style-image: url("chrome://global/skin/icons/close@2x.png");
-    -moz-image-region: rect(0, 32px, 32px, 0);
-  }
-
-  .findbar-closebutton:hover {
-    -moz-image-region: rect(0, 64px, 32px, 32px);
-  }
-
-  .findbar-closebutton:hover:active {
-    -moz-image-region: rect(0, 96px, 32px, 64px);
-  }
-
   .findbar-closebutton > .toolbarbutton-icon {
     width: 16px;
   }
diff --git a/toolkit/themes/osx/global/global.css b/toolkit/themes/osx/global/global.css
index 013ca0f95cc9..e8ccf701086c 100644
--- a/toolkit/themes/osx/global/global.css
+++ b/toolkit/themes/osx/global/global.css
@@ -336,3 +336,33 @@ notification > button > .button-box > .button-text {
 .popup-internal-box > autorepeatbutton[disabled="true"] {
   visibility: collapse;
 }
+
+/* :::::: Close button icons ::::: */
+
+.close-icon {
+  list-style-image: url("chrome://global/skin/icons/close.png");
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+.close-icon:hover {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+.close-icon:hover:active {
+  -moz-image-region: rect(0, 48px, 16px, 32px);
+}
+
+@media (min-resolution: 2dppx) {
+  .close-icon {
+    list-style-image: url("chrome://global/skin/icons/close@2x.png");
+    -moz-image-region: rect(0, 32px, 32px, 0);
+  }
+
+  .close-icon:hover {
+    -moz-image-region: rect(0, 64px, 32px, 32px);
+  }
+
+  .close-icon:hover:active {
+    -moz-image-region: rect(0, 96px, 32px, 64px);
+  }
+}
diff --git a/toolkit/themes/osx/global/icons/close.png b/toolkit/themes/osx/global/icons/close.png
index 9d5b280f258346cfcc848d37380478c57307f965..d58f23bac1f29a8efc2047633e9edeacc59ed25b 100644
GIT binary patch
delta 751
zcmV<L0ucR!2CN2<Nq^2sL_t(I%VS^|5rE5=ua>_O74p?``N9>%GAv-2hXxk_MTrG`
zl@bw>VG@y&;Zh+|A(G)hR+vPDKm}aEY=%aLI)(;@dWKpctOv5{7#f*oqni`Uzy+o`
z(e38XmG%>fy|~6UTOwE@$UN)f8j)COKmJ^}f{6@e3{8^{%YXJTR54Uabx%Ib&;%5j
zh-yjzLlScm&<ai<nZyu?;)6_a|Kp4Quluyoq|~tF{f7T*PcIht=gWjE=x3<t+P&kz
zri0Q`q^52>uycR!ZiY&rC^EQZrx4E&%m6YxSUUESJ+d5cx`>xS)|(0c7koSX<?#Q7
z?<QDfi+J&-BY#^UF=5`?jXQQ;*nV;Ij`?fkCNWf?S@56zslR3*gFS=2TEK(A|C}h1
zoGR?f7o=SNruYBc|MTAVYnAhb2)lBnB3V$%&?G!>*4ni@*X^9UR%|Xfh)^wHU?}I;
z@L{lEuu%1`5JZ*XND^@5_0lSSJ>~z*|1;lC)-U7n7JqQ$NJ6rpgrP=!_Uz58x3Atl
zYqQiGU{sf)Tfo5_$l$<W2ZRnl7K#tp5_lX<65p@;zwpz-kBj~<__W?4na7DO0m*_g
z>E0DbSMOhVaN(iV`&J#5?ZfZ^j{}37j`!2Z*O5Bj3~uZ$$Z{<498O1P{a^UDSG`oB
z6c|to&VS73aAt`|j)VH$s}D@yD7sK+(bUbW4z%wBrYE#GF!c(4==-1ZKl=+`ui*by
zC>F%B+p>flnxdD^>ci@-mUd_gODLNiODvKF<qX{wdnKkbv@^5`PpjU|(1Q`lKr0*}
zQTw0$zay#)YZ8k!iyf02vonh&izTxYlN*aYi)b}_GEAOnGSGr*hGt+ED+j`QAghL<
zoOv<>u^>2>J%%xaF&GGgfDlB7utW#Lec)8W(#O!r&;`UDKnP|r^*WUhZNY!V|91Z!
h(4hT)MPlV?3IO*X5_Nu|O6ULp002ovPDHLkV1f)AbvOV3

delta 710
zcmV;%0y+Jx27?BWNq?nDL_t(I%gvPUPf}qN#}AGRvg<F@Nm?5lF|288wAGScBnW6u
zog1RuwwhW7zJOMWiNjDT<;PS?5PuBCAJlR*3smeMsWxBqwz*z3|AE^Pg1Ap_d{b-R
z?YZZkvpt{te9v<(u<&;U{{;Y~a2IS~&65o?(p<eBrXdQed4GyxrvB6b$_(w$1X|F5
z8X9rc;#)gq&ejVSzylK~7mTA^>DW`SKmY_yg3|P}SfC?L(1V+{#hup}(1T9NydOuP
z26}S!AUI(1{$h<6pAL!75(YO$K@LEmDGZ4ws1mA3<SGma^c;Wzv<Vlxd%S(+UVYz>
zw`?*siKj5+>VE+kH7_MnuanjDRj*=+M9R8?fB**&mn$svkjO3?qKD;{Ed>E+s_Q%Q
zvKz<Sxc$a=|K)x(={H~wMyuw$k*#=acQd*9&cAvFGcd=si29<cGt#|u??vOM8?1l;
zsG&vr@C0$P{dpVQ!c0EE4(_tZ^xFE)`i?JJ9zlynNPhsBN^6a@p4Q8acf>>w4A@%T
zh5m1|>=L_lG^-rIUT^`!;H+5m#KQ4#+!vE9W2@~1fLFw~@|jC&rJ8TzTX`j<MM@@P
zPR6LKw+V|zB>uI7mAw}+_twf@^q|`R#|esW^33wK!-lWdYuk7aiZx`DKRnHtlQHTe
zx5?=EK!0R;|M{Ep^|Cd0Y<Yh$3S*>2HI9zYD)gQ@Y;bh2=Qw~ayp*Pwj}?RHeT&R8
z{|Fe&bmiY7@V5pl!Y~C>;!tZ4{Fn)lgLd{;YblI4J*Z?rhZ}aLomXSriEp|}CR-QI
z;P*P=8IIT!lnWy#j0tB>J;@=xn88yR^3)|}LO;1#>24PK;6z@WXb-L!3w_<qr~lcN
svnsZckP5TeI?c*h1tA$`|Ha?*C&T86#PZ{-b^rhX07*qoM6N<$g2`83HUIzs

diff --git a/toolkit/themes/osx/global/notification.css b/toolkit/themes/osx/global/notification.css
index 3557ed97adcd..ee507becbbf1 100644
--- a/toolkit/themes/osx/global/notification.css
+++ b/toolkit/themes/osx/global/notification.css
@@ -65,23 +65,13 @@ notification[type="critical"] {
   -moz-appearance: none;
   padding: 0;
   margin: 0 2px;
-  list-style-image: url("chrome://global/skin/icons/close.png");
   border: none;
-  -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 .messageCloseButton > .toolbarbutton-text {
   display: none;
 }
 
-.messageCloseButton:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-.messageCloseButton:hover:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
-}
-
 .messageCloseButton:-moz-focusring > .toolbarbutton-icon {
   border-radius: 10000px;
   box-shadow: 0 0 2px 1px -moz-mac-focusring,
@@ -89,19 +79,6 @@ notification[type="critical"] {
 }
 
 @media (min-resolution: 2dppx) {
-  .messageCloseButton {
-    list-style-image: url("chrome://global/skin/icons/close@2x.png");
-    -moz-image-region: rect(0, 32px, 32px, 0);
-  }
-
-  .messageCloseButton:hover {
-    -moz-image-region: rect(0, 64px, 32px, 32px);
-  }
-
-  .messageCloseButton:hover:active {
-    -moz-image-region: rect(0, 96px, 32px, 64px);
-  }
-
   .messageCloseButton > .toolbarbutton-icon {
     width: 16px;
   }
diff --git a/toolkit/themes/windows/global/alerts/alert.css b/toolkit/themes/windows/global/alerts/alert.css
index 827168124032..06f36038f7aa 100644
--- a/toolkit/themes/windows/global/alerts/alert.css
+++ b/toolkit/themes/windows/global/alerts/alert.css
@@ -78,9 +78,7 @@ label {
 }
 
 .alertCloseButton {
-  list-style-image: url("chrome://global/skin/icons/close.png");
   -moz-appearance: none;
-  -moz-image-region: rect(0, 16px, 16px, 0);
   padding: 4px 2px;
   border: none !important;
 }
@@ -88,12 +86,3 @@ label {
 .alertCloseButton > .toolbarbutton-text {
   display: none;
 }
-
-.alertCloseButton:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-.alertCloseButton:hover:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
-}
-
diff --git a/toolkit/themes/windows/global/findBar.css b/toolkit/themes/windows/global/findBar.css
index b91de6247125..29e0afa1d5d7 100644
--- a/toolkit/themes/windows/global/findBar.css
+++ b/toolkit/themes/windows/global/findBar.css
@@ -7,17 +7,7 @@
 .findbar-closebutton {
   border: none;
   padding: 3px 5px;
-  list-style-image: url("chrome://global/skin/icons/close.png");
   -moz-appearance: none;
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-.findbar-closebutton:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-.findbar-closebutton:hover:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
 findbar {
diff --git a/toolkit/themes/windows/global/global.css b/toolkit/themes/windows/global/global.css
index b23f7a5c65df..8c551d0fe77e 100644
--- a/toolkit/themes/windows/global/global.css
+++ b/toolkit/themes/windows/global/global.css
@@ -321,3 +321,38 @@ label[disabled="true"]:-moz-system-metric(windows-classic) {
   background-position: left bottom;
 %endif
 }
+
+/* :::::: Close button icons ::::: */
+
+.close-icon {
+  list-style-image: url("chrome://global/skin/icons/close.png");
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+.close-icon:hover {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+.close-icon:hover:active {
+  -moz-image-region: rect(0, 48px, 16px, 32px);
+}
+
+%ifdef XP_WIN
+@media (-moz-windows-theme: luna-blue) {
+  .close-icon {
+    list-style-image: url("chrome://global/skin/icons/close-lunaBlue.png");
+  }
+}
+
+@media (-moz-windows-theme: luna-olive) {
+  .close-icon {
+    list-style-image: url("chrome://global/skin/icons/close-lunaOlive.png");
+  }
+}
+
+@media (-moz-windows-theme: luna-silver) {
+  .close-icon {
+    list-style-image: url("chrome://global/skin/icons/close-lunaSilver.png");
+  }
+}
+%endif
diff --git a/toolkit/themes/windows/global/icons/close-lunaBlue.png b/toolkit/themes/windows/global/icons/close-lunaBlue.png
new file mode 100644
index 0000000000000000000000000000000000000000..b657c47e44f9e2b6c75dfc7c7f59a181977e760f
GIT binary patch
literal 905
zcmV;419tq0P)<h;3K|Lk000e1NJLTq002M$000mO1^@s6rssJn0009}Nkl<Zc-rlk
zOGs346vh)*VhZLaa;9CO&WxJx_p?YxDJxT_u?JewvQ5h%B5l(qY7?nFjLK{@t*p%6
zEm{Z@5`;!N>db^DMIn*n<8;0YcldL=k4T|K4*cN!zw@1e^WC}E>nbApuUQFTxxVO0
z=Eg>5mLUUX;Z@F`+Yr;p%rayEJipC{My~rCmM?(8;`n)QMFRN@fM>A85>U=JTTJt}
z)7DdGx<2qUTg?HD0797vCYlLjLI7%L=)t2KK!YQvh;cJff))i0J*@z+7??hFl<@I8
z3rN;b<AWZ~6O3~HT9TPuyx_C?O8WGwpL&WdI0Mws(38&aY6K9`(RKGQpNDoi8?yKu
z4p2iw4<4fc+yYTR)U*PasIU>B#f2a~XFd=$cz}8Ue0BXV9|!3vvH($oM=yYAuHVa)
zRyvA-sKKKfz|^GgG!|9k^OV0yD}eEG8v*a00$QA#Q^o7ZC)uZ*Z{wx#^X}$_ea|1N
z(p_kgJZ;(mgk==kYxw+5jnurY)$kZS1H!RreQmb;kTZ7xpoWH?RsbGeN@koFU7Y<X
zB59&WIe#_DL>*~ni93by<bB#J0xj5wS0jKBCUR5u<~r8iia<jT9>a&=#q%d)4pe91
zst*9v(9qLj)NUi0vD!RZ_%S0QX@W;JfLpvA=qik(iT-;c(B!^R0O2L&RVAzqh(JTn
zFo1nknQIug22ol8jM%LN#vHu-%y%_7gj|w+%K0n2R68%%$ya*3uSX5;#YrA`wQhm!
zHTyI9{6>w6s=5rrTfn(9!!0v4>2Cs}rWL@)GAn`kZ(o9VYH}q+P4+40FDIJlW~!My
z54wW53gUpMNgjB09)hoB60?e(K-3H$f{*UEUvTV5!}8KS4^TrxPb+{AycF;qKSJ|g
zr)h*2mo?PT(33Qs0Q&aY$<yn?;y44;(9kmqAfoBa*<*Zuk({$-H|}|W8X9^=e+EG;
zb3*aJLk%rfD}Z6UZDE)f`xDq3P|jaUGA~?DG1HAyec)lQ-iy#$CY@Q$gaFjg(9?Jk
zS~{Z#%Ug!Ztbw6Y3+ch0xe@j%=Uv+hT3Qp$fz|{Q>A{{kc>lqxupu!_GLvFJGQ3Nj
fU#0+7{u}%S+V;>@heN*200000NkvXXu0mjfT!g4P

literal 0
HcmV?d00001

diff --git a/toolkit/themes/windows/global/icons/close-lunaOlive.png b/toolkit/themes/windows/global/icons/close-lunaOlive.png
new file mode 100644
index 0000000000000000000000000000000000000000..b071b141b5db14b87eafcbd7d5f5cac19ae82a68
GIT binary patch
literal 909
zcmV;819JR{P)<h;3K|Lk000e1NJLTq002M$000mO1^@s6rssJn000A2Nkl<Zc-rlk
zOGs346vmTQW(Foiq|>fY#}_`w=jdpqqeX(L<5-ziv~1Hd2ug!iMYM?29!4)4O)D$2
zcZ(Lngao0Hj*pqpq$nhE#_@E%#U1Y4?*HCMp+ye-<ov($oyGaa`}ewni2iGq1Hg}^
z;E8E-6Enw<4s-A-=g)46YGURX(gB{|=GSdl^*1bC0E3pe`N{G`a_a!kV3E<QoNqBk
z&)-hpNSztlz|#_M@CpK0$%HeJOehlqP(wox9?bx34LOC3lZlWt)X>lq1%SoC%!$K<
zkH>B%NkfefdN@xo%K59w26FI%&l+~pr&s;dV=)rW05vr9aE4b9KzR3E$3Z?1)i>5;
z@i`2jhK3$IdI30PL;$%a3Sgo<fdDP|1Gw$^AV`yZssZq~>v{P&Ku@6&$TfJh0*K`L
zy+oC5y9LNKcr*i;ns%SWqH0Wk_B4wE7%xj8Fj;G+1)ooqNn1WiKIMEnFNI(4ZeG~^
z{Glq{1xA9WT^vB@R%>20pWmrbye+#59=$st42#z6%W>Kd<P8AS(9jbF;Nqnu#(B|&
zxt~EmlY5l&SCXTtBi%sYPC*<^KJAqQEzpNo5I_jCrm#4(j<vUPprHqk?j?Bc!tto;
z`fR7IF?Rr<hK8PqQELK8jMe0k|Ho_)&}1If0B-SepsOI3Ci?HmfhP6!0tl<9EGc4b
zKn^tYbOWf`lf9O43WyK|Fk+1-FlOWBXTPh#A>@+eQ_f%JrEc<ao%~IY_w}gK$sxc4
zujmn|+goYk^BXm4>nbvJAAw4HmQ!MS+S3f=nkayerSSyjzkLbds?G&Ln&eZ?UrLIm
z8)*h|J?IMHFvo%*4IX$kF2UClW=pyq$Ti(d@cyHY^A$FebBY(oGY?QhLr)aI2VM%e
zj~=4=uQN2li%S}6Xy{3rD1g4*R&w<^usF^DH8k|}0ti2S=F|~Bzp!jE?ZPt;P(wpc
z@6RBJVU8&-Jk-!)L;(z26a2%x*q^{&uX6rkvcZ2X)j-$Nw1J1cS}#KDnG9w%69P~}
zLr?G`w0K7Mm$eR+#(RfKjHCs7d?V~t&O3IPTicQh-nPVO(t<rcc>mq2u$U+&g-O*R
j1>VKZFHr!?{|){EJY3ktlR*OZ00000NkvXXu0mjfE|IJ7

literal 0
HcmV?d00001

diff --git a/toolkit/themes/windows/global/icons/close-lunaSilver.png b/toolkit/themes/windows/global/icons/close-lunaSilver.png
new file mode 100644
index 0000000000000000000000000000000000000000..36cbda9ab129b3905b2d0f7ac9bca924107b54a9
GIT binary patch
literal 901
zcmV;01A6?4P)<h;3K|Lk000e1NJLTq002M$000mO1^@s6rssJn0009_Nkl<Zc-rlk
zOH31C6on<O2vQfYAVS?~fR;yii3!kJBuZ(aBqCrD6w$bJ<I==L*h-8GHh>BSAGIK8
z&;Y*Bg$oykm>4iZc@!5SMnjB!alL0T&2*f9#t4ZEY4RoaKlj`w_p~#eZX=@qnymmf
z>y4fi@9kg$4CxSnS2=%mPihAfU`Pjeew$BD-t{+ZUI0_J%<z&UoBTS!GgWR1D(AaR
zY2kZ?yJ@gU8+f|S#-Jd8?Mxz*#Kbdk05vr9;L!}Arlz%s@h}FNW`KsCC;%)5R@%=I
zUdwI^Ng8Ur(8GC=QO@7YHIkPXeAeosPcJ8E#AYI#0cvRI;S8@JfW+b92WR*^-O_Su
zKc5o-YG~-eqZfcjh5^VmQ2>jMECRG1iQ;#cff!BlsRqEG?(*b#l#v4_AlKm03LuH=
z_Y!q=jW!_H;L!}=^XD(^SX7ObmDNk402ZpU2rM15(0VAO%2Hz)Nj~L#KQD!^_b@N)
zfBsmNVXKMY=@$nOUr}MN=kq%?Y_>y3;nBMXBw*3%>XV+@+S3C7H8k`@0r+?+i3MJC
zJ@7LIXmXEozArb8JcULA_pO<<^mJ4Xv}hk*K>%@#!D2bs#M)aq(9nZN_a@lY)tBOQ
zp76L_Z36%`H1tHw*|SJuzM+&NKh|P^CiAEUaF>?@L)HvhoOmb)n$*_|Ai?E2QqI~N
zIndD44Z!Ja*~xeW7(@Zg+RX&!8+rM)?`m)eB_#Qj^EY^@JG|T=f6@zMBdQE?2=Krw
zx&++rmSR4?R->VzX`k*T;BYj1B=EHda!nM#$4WDS@VC_{zWNdnqe(vH{PmnPx?Nx-
z-=m=@UP}gu(cpns<0kk@qO{cJ269dJCOAGmdAX{pIeN_l)X>lq1@M8F0{#nUDg1SX
zW_fW*Lk$f*NfQMycHB<BQ7;z98K8!So?ZZnot;<C^ZA9<T2Y5<9-xMXp5D(ONM|l8
zZg{AnrHcZXv1dhQc(Ff$y+P&twOnIlAm2#03bcWTy;=`KDNGTwgNXyEp`j;u5ZX9%
zZB;$fmFD2|VH0V=p3p3NmGj<eOHXf(G1!}(Mq02Z1n<9l6c&@p<T3d=<iWeq`ArI7
b>)+rn+TYr9Q7f@}00000NkvXXu0mjfo^+r4

literal 0
HcmV?d00001

diff --git a/toolkit/themes/windows/global/icons/close-win8.png b/toolkit/themes/windows/global/icons/close-win8.png
new file mode 100644
index 0000000000000000000000000000000000000000..803e148b73b19b591bc8cb46289592f453fb1e50
GIT binary patch
literal 838
zcmV-M1G)T(P)<h;3K|Lk000e1NJLTq002M$000mO1^@s6rssJn0009GNkl<Zc-rlk
z-%C?r7{?Q&n{^Q_FkFRH(wy_>w5H-FTiR3*6-_M*yy&Vwz&jbp{(-Ke-?X&NTytcC
zh~9M5@6>4!McKL&K@jJrPtW(z8864ZI}5uA^1z3^@AvsWgZI0$XJ-e9=)Yz^fWP%d
z5xd>T#2L~d4zITVW?`X^i8G`_9NvE}fR`>;GTPcoOFF>A-nh2^mc^0`*laXbRh1EV
z*t@GA<Q>b;7I^??&bOEuFJlli12oiR0YqC`2&@bb6RuBveWYqw<3bJlMMm5Iu&j)N
ze88E30s1*NN6#7>um@N}LrvMkD+vIv9wx>Zg~J-5p{5(a>2n^hfB}e_EP%!4W&*Uc
zlVZ8IS3%TNpSJ%&X{qw*#%5<zgq%(wYKjNm3<1Ohj6l?M1MmkU$4}Xsyy+MXO`2o@
zEO<NwmV0_=Cy_|Y64zAUt^i6(C{S5RA%}y0%*><(HF)5a1<-%>ni~gAN8jasmtFuM
zXJq`jsi4x$hrTcbu!e@3EP(l@CQ^xZchmOfrih}69&P`9tCgNqR49zs*VD@Mv<S3R
z9o`HxAQuOf96nb!0ARm(>CnkCr?;TIVF+Li4K*1b8XHMvv8#)=H#S5RP4J`*V6?nk
z;b~nReV>{Vfu`0o1^}YbXr49zXju)x6V^Hd<CS2L1@PYOCa}=iNy+u~v@CRVkm}R+
z-zzSr5gu-1e9&)`lW7^NtyMhmW|#p-nV1BlZUCktyH~{@44Z(c$pU!iauG<Zt)-Z6
zZ&wgC)u-*hYq8K{9&TSFkrct28X#(l2VPkK+S?xd(Gcvoa=kkLY_-=P2r1urfHgGK
zWC6V8pDOTqaF7zKtMsw04SRq!G}Ka>w*O915&3zzz2HIlB^;)J-HtuL8X9WK9$r}h
z;faYG;&)!038-Z=0}e7rGy^XO8fvlt-Z-5}hO#8SD*&@O`G{|Aztx%%c-WiiLFh1J
z69*pF&`^^Euy<ZN96lz_kPcg~*sJZoZ8rOuI72#Y!Mn#N!Tmo&`vLss7XoW=13x}{
Qod5s;07*qoM6N<$g7klW7XSbN

literal 0
HcmV?d00001

diff --git a/toolkit/themes/windows/global/icons/close.png b/toolkit/themes/windows/global/icons/close.png
index bfd53d29df60f20cf646447ce81478d6f1e819e8..ae989fd8b86625273be592b626efa84164b764ed 100644
GIT binary patch
delta 995
zcmV<9104MQ2>1t(BYy+GNkl<Zc-rlkT}YE*6vvwth*4l46j>3LmAce6%gv!%TZ&T<
zHKh-{smr?RrYJ!cB1Kmr2wkLoVp)C`f(c@IkymLS+jNo@r3GD76iB*{)A_&fj+b}u
z^DeZTK;ehy{Lg=|bGGL^@0Nu^p+!SP|1C=cP&H#<5}4(PRewNBK&&-@K8vN1nPVsp
zbMUI)NK;x`BQwWP9N>w0{pxj_7lgX`6-*+Ng#X9|nn68)5vMaWURFjEae!yU<(gMF
za6Ka<)L}MLS8lE@@LbQ#oEHpWC9{!9Ws(^KKnx8vctit8K!b-*o-yytEA_PZ^rvvX
z1|Wup8a(i-2Y)bLT1sHLp@Hx>dF&W+fEW^LQtoHe4cyJnrcQ2f=)?*7GCWL=91i3F
zF*MYq9A3cyHa0b1yTbX;gT-aFoUaFnp`iwkXaLKZq#XxJJTe1MpYH%l4IX&a1Ms`u
z1Sk@T5;%GkC^dLMOaphavZPP<^Rs7BdhK?g)FcnQf`0*|a{OJ!W-mGglo~vGM<DTy
ze=<MST<p=p7kF!hN9zdqN=gU>jvS##FsR7{*JNMJ0QT;s4wH#`3kzvxXh;*(;DJ{#
zfaF}Oy^iy*TA1<*>fnjD1Cj%8-xY2*xwz>=^#Cz6)I>YLTU<;s<25xD{{35tq$xe>
z25uXT^nY;QK8c=!0-7EiR01tphgUEF1G6bRH~$iAGfJSL22Z>JtQj00N!ylf_iWE`
z)C0uOP!kQ{bx{$?_^YcaJUgpI(i9%e0X)dbk?6MB=+nS}5@>Qg-T>AgupK<j+IuC?
zP>VN!#5?WXTecc)9xd8B9;Jwmz$=%FfUl~GLVv%0Y2vG_ga^bla4R#D+IhKkaibsm
z`!(sx&zC&#ijIJzsPs7J0WAugCCA~>U4kj;7LUxt<WwP0Xu>7<(&;1+{P81-x1s_l
zHF!Ww12;1==sqvE4}E=6I;~cq)FcnQI!n+iV>DSBfl`A<_Zqx-`Ko*K?)@IGKVZd~
z2Y-m6p(eTp$M~uOQ|Hc6@Y^?fQ(lf7AclsTti?2NBR!q&@p5~@i}L;B$JAl5AP0z{
zp(f?<imt)47wVfiALBEB9%mjPhK3qEx;r2eiL7Oe;c$2ra)1~bYN8!5>TrZd`O5km
z*gLN=fN&dsweJ~?y1>I;y$7LPOgXcGF<bz|&`=XR2rd3m*jHQI^1^PPf5BIk9_$Hv
z*{g1#)9r3)<;Gg~>>)ka6NLBQKMF7Y$50AmV$5+c!K-RuVXt5O0G56Y{s9(o$7SL$
R3hw{_002ovPDHLkV1g2`&GG;M

delta 1129
zcmV-v1eW{w2mJ_;BYy-$Nkl<Zc-qaEZA_JA9L8yDZT2NZ*zig44UXUrdJczq28e)f
zC5$%}$fZOvWN54xEnBr_t5(BoZ8mZ(q*{U?NZFdMDYJ&FP0sPe%L><)%LD_ptxqM`
z)&1+!^WmIlXPrL4_T&EF|NnJ;xUX}b`<xReDJJ-nWc?TL#((I?8x#DC73*MGS>s->
zcW`%RrlJ8Y9=z~ec6Q@q2?>Kc=FL+ypv8lCP6V*W;~Bj4;sM<{d`LInZgm6=T0D4x
z12tQgURk+P2i<N*(4fULX98$&xitOyYns@<UlaTGIf4c)9=yP-dMGDHJzKV@x3ts|
zG-&b6nE;+hPk-0s%P;9_ON+*vn>Etd$jUx!4=o;h0PpAL>r7RZzO1a&>GE>1p53|?
z>^(GS!v=7FvhM*yn!(4)K3vZ+fD~(f$C8wUD=81oKbE#6DGsRVF$)(!{qp7d<-qeA
zZ)(!*(J}pbXGT-Q!wS^b3#jQaLxUENJ%F~{Tzz2<d4Hw<GfiF&>BqiP>MJP$YI@Aj
zpp6tj+VsuaUrG9dm3_FLQvi^)F3;1M=~{Tv9R59^rpGK?0Ch{3>gQ*l(GLv`I=_9p
zehpqW2cFe$q3;FM^q8SRi^m?oku_^{+8p-N4I4CivR9MAkjBgk)byC4K^q}}c*6>F
z(6f?$XMeTV%+N&h2xL99G54r9Yw_nm9pUg`?MzM8c*~O-t*g`Uu3b7~UZrb+p#GYf
z6;RV-h6XJjdjRkHeCpr4S*JE_QpdV=8t(4aL@)@{^q8SR8!3Q$3=0eylQ*XOB~1f0
zJ!WVe14vuEATHg!?F;ifNAhx3bOALzX5j+Zv43chMw@mkSX-;1ni>sMROosjpgXg7
z1=RGIp+Sqs9>C$%tJPCntnQ*BeNs@M;S(n`5eNb`J!WXoMhXDp4K8!&laj6jH9cl%
zq6y#wuRHZZ*~9rqftp^V0BS8up~vg>t+}MmnVb4XFsK=G@M}W>0X02lXwc%Z2hi$v
ztABItT78t4r;#pmc;gFob^<j$W@yklUV>B8xB4VqWwqDQT!IA9?shE<Z7lM2@wNwQ
zdd$KFP@SBtOFJLc1@jR#WuEofyMK#=_Y@WisOd37gBFiHfVVO-^s(Qsk$(?7q|ou>
zYV-MknjSMWXd?x{;d><g#A^1LVDCkB34a=jSRHzHtZhk2`tFfh4VY)N*F3B3em^Vw
zusyVR>;b&ta;YOHM{ORD-dVMZm3_D#TE|P!;4@?x5`mhY!zCCKR#jr6F4k1*{QC7e
zS6u7}8nk%q0ld0wnLacJZ1;MdK!eul61>-NA1nKCz5hLcYRekvDlO4BRh9a>qGH?;
zG-&bIz6uZQHG#aDmZsM9bVtyj#WQEV2|iU&P~ViDJysqcuV_Gv2QR$f_t!t|c8^8-
vV+bvtxe$Q;=j=Aao+v?U;f>LcHzxi8Y~%!UV2Dyt00000NkvXXu0mjf7lSRT

diff --git a/toolkit/themes/windows/global/jar.mn b/toolkit/themes/windows/global/jar.mn
index b409490939eb..db2befe9a95d 100644
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -103,6 +103,9 @@ toolkit.jar:
         skin/classic/global/icons/blacklist_large.png            (icons/blacklist_large.png)
         skin/classic/global/icons/Close.gif                      (icons/Close.gif)
         skin/classic/global/icons/close.png                      (icons/close.png)
+        skin/classic/global/icons/close-lunaBlue.png             (icons/close-lunaBlue.png)
+        skin/classic/global/icons/close-lunaOlive.png            (icons/close-lunaOlive.png)
+        skin/classic/global/icons/close-lunaSilver.png           (icons/close-lunaSilver.png)
         skin/classic/global/icons/collapse.png                   (icons/collapse.png)
         skin/classic/global/icons/Error.png                      (icons/Error.png)
         skin/classic/global/icons/error-16.png                   (icons/error-16.png)
diff --git a/toolkit/themes/windows/global/notification.css b/toolkit/themes/windows/global/notification.css
index 0481d0919605..70534dfaaf8b 100644
--- a/toolkit/themes/windows/global/notification.css
+++ b/toolkit/themes/windows/global/notification.css
@@ -42,21 +42,11 @@ notification[type="critical"] {
 }
 
 .messageCloseButton {
-  list-style-image: url("chrome://global/skin/icons/close.png");
   -moz-appearance: none;
-  -moz-image-region: rect(0, 16px, 16px, 0);
   padding: 4px 2px;
   border: none !important;
 }
 
-.messageCloseButton:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-.messageCloseButton:hover:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
-}
-
 .messageCloseButton > .toolbarbutton-icon {
   -moz-margin-end: 5px;
 }
@@ -172,8 +162,3 @@ XXX: apply styles to all themes until bug 509642 is fixed
   -moz-margin-end: -14px;
   margin-top: -10px;
 }
-
-.popup-notification-closeitem {
-  list-style-image: url("chrome://global/skin/icons/close.png");
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}

From e43023925b86ae373bbe8c987665f53c7c4a9e82 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Mon, 3 Jun 2013 20:59:31 +0200
Subject: [PATCH 216/230] Bug 870452 - Migrate feed button to new API,
 r=mconley

---
 browser/base/content/browser-feeds.js         | 64 +++++++------------
 browser/base/content/browser.css              |  6 +-
 browser/base/content/browser.xul              | 14 ----
 .../customizableui/content/panelUI.inc.xul    |  2 +
 .../customizableui/content/panelUI.js         |  3 +
 .../customizableui/content/panelUI.xml        |  3 +
 .../customizableui/src/CustomizableUI.jsm     | 38 +++++++++--
 .../src/CustomizableWidgets.jsm               | 41 ++++++++++++
 .../locales/en-US/chrome/browser/browser.dtd  |  3 -
 .../customizableWidgets.properties            |  3 +
 10 files changed, 110 insertions(+), 67 deletions(-)

diff --git a/browser/base/content/browser-feeds.js b/browser/base/content/browser-feeds.js
index 7bba39540824..5b432ede2f94 100644
--- a/browser/base/content/browser-feeds.js
+++ b/browser/base/content/browser-feeds.js
@@ -8,66 +8,50 @@
  * and shows UI when they are discovered.
  */
 var FeedHandler = {
-  /**
-   * The click handler for the Feed icon in the toolbar. Opens the
-   * subscription page if user is not given a choice of feeds.
-   * (Otherwise the list of available feeds will be presented to the
-   * user in a popup menu.)
-   */
-  onFeedButtonClick: function(event) {
-    event.stopPropagation();
-
-    let feeds = gBrowser.selectedBrowser.feeds || [];
-    // If there are multiple feeds, the menu will open, so no need to do
-    // anything. If there are no feeds, nothing to do either.
-    if (feeds.length != 1)
-      return;
-
-    if (event.eventPhase == Event.AT_TARGET &&
-        (event.button == 0 || event.button == 1)) {
-      this.subscribeToFeed(feeds[0].href, event);
-    }
-  },
-
- /** Called when the user clicks on the Subscribe to This Page... menu item.
+  /** Called when the user clicks on the Subscribe to This Page... menu item,
+   * or when the user clicks the feed button when the page contains multiple
+   * feeds.
    * Builds a menu of unique feeds associated with the page, and if there
    * is only one, shows the feed inline in the browser window.
-   * @param   menuPopup
-   *          The feed list menupopup to be populated.
-   * @returns true if the menu should be shown, false if there was only
+   * @param   container
+   *          The feed list container (menupopup or subview) to be populated.
+   * @param   isSubview
+   *          Whether we're creating a subview (true) or menu (false/undefined)
+   * @returns true if the menu/subview should be shown, false if there was only
    *          one feed and the feed should be shown inline in the browser
-   *          window (do not show the menupopup).
+   *          window (do not show the menupopup/subview).
    */
-  buildFeedList: function(menuPopup) {
+  buildFeedList: function(container, isSubview) {
     var feeds = gBrowser.selectedBrowser.feeds;
-    if (feeds == null) {
+    if (!isSubview && feeds == null) {
       // XXX hack -- menu opening depends on setting of an "open"
       // attribute, and the menu refuses to open if that attribute is
       // set (because it thinks it's already open).  onpopupshowing gets
       // called after the attribute is unset, and it doesn't get unset
       // if we return false.  so we unset it here; otherwise, the menu
       // refuses to work past this point.
-      menuPopup.parentNode.removeAttribute("open");
+      container.parentNode.removeAttribute("open");
       return false;
     }
 
-    while (menuPopup.firstChild)
-      menuPopup.removeChild(menuPopup.firstChild);
+    while (container.firstChild)
+      container.removeChild(container.firstChild);
 
-    if (feeds.length <= 1)
+    if (!feeds || feeds.length <= 1)
       return false;
 
     // Build the menu showing the available feed choices for viewing.
+    var itemNodeType = isSubview ? "toolbarbutton" : "menuitem";
     for (let feedInfo of feeds) {
-      var menuItem = document.createElement("menuitem");
+      var item = document.createElement(itemNodeType);
       var baseTitle = feedInfo.title || feedInfo.href;
       var labelStr = gNavigatorBundle.getFormattedString("feedShowFeedNew", [baseTitle]);
-      menuItem.setAttribute("class", "feed-menuitem");
-      menuItem.setAttribute("label", labelStr);
-      menuItem.setAttribute("feed", feedInfo.href);
-      menuItem.setAttribute("tooltiptext", feedInfo.href);
-      menuItem.setAttribute("crop", "center");
-      menuPopup.appendChild(menuItem);
+      item.setAttribute("class", "feed-" + itemNodeType);
+      item.setAttribute("label", labelStr);
+      item.setAttribute("feed", feedInfo.href);
+      item.setAttribute("tooltiptext", feedInfo.href);
+      item.setAttribute("crop", "center");
+      container.appendChild(item);
     }
     return true;
   },
@@ -76,7 +60,7 @@ var FeedHandler = {
    * Subscribe to a given feed.  Called when
    *   1. Page has a single feed and user clicks feed icon in location bar
    *   2. Page has a single feed and user selects Subscribe menu item
-   *   3. Page has multiple feeds and user selects from feed icon popup
+   *   3. Page has multiple feeds and user selects from feed icon popup (or subview)
    *   4. Page has multiple feeds and user selects from Subscribe submenu
    * @param   href
    *          The feed to subscribe to. May be null, in which case the
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 0f140e4a5cae..d82c6fdcbde4 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -183,11 +183,7 @@ toolbar[overflowable]:not([overflowing]) > .overflow-button {
   visibility: collapse;
 }
 
-#feed-button > .toolbarbutton-menu-dropmarker {
-  display: none;
-}
-
-#feed-menu > .feed-menuitem:-moz-locale-dir(rtl) {
+#PanelUI-feeds > .feed-toolbarbutton:-moz-locale-dir(rtl) {
   direction: rtl;
 }
 
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 940f289c4914..2922952d9b2c 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -998,20 +998,6 @@
                      label="&fullScreenCmd.label;"
                      tooltiptext="&fullScreenButton.tooltip;"/>
 
-      <toolbarbutton id="feed-button"
-                     type="menu"
-                     class="toolbarbutton-1 chromeclass-toolbar-additional"
-                     disabled="true"
-                     label="&feedButton.label;"
-                     tooltiptext="&feedButton.tooltip;"
-                     onclick="return FeedHandler.onFeedButtonClick(event);">
-        <menupopup position="after_end"
-                   id="feed-menu"
-                   onpopupshowing="return FeedHandler.buildFeedList(this);"
-                   oncommand="return FeedHandler.subscribeToFeed(null, event);"
-                   onclick="checkForMiddleClick(this, event);"/>
-      </toolbarbutton>
-
 #ifdef MOZ_SERVICES_SYNC
       <toolbarbutton id="sync-button"
                      class="toolbarbutton-1 chromeclass-toolbar-additional"
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index a4be3b4326cd..5019b3fb01ba 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -40,6 +40,8 @@
              onclick="PlacesCommandHook.showPlacesOrganizer('History'); PanelUI.hide();"/>
     </panelview>
 
+    <panelview id="PanelUI-feeds" flex="1" oncommand="FeedHandler.subscribeToFeed(null, event);"></panelview>
+
     <panelview id="PanelUI-help" flex="1">
       <label value="&helpMenu.label;"/>
       <vbox id="PanelUI-helpItems"/>
diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
index 6feee58def75..da727db1b478 100644
--- a/browser/components/customizableui/content/panelUI.js
+++ b/browser/components/customizableui/content/panelUI.js
@@ -162,6 +162,9 @@ const PanelUI = {
       let evt = document.createEvent("CustomEvent");
       evt.initCustomEvent("ViewShowing", true, true, viewNode);
       viewNode.dispatchEvent(evt);
+      if (evt.defaultPrevented) {
+        return;
+      }
 
       let tempPanel = document.createElement("panel");
       tempPanel.setAttribute("type", "arrow");
diff --git a/browser/components/customizableui/content/panelUI.xml b/browser/components/customizableui/content/panelUI.xml
index dcb86ae2bb39..b40f05cd8455 100644
--- a/browser/components/customizableui/content/panelUI.xml
+++ b/browser/components/customizableui/content/panelUI.xml
@@ -191,6 +191,9 @@
           let evt = document.createEvent("CustomEvent");
           evt.initCustomEvent("ViewShowing", true, true, viewNode);
           viewNode.dispatchEvent(evt);
+          if (evt.defaultPrevented) {
+            return;
+          }
 
           this._currentSubView = viewNode;
 
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index a8cd3afac178..f97f6de03c9a 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -768,8 +768,10 @@ let CustomizableUIInternal = {
       }
       node.setAttribute("class", "toolbarbutton-1 chromeclass-toolbar-additional");
 
-      let handler = this.handleWidgetClick.bind(this, aWidget, node);
-      node.addEventListener("command", handler, false);
+      let commandHandler = this.handleWidgetCommand.bind(this, aWidget, node);
+      node.addEventListener("command", commandHandler, false);
+      let clickHandler = this.handleWidgetClick.bind(this, aWidget, node);
+      node.addEventListener("click", clickHandler, false);
 
       // If the widget has a view, and has view showing / hiding listeners,
       // hook those up to this widget.
@@ -796,6 +798,10 @@ let CustomizableUIInternal = {
 
         LOG("Widget " + aWidget.id + " showing and hiding event handlers set.");
       }
+
+      if (aWidget.onCreated) {
+        aWidget.onCreated(node);
+      }
     }
 
     aWidget.instances.set(aDocument, node);
@@ -826,8 +832,8 @@ let CustomizableUIInternal = {
     return def;
   },
 
-  handleWidgetClick: function(aWidget, aNode, aEvent) {
-    LOG("handleWidgetClick");
+  handleWidgetCommand: function(aWidget, aNode, aEvent) {
+    LOG("handleWidgetCommand");
 
     if (aWidget.type == "button") {
       this.maybeAutoHidePanel(aEvent);
@@ -841,7 +847,7 @@ let CustomizableUIInternal = {
       } else {
         //XXXunf Need to think this through more, and formalize.
         Services.obs.notifyObservers(aNode,
-                                     "customizedui-widget-click",
+                                     "customizedui-widget-command",
                                      aWidget.id);
       }
     } else if (aWidget.type == "view") {
@@ -851,6 +857,24 @@ let CustomizableUIInternal = {
     }
   },
 
+  handleWidgetClick: function(aWidget, aNode, aEvent) {
+    LOG("handleWidgetClick");
+    if (aWidget.type == "button") {
+      this.maybeAutoHidePanel(aEvent);
+    }
+
+    if (aWidget.onClick) {
+      try {
+        aWidget.onClick.call(null, aEvent);
+      } catch(e) {
+        Cu.reportError(e);
+      }
+    } else {
+      //XXXunf Need to think this through more, and formalize.
+      Services.obs.notifyObservers(aNode, "customizedui-widget-click", aWidget.id);
+    }
+  },
+
   maybeAutoHidePanel: function(aEvent) {
     if (aEvent.type == "keypress" && 
         !(aEvent.keyCode == aEvent.DOM_VK_ENTER ||
@@ -1361,6 +1385,10 @@ let CustomizableUIInternal = {
       }
     }
 
+    widget.onClick = typeof aData.onClick == "function" ? aData.onClick : null;
+
+    widget.onCreated = typeof aData.onCreated == "function" ? aData.onCreated : null;
+
     if (widget.type == "button") {
       widget.onCommand = typeof aData.onCommand == "function" ?
                            aData.onCommand :
diff --git a/browser/components/customizableui/src/CustomizableWidgets.jsm b/browser/components/customizableui/src/CustomizableWidgets.jsm
index 2d5654c589d1..226035c0052a 100644
--- a/browser/components/customizableui/src/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/src/CustomizableWidgets.jsm
@@ -450,4 +450,45 @@ const CustomizableWidgets = [{
 
       return node;
     }
+  },
+  {
+    id: "feed-button",
+    type: "view",
+    viewId: "PanelUI-feeds",
+    removable: true,
+    defaultArea: CustomizableUI.AREA_PANEL,
+    allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
+    onClick: function(aEvent) {
+      let win = aEvent.target.ownerDocument.defaultView;
+      let feeds = win.gBrowser.selectedBrowser.feeds;
+
+      // Here, we only care about the case where we have exactly 1 feed and the
+      // user clicked...
+      let isClick = (aEvent.button == 0 || aEvent.button == 1);
+      if (feeds && feeds.length == 1 && isClick) {
+        aEvent.preventDefault();
+        aEvent.stopPropagation();
+        win.FeedHandler.subscribeToFeed(feeds[0].href, aEvent);
+      }
+    },
+    onViewShowing: function(aEvent) {
+      let doc = aEvent.detail.ownerDocument;
+      let container = doc.getElementById("PanelUI-feeds");
+      let gotView = doc.defaultView.FeedHandler.buildFeedList(container, true);
+
+      // For no feeds or only a single one, don't show the panel.
+      if (!gotView) {
+        aEvent.preventDefault();
+        aEvent.stopPropagation();
+        return;
+      }
+    },
+    onCreated: function(node) {
+      let win = node.ownerDocument.defaultView;
+      let selectedBrowser = win.gBrowser.selectedBrowser;
+      let feeds = selectedBrowser && selectedBrowser.feeds;
+      if (!feeds || !feeds.length) {
+        node.setAttribute("disabled", "true");
+      }
+    }
   }];
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 2b2ad0bd111f..5cf8817a4570 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -166,9 +166,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY tabGroupsButton.label        "Tab Groups">
 <!ENTITY tabGroupsButton.tooltip      "Group your tabs">
 
-<!ENTITY feedButton.label             "Subscribe">
-<!ENTITY feedButton.tooltip           "Subscribe to this page…">
-
 <!ENTITY bookmarksButton.label          "Bookmarks">
 <!ENTITY bookmarksCmd.commandkey "b">
 
diff --git a/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties b/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties
index af4bb723b1cf..e1c7a36c4b97 100644
--- a/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties
+++ b/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties
@@ -62,3 +62,6 @@ copy-button.tooltiptext = Copy
 
 paste-button.label = Paste
 paste-button.tooltiptext = Paste
+
+feed-button.label = Subscribe
+feed-button.tooltiptext = Subscribe to this page…

From 7cf48ca098a1b934e1c0ccf1c53d38212fcdfe6e Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 6 Jun 2013 18:53:28 +0200
Subject: [PATCH 217/230] Bug 880322 - Remove support for icons property;
 consumers should be using CSS for styling. rs=mconley

---
 .../customizableui/src/CustomizableUI.jsm     | 10 -----
 .../src/CustomizableWidgets.jsm               | 40 -------------------
 2 files changed, 50 deletions(-)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index f97f6de03c9a..c2a3d9cf12fc 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -1330,7 +1330,6 @@ let CustomizableUIInternal = {
       allowedAreas: [],
       shortcut: null,
       description: null,
-      icons: {}
     };
 
     if (typeof aData.id != "string" || !/^[a-z0-9-_]{1,}$/i.test(aData.id)) {
@@ -1376,15 +1375,6 @@ let CustomizableUIInternal = {
 
     widget.disabled = aData.disabled === true;
 
-    if (typeof aData.icons == "object") {
-      let sizes = Object.keys(aData.icons);
-      for (let size of sizes) {
-        if (size == parseInt(size, 10)) {
-          widget.icons[size] = aData.icons[size];
-        }
-      }
-    }
-
     widget.onClick = typeof aData.onClick == "function" ? aData.onClick : null;
 
     widget.onCreated = typeof aData.onCreated == "function" ? aData.onCreated : null;
diff --git a/browser/components/customizableui/src/CustomizableWidgets.jsm b/browser/components/customizableui/src/CustomizableWidgets.jsm
index 226035c0052a..fa642e4ef465 100644
--- a/browser/components/customizableui/src/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/src/CustomizableWidgets.jsm
@@ -39,11 +39,6 @@ const CustomizableWidgets = [{
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
-    icons: {
-      "16": "chrome://branding/content/icon16.png",
-      "32": "chrome://branding/content/icon48.png",
-      "48": "chrome://branding/content/icon48.png"
-    },
     onViewShowing: function(aEvent) {
       // Populate our list of history
       const kMaxResults = 15;
@@ -107,11 +102,6 @@ const CustomizableWidgets = [{
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL],
-    icons: {
-      "16": "chrome://branding/content/icon16.png",
-      "32": "chrome://branding/content/icon48.png",
-      "48": "chrome://branding/content/icon48.png"
-    },
     onCommand: function(e) {
       if (e.target && e.target.ownerDocument && e.target.ownerDocument.defaultView) {
         let win = e.target.ownerDocument.defaultView;
@@ -125,11 +115,6 @@ const CustomizableWidgets = [{
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL],
-    icons: {
-      "16": "chrome://branding/content/icon16.png",
-      "32": "chrome://branding/content/icon48.png",
-      "48": "chrome://branding/content/icon48.png"
-    },
     onCommand: function(aEvent) {
       let win = aEvent.target &&
                 aEvent.target.ownerDocument &&
@@ -143,11 +128,6 @@ const CustomizableWidgets = [{
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL],
-    icons: {
-      "16": "chrome://branding/content/icon16.png",
-      "32": "chrome://branding/content/icon48.png",
-      "48": "chrome://branding/content/icon48.png"
-    },
     onCommand: function(aEvent) {
       let win = aEvent.target &&
                 aEvent.target.ownerDocument &&
@@ -161,11 +141,6 @@ const CustomizableWidgets = [{
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL],
-    icons: {
-      "16": "chrome://branding/content/icon16.png",
-      "32": "chrome://branding/content/icon48.png",
-      "48": "chrome://branding/content/icon48.png"
-    },
     onCommand: function(aEvent) {
       let win = aEvent.target
                 && aEvent.target.ownerDocument
@@ -179,11 +154,6 @@ const CustomizableWidgets = [{
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL],
-    icons: {
-      "16": "chrome://branding/content/icon16.png",
-      "32": "chrome://branding/content/icon48.png",
-      "48": "chrome://branding/content/icon48.png"
-    },
     onCommand: function(aEvent) {
       let win = aEvent.target &&
                 aEvent.target.ownerDocument &&
@@ -197,11 +167,6 @@ const CustomizableWidgets = [{
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL],
-    icons: {
-      "16": "chrome://branding/content/icon16.png",
-      "32": "chrome://branding/content/icon48.png",
-      "48": "chrome://branding/content/icon48.png"
-    },
     onCommand: function(aEvent) {
       let win = aEvent.target &&
                 aEvent.target.ownerDocument &&
@@ -215,11 +180,6 @@ const CustomizableWidgets = [{
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL],
-    icons: {
-      "16": "chrome://branding/content/icon16.png",
-      "32": "chrome://branding/content/icon48.png",
-      "48": "chrome://branding/content/icon48.png"
-    },
     onCommand: function(aEvent) {
       let win = aEvent.target &&
                 aEvent.target.ownerDocument &&

From 13c4de9795262082d66102057d6573e5162102ca Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 6 Jun 2013 21:13:15 +0200
Subject: [PATCH 218/230] Bug 877447 - Make CustomizableUI.inDefaultState skip
 IDs for missing items, r=mconley

---
 .../customizableui/src/CustomizableUI.jsm     | 18 +++++++++++
 .../customizableui/test/Makefile.in           |  1 +
 .../test/browser_877447_skip_missing_ids.js   | 32 +++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 browser/components/customizableui/test/browser_877447_skip_missing_ids.js

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index c2a3d9cf12fc..6d3e5ebe4a40 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -1641,6 +1641,24 @@ let CustomizableUIInternal = {
       }
 
       let currentPlacements = gPlacements.get(areaId);
+      // We're excluding all of the placement IDs for items that do not exist,
+      // because we don't want to consider them when determining if we're
+      // in the default state. This way, if an add-on introduces a widget
+      // and is then uninstalled, the leftover placement doesn't cause us to
+      // automatically assume that the buttons are not in the default state.
+      let buildAreaNodes = gBuildAreas.get(areaId);
+      if (buildAreaNodes && buildAreaNodes.size) {
+        let container = [...buildAreaNodes][0];
+        // Clone the array so we don't modify the actual placements...
+        currentPlacements = [...currentPlacements];
+        // Loop backwards through the placements so we can easily remove items:
+        let itemIndex = currentPlacements.length;
+        while (itemIndex--) {
+          if (!container.querySelector(idToSelector(currentPlacements[itemIndex]))) {
+            currentPlacements.splice(itemIndex, 1);
+          }
+        }
+      }
       LOG("Checking default state for " + areaId + ":\n" + currentPlacements.join("\n") +
           " vs. " + defaultPlacements.join("\n"));
 
diff --git a/browser/components/customizableui/test/Makefile.in b/browser/components/customizableui/test/Makefile.in
index fe74e7d83c29..3c62fd7a2a40 100644
--- a/browser/components/customizableui/test/Makefile.in
+++ b/browser/components/customizableui/test/Makefile.in
@@ -13,6 +13,7 @@ include $(DEPTH)/config/autoconf.mk
 MOCHITEST_BROWSER_FILES = \
   browser_873501_handle_specials.js \
   browser_877178_unregisterArea.js \
+  browser_877447_skip_missing_ids.js \
   browser_878452_drag_to_panel.js \
   head.js \
   $(NULL)
diff --git a/browser/components/customizableui/test/browser_877447_skip_missing_ids.js b/browser/components/customizableui/test/browser_877447_skip_missing_ids.js
new file mode 100644
index 000000000000..18096b3e4d38
--- /dev/null
+++ b/browser/components/customizableui/test/browser_877447_skip_missing_ids.js
@@ -0,0 +1,32 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+let gTests = [
+  {
+    run: function() {
+      const kButtonId = "look-at-me-disappear-button";
+      CustomizableUI.reset();
+      ok(CustomizableUI.inDefaultState, "Should be in the default state.");
+      let btn = createDummyXULButton(kButtonId, "Gone!");
+      CustomizableUI.addWidgetToArea(kButtonId, CustomizableUI.AREA_NAVBAR);
+      ok(!CustomizableUI.inDefaultState, "Should no longer be in the default state.");
+      is(btn.parentNode.parentNode.id, CustomizableUI.AREA_NAVBAR, "Button should be in navbar");
+      btn.remove();
+      is(btn.parentNode, null, "Button is no longer in the navbar");
+      ok(CustomizableUI.inDefaultState, "Should be back in the default state, " +
+                                        "despite unknown button ID in placements.");
+    }
+  }
+];
+
+function cleanup() {
+  removeCustomToolbars();
+  resetCustomization();
+}
+
+function test() {
+  waitForExplicitFinish();
+  registerCleanupFunction(cleanup);
+  runTests(gTests);
+}

From 0f826e6601a45f9e40246ed946e65f5aac5f9d4c Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 6 Jun 2013 21:30:37 +0200
Subject: [PATCH 219/230] Bug 879317 - Customization target should support
 insertItem, r=jaws

---
 browser/components/customizableui/content/toolbar.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/browser/components/customizableui/content/toolbar.xml b/browser/components/customizableui/content/toolbar.xml
index 3ad58962e91d..1f4df4a9f770 100644
--- a/browser/components/customizableui/content/toolbar.xml
+++ b/browser/components/customizableui/content/toolbar.xml
@@ -99,7 +99,9 @@
           if (id)
             this._customizationTarget = document.getElementById(id);
 
-          if (!this._customizationTarget)
+          if (this._customizationTarget)
+            this._customizationTarget.insertItem = this.insertItem.bind(this);
+          else
             this._customizationTarget = this;
 
           return this._customizationTarget;

From 879127794684a0af381ddce5abe422e8998ca6d5 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Wed, 5 Jun 2013 13:39:08 +0200
Subject: [PATCH 220/230] Bug 879581 - Put a default sizemode="normal" on the
 browser window so we don't get windows without a sizemode, r=MattN

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

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 2922952d9b2c..745051202b36 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -49,6 +49,7 @@
         macanimationtype="document"
         screenX="4" screenY="4"
         fullscreenbutton="true"
+        sizemode="normal"
         persist="screenX screenY width height sizemode">
 
 # All JS files which are not content (only) dependent that browser.xul

From 6818e87a070a465b688b2142988300225e1c253e Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Fri, 7 Jun 2013 11:54:35 +0200
Subject: [PATCH 221/230] Bug 880124 - Make -moz-mac-fullscreen-button 0px wide
 on 10.6, which doesn't have a fullscreen button. r=smichaud

---
 widget/cocoa/nsNativeThemeCocoa.mm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/widget/cocoa/nsNativeThemeCocoa.mm b/widget/cocoa/nsNativeThemeCocoa.mm
index 7f1222190952..b7fd2949023c 100644
--- a/widget/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/cocoa/nsNativeThemeCocoa.mm
@@ -2766,9 +2766,11 @@ nsNativeThemeCocoa::GetMinimumWidgetSize(nsRenderingContext* aContext,
     }
 
     case NS_THEME_MOZ_MAC_FULLSCREEN_BUTTON: {
-      // This value is hardcoded because it's needed before we can measure the
-      // position and size of the fullscreen button.
-      aResult->SizeTo(20, 0);
+      if ([NativeWindowForFrame(aFrame) respondsToSelector:@selector(toggleFullScreen:)]) {
+        // This value is hardcoded because it's needed before we can measure the
+        // position and size of the fullscreen button.
+        aResult->SizeTo(20, 0);
+      }
       break;
     }
 

From e29ac840bfee5e17e5d98c9402a61aa942db114d Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Fri, 7 Jun 2013 11:55:30 +0200
Subject: [PATCH 222/230] Bug 880153 - Fix -moz-window-button-box fallback
 width on 10.6. r=smichaud

---
 widget/cocoa/nsNativeThemeCocoa.mm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/widget/cocoa/nsNativeThemeCocoa.mm b/widget/cocoa/nsNativeThemeCocoa.mm
index b7fd2949023c..da1129d9bb4a 100644
--- a/widget/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/cocoa/nsNativeThemeCocoa.mm
@@ -362,7 +362,10 @@ static int32_t WindowButtonsReservedWidth(nsIFrame* aFrame)
 {
   NSWindow* window = NativeWindowForFrame(aFrame);
   if (!window) {
-    return 61; // fallback value
+    // Return fallback values.
+    if (!nsCocoaFeatures::OnLionOrLater())
+      return 64;
+    return 61;
   }
 
   NSRect buttonBox = NSZeroRect;

From b9d3a55122336c1fae06240e92ccd903e8ec583b Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 7 Jun 2013 14:46:29 -0400
Subject: [PATCH 223/230] Bug 880421 - Bump migration currentUIVersions for
 removing text&icons and un-collapsing nav-bar in nsBrowserGlue.js. r=Gijs.

---
 browser/components/nsBrowserGlue.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index 37a1c7b80e14..56efd8c077b9 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -1179,7 +1179,7 @@ BrowserGlue.prototype = {
   },
 
   _migrateUI: function BG__migrateUI() {
-    const UI_VERSION = 14;
+    const UI_VERSION = 15;
     const BROWSER_DOCURL = "chrome://browser/content/browser.xul#";
     let currentUIVersion = 0;
     try {
@@ -1369,7 +1369,7 @@ BrowserGlue.prototype = {
       catch (ex) {}
     }
 
-    if (currentUIVersion < 13) {
+    if (currentUIVersion < 14) {
       // 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"),
@@ -1388,7 +1388,7 @@ BrowserGlue.prototype = {
       }
     }
 
-    if (currentUIVersion < 14) {
+    if (currentUIVersion < 15) {
       let toolbarResource = this._rdf.GetResource(BROWSER_DOCURL + "nav-bar");
       let collapsedResource = this._rdf.GetResource("collapsed");
       let isCollapsed = this._getPersist(toolbarResource, collapsedResource);

From cb36543bc96117780f8b2e533f2921e6773bc6ee Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 7 Jun 2013 14:46:53 -0400
Subject: [PATCH 224/230] Bug 880399 - Move star button out from URL bar into
 the bookmarks-menu-button. r=mak.

---
 browser/base/content/browser-places.js        |  52 ++++++++-----
 browser/base/content/browser.css              |  16 ++--
 browser/base/content/browser.xul              |  15 +---
 .../base/content/test/browser_bug624734.js    |   4 +-
 browser/components/nsBrowserGlue.js           |  29 +++++++-
 browser/themes/linux/browser.css              |  46 ++++++------
 browser/themes/linux/jar.mn                   |   2 -
 browser/themes/linux/places/pageStarred.png   | Bin 767 -> 0 bytes
 browser/themes/linux/places/starPage.png      | Bin 723 -> 0 bytes
 browser/themes/osx/browser.css                |  69 +++++++++---------
 browser/themes/windows/browser.css            |  36 ++++-----
 browser/themes/windows/jar.mn                 |   2 -
 .../themes/windows/places/editBookmark.png    | Bin 1642 -> 0 bytes
 13 files changed, 147 insertions(+), 124 deletions(-)
 delete mode 100644 browser/themes/linux/places/pageStarred.png
 delete mode 100644 browser/themes/linux/places/starPage.png
 delete mode 100644 browser/themes/windows/places/editBookmark.png

diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js
index d475000e92ad..979e11459466 100644
--- a/browser/base/content/browser-places.js
+++ b/browser/base/content/browser-places.js
@@ -994,8 +994,7 @@ let PlacesToolbarHelper = {
 //// BookmarkingUI
 
 /**
- * Handles the bookmarks star button in the URL bar, as well as the bookmark
- * menu button.
+ * Handles the bookmarks menu-button in the toolbar.
  */
 
 let BookmarkingUI = {
@@ -1007,18 +1006,22 @@ let BookmarkingUI = {
   },
 
   get star() {
-    if (!this._star) {
-      this._star = document.getElementById("star-button");
+    if (!this._star && this.button) {
+      this._star = document.getAnonymousElementByAttribute(this.button,
+                                                           "anonid",
+                                                           "button");
     }
     return this._star;
   },
 
   get anchor() {
-    if (this.star && isElementVisible(this.star)) {
+    if (!this._anchor && this.star && isElementVisible(this.star)) {
       // Anchor to the icon, so the panel looks more natural.
-      return this.star;
+      this._anchor = document.getAnonymousElementByAttribute(this.star,
+                                                             "class",
+                                                             "toolbarbutton-icon");
     }
-    return null;
+    return this._anchor;
   },
 
   STATUS_UPDATING: -1,
@@ -1027,9 +1030,9 @@ let BookmarkingUI = {
   get status() {
     if (this._pendingStmt)
       return this.STATUS_UPDATING;
-    return this.star &&
-           this.star.hasAttribute("starred") ? this.STATUS_STARRED
-                                             : this.STATUS_UNSTARRED;
+    return this.button &&
+           this.button.hasAttribute("starred") ? this.STATUS_STARRED
+                                               : this.STATUS_UNSTARRED;
   },
 
   get _starredTooltip()
@@ -1098,11 +1101,12 @@ let BookmarkingUI = {
 
     if (aState == "invalid") {
       this.star.setAttribute("disabled", "true");
-      this.star.removeAttribute("starred");
+      this.button.removeAttribute("starred");
     }
     else {
       this.star.removeAttribute("disabled");
     }
+    this._updateToolbarStyle();
   },
 
   _updateToolbarStyle: function BUI__updateToolbarStyle() {
@@ -1143,6 +1147,8 @@ let BookmarkingUI = {
 
   customizeDone: function BUI_customizeDone() {
     delete this._button;
+    delete this._star;
+    delete this._anchor;
     this.onToolbarVisibilityChange();
     this._updateToolbarStyle();
   },
@@ -1162,7 +1168,7 @@ let BookmarkingUI = {
   },
 
   updateStarState: function BUI_updateStarState() {
-    if (!this.star || (this._uri && gBrowser.currentURI.equals(this._uri))) {
+    if (!this.button || (this._uri && gBrowser.currentURI.equals(this._uri))) {
       return;
     }
 
@@ -1211,17 +1217,17 @@ let BookmarkingUI = {
   },
 
   _updateStar: function BUI__updateStar() {
-    if (!this.star) {
+    if (!this.button) {
       return;
     }
 
     if (this._itemIds.length > 0) {
-      this.star.setAttribute("starred", "true");
-      this.star.setAttribute("tooltiptext", this._starredTooltip);
+      this.button.setAttribute("starred", "true");
+      this.button.setAttribute("tooltiptext", this._starredTooltip);
     }
     else {
-      this.star.removeAttribute("starred");
-      this.star.setAttribute("tooltiptext", this._unstarredTooltip);
+      this.button.removeAttribute("starred");
+      this.button.setAttribute("tooltiptext", this._unstarredTooltip);
     }
   },
 
@@ -1238,6 +1244,10 @@ let BookmarkingUI = {
   // nsINavBookmarkObserver
   onItemAdded: function BUI_onItemAdded(aItemId, aParentId, aIndex, aItemType,
                                         aURI) {
+    if (!this.button) {
+      return;
+    }
+
     if (aURI && aURI.equals(this._uri)) {
       // If a new bookmark has been added to the tracked uri, register it.
       if (this._itemIds.indexOf(aItemId) == -1) {
@@ -1248,6 +1258,10 @@ let BookmarkingUI = {
   },
 
   onItemRemoved: function BUI_onItemRemoved(aItemId) {
+    if (!this.button) {
+      return;
+    }
+
     let index = this._itemIds.indexOf(aItemId);
     // If one of the tracked bookmarks has been removed, unregister it.
     if (index != -1) {
@@ -1258,6 +1272,10 @@ let BookmarkingUI = {
 
   onItemChanged: function BUI_onItemChanged(aItemId, aProperty,
                                             aIsAnnotationProperty, aNewValue) {
+    if (!this.button) {
+      return;
+    }
+
     if (aProperty == "uri") {
       let index = this._itemIds.indexOf(aItemId);
       // If the changed bookmark was tracked, check if it is now pointing to
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index d82c6fdcbde4..9b2bd7cd7be7 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -314,18 +314,20 @@ toolbarbutton.bookmark-item {
   max-width: 13em;
 }
 
-%ifdef MENUBAR_CAN_AUTOHIDE
-#toolbar-menubar:not([autohide="true"]) ~ toolbar > #bookmarks-menu-button,
-#toolbar-menubar:not([autohide="true"]) > #bookmarks-menu-button {
-  display: none;
-}
-%endif
-
 #editBMPanel_tagsSelector {
   /* override default listbox width from xul.css */
   width: auto;
 }
 
+/* The star doesn't make sense as text */
+toolbar[mode="text"] #bookmarks-menu-button > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
+  display: -moz-box !important;
+}
+toolbar[mode="text"] #bookmarks-menu-button > .toolbarbutton-menubutton-button > .toolbarbutton-text,
+toolbar[mode="full"] #bookmarks-menu-button.bookmark-item > .toolbarbutton-menubutton-button > .toolbarbutton-text {
+  display: none;
+}
+
 menupopup[emptyplacesresult="true"] > .hide-if-empty-places-result {
   display: none;
 }
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 745051202b36..77b4a2dbd2cf 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -668,9 +668,6 @@
                      hidden="true"
                      tooltiptext="&pageReportIcon.tooltip;"
                      onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
-              <image id="star-button"
-                     class="urlbar-icon"
-                     onclick="BookmarkingUI.onCommand(event);"/>
               <image id="go-button"
                      class="urlbar-icon"
                      tooltiptext="&goEndCap.tooltip;"
@@ -877,13 +874,14 @@
                      class="toolbarbutton-1 chromeclass-toolbar-additional"
                      persist="class"
                      removable="true"
-                     type="menu"
+                     type="menu-button"
                      label="&bookmarksMenuButton.label;"
                      tooltiptext="&bookmarksMenuButton.tooltip;"
                      ondragenter="PlacesMenuDNDHandler.onDragEnter(event);"
                      ondragover="PlacesMenuDNDHandler.onDragOver(event);"
                      ondragleave="PlacesMenuDNDHandler.onDragLeave(event);"
-                     ondrop="PlacesMenuDNDHandler.onDrop(event);">
+                     ondrop="PlacesMenuDNDHandler.onDrop(event);"
+                     oncommand="BookmarkingUI.onCommand(event);">
         <menupopup id="BMB_bookmarksPopup"
                    placespopup="true"
                    context="placesContext"
@@ -906,13 +904,6 @@
                     command="Browser:ShowAllBookmarks"
                     key="manBookmarkKb"/>
           <menuseparator/>
-          <menuitem id="BMB_bookmarkThisPage"
-#ifndef XP_MACOSX
-                    class="menuitem-iconic"
-#endif
-                    label="&bookmarkThisPageCmd.label;"
-                    command="Browser:AddBookmarkAs"
-                    key="addBookmarkAsKb"/>
           <menuitem id="BMB_subscribeToPageMenuitem"
 #ifndef XP_MACOSX
                     class="menuitem-iconic"
diff --git a/browser/base/content/test/browser_bug624734.js b/browser/base/content/test/browser_bug624734.js
index 13369a310aa2..5af37db488fb 100644
--- a/browser/base/content/test/browser_bug624734.js
+++ b/browser/base/content/test/browser_bug624734.js
@@ -11,10 +11,10 @@ function test() {
   tab.linkedBrowser.addEventListener("load", (function(event) {
     tab.linkedBrowser.removeEventListener("load", arguments.callee, true);
 
-    is(BookmarkingUI.star.getAttribute("tooltiptext"),
+    is(BookmarkingUI.button.getAttribute("tooltiptext"),
        BookmarkingUI._unstarredTooltip,
        "Star icon should have the unstarred tooltip text");
-  
+
     gBrowser.removeCurrentTab();
     finish();
   }), true);
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index 56efd8c077b9..6fbccd3c7dbd 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -1179,7 +1179,7 @@ BrowserGlue.prototype = {
   },
 
   _migrateUI: function BG__migrateUI() {
-    const UI_VERSION = 15;
+    const UI_VERSION = 16;
     const BROWSER_DOCURL = "chrome://browser/content/browser.xul#";
     let currentUIVersion = 0;
     try {
@@ -1397,6 +1397,33 @@ BrowserGlue.prototype = {
       }
     }
 
+    // Insert the bookmarks-menu-button into the nav-bar if it isn't already
+    // there.
+    if (currentUIVersion < 16) {
+      let currentsetResource = this._rdf.GetResource("currentset");
+      let toolbarResource = this._rdf.GetResource(BROWSER_DOCURL + "nav-bar");
+      let currentset = this._getPersist(toolbarResource, currentsetResource);
+      // Need to migrate only if toolbar is customized.
+      if (currentset) {
+        if (!currentset.contains("bookmarks-menu-button")) {
+          // The button isn't in the nav-bar, so let's look for an appropriate
+          // place to put it.
+          if (currentset.contains("downloads-button")) {
+            currentset = currentset.replace(/(^|,)downloads-button($|,)/,
+                                            "$1bookmarks-menu-button,downloads-button$2");
+          } else if (currentset.contains("home-button")) {
+            currentset = currentset.replace(/(^|,)home-button($|,)/,
+                                            "$1bookmarks-menu-button,home-button$2");
+          } else {
+            // Just append.
+            currentset = currentset.replace(/(^|,)window-controls($|,)/,
+                                            "$1bookmarks-menu-button,window-controls$2")
+          }
+          this._setPersist(toolbarResource, currentsetResource, currentset);
+        }
+      }
+    }
+
     if (this._dirty)
       this._dataSource.QueryInterface(Ci.nsIRDFRemoteDataSource).Flush();
 
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 1d65fdbd69fc..fc474b911a8c 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -478,10 +478,6 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png");
 }
 
-#BMB_bookmarkThisPage {
-  list-style-image: url("chrome://browser/skin/places/starPage.png");
-}
-
 #BMB_unsortedBookmarks {
   list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png");
 }
@@ -644,18 +640,10 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   -moz-image-region: rect(0px 48px 24px 24px);
 }
 
-#bookmarks-menu-button {
+#bookmarks-button {
   -moz-image-region: rect(0px 72px 24px 48px);
 }
 
-#bookmarks-menu-button.bookmark-item {
-  list-style-image: url("chrome://browser/skin/Toolbar-small.png");
-}
-
-#bookmarks-menu-button.toolbarbutton-1 {
-  -moz-box-orient: horizontal;
-}
-
 #print-button {
   list-style-image: url("moz-icon://stock/gtk-print?size=toolbar");
 }
@@ -808,8 +796,7 @@ toolbar[iconsize="small"] #webrtc-status-button /* temporary placeholder (bug 82
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
-toolbar[iconsize="small"] #bookmarks-menu-button,
-#bookmarks-menu-button.bookmark-item {
+toolbar[iconsize="small"] #bookmarks-button {
   -moz-image-region: rect(0px 48px 16px 32px);
 }
 
@@ -1508,17 +1495,28 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-/* Star button */
-#star-button {
-  list-style-image: url("chrome://browser/skin/places/starPage.png");
-}
-
-#star-button[starred="true"] {
-  list-style-image: url("chrome://browser/skin/places/pageStarred.png");
-}
-
 /* bookmarks menu-button */
 
+#bookmarks-menu-button {
+  list-style-image: url("chrome://browser/skin/Toolbar.png");
+  -moz-image-region: rect(0px 216px 24px 192px);
+}
+
+#bookmarks-menu-button[starred] {
+  -moz-image-region: rect(24px 216px 48px 192px);
+}
+
+toolbar[iconsize="small"] #bookmarks-menu-button,
+#bookmarks-menu-button.bookmark-item {
+  list-style-image: url("chrome://browser/skin/Toolbar-small.png");
+  -moz-image-region: rect(0px 144px 16px 128px);
+}
+
+toolbar[iconsize="small"] #bookmarks-menu-button[starred],
+#bookmarks-menu-button.bookmark-item[starred] {
+  -moz-image-region: rect(16px 144px 32px 128px);
+}
+
 #bookmarks-menu-button[disabled] > .toolbarbutton-icon,
 #bookmarks-menu-button[disabled] > .toolbarbutton-menu-dropmarker,
 #bookmarks-menu-button[disabled] > .toolbarbutton-menubutton-dropmarker,
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index 2f51b7b1bd41..0cd6142aa911 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -91,7 +91,6 @@ browser.jar:
   skin/classic/browser/places/calendar.png            (places/calendar.png)
 * skin/classic/browser/places/editBookmarkOverlay.css (places/editBookmarkOverlay.css)
   skin/classic/browser/places/livemark-item.png       (places/livemark-item.png)
-  skin/classic/browser/places/pageStarred.png         (places/pageStarred.png)
   skin/classic/browser/places/star-icons.png          (places/star-icons.png)
   skin/classic/browser/places/starred48.png           (places/starred48.png)
   skin/classic/browser/places/unstarred48.png         (places/unstarred48.png)
@@ -99,7 +98,6 @@ browser.jar:
   skin/classic/browser/places/organizer.css           (places/organizer.css)
   skin/classic/browser/places/organizer.xml           (places/organizer.xml)
   skin/classic/browser/places/query.png               (places/query.png)
-  skin/classic/browser/places/starPage.png            (places/starPage.png)
   skin/classic/browser/places/tag.png                 (places/tag.png)
   skin/classic/browser/places/toolbarDropMarker.png   (places/toolbarDropMarker.png)
   skin/classic/browser/places/unsortedBookmarks.png   (places/unsortedBookmarks.png)
diff --git a/browser/themes/linux/places/pageStarred.png b/browser/themes/linux/places/pageStarred.png
deleted file mode 100644
index 61a9f90e05b15a6206727be766294d7baa593995..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 767
zcmV<b0s#GqP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10(?nCK~y-6ol{*)R8bUN``mM9#+f_W7=EQA%|vEjIzdV?;!{2J
zP|-t0B}|d{6hTCf5ft?U0wMaK87+_s@}ak&9-3=HVIY*D2BVn{B9tF9qjT>)yNA#m
z9ADaSV6$0kueA>65Hq7#nF*>FLc9Y}PC3r8XpD!8;Y3k303vZS*m${eTjY932ytg4
z9GH3CNybsp-{ZC%YnGKg#~+><b~29YV%UuwbXM(XXHq`_`zyBYy2JoFi#kol;R0|4
zKu8F!hKQ;e)Yx(=<q<p#s9$hIGd{lDxlC||n0Z<$XA;0TfO}+iix=hL(<f^8Uel$!
z5}GtXnh!*-e==$TN?EXT6UgUM$Y-Z`YWSfwKRfhBuu`cKe^`{19)Ru%LdZZN832SA
z#M6*+3O>IZf!dSg^3@1tPEj%rKMB!S5kB9x{a}|Q0RTDx1*iqElLqVwussGqK<RB5
zNnW*nr{52-QpbszVJ1it(S5fOy0GtXw<a+Fw#ETo0yy*cvSb}>?I^yy?QnAQW4+9L
zF&bk_0zfpzHh>N@L7w#3^E0&#M<i6XFovrUGo!EV?A&NyG{)^KV_6VY(<_WE5eZ>{
z^ael}00>YEfbhd8Ym!29RTXen8Z$w}OozOI{UEIt<Y`4Nw+Y!r56IIB(t;@2+yqvt
z*-X%?@LC6Zq`S;;dFx@@i}*2k%Sw+vUM7%T9zN@<i`>?AZxFh-%9YPdMgV*&Z~&lG
zSs9fcdBB6O8l3dVqh5BFLdwa7X1@14`P{c#O@HfRWn~qB($$x^_BZzTxStY<fO3}Z
xMq_NQ&1xp7MQENI%qqhwe=ZthwQj-x)E{H~B#C0KngRd-002ovPDHLkV1oMDLjeE)

diff --git a/browser/themes/linux/places/starPage.png b/browser/themes/linux/places/starPage.png
deleted file mode 100644
index 3193a3535f1e390211aa403ad757b10cc9d5a884..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 723
zcmV;^0xbQBP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXG{
z4;CqYo`_)p00L7<L_t(I%cYagYZ^fm$G<zfYK*!h27jz^)pc1*3W62Grch5MAR#xQ
zr(SYN+Dnll^y(i_JmjpG^bqqmB(wz&rKLGEmn;$DkJYA>7+PwL*wyJ}3&ut$^udE+
z-giFl&Ad0jY_nRe);n&udu4NTbAFbH%nGQg8aO>YO*I;gN0CTGp_DTJ4A|b@wsblj
zXEYjp;BvWCNs?kmM@Rf^kiP(wQch76rBbOR0N4O5ZES2PwOTEDo1Oq*0W1OVM<S8%
z&dyGv-|w%iuCCq(AOT=ySzfQ#>&pzo1Q!<<Lje5d8I}RCyt}(AX0zD<A;iM-yqjg&
zWt+`*4}i~1WH$_>W*El#<>lpTLI~O4-@nM`^A{X|kt9jZKp^nUEcrVCCxE$$O0PMN
z3v(P73I>A@0kFwrG6$f|0_YzfACDIn7S7`FxXLgLOb|PD-7x?I0QUCwUTke`oec(q
z&ny7i?RLLatJR*}Zf~YisU#tU0bm6%`Rc}aJRX!vrI*EG@sqCWIskejg~#KOPfkvr
zP)grYN<UCaKTi02P1Bwx5{bJr+o-ClMHEE`fT6j?nmz_F5Cmb~VzC%A0bZ}y%k%s?
z01f~djYdC)!{N25`{{H#GqG6AH#tz;pG7zvo|9$SK?vah*fmXiRjE{(nx=JgxtwQh
zZS6TBWROm$J)$Vi0l2;aXf~T{tJUiEdcAjrLgCHT)zz0!D0F^saPaH!@X(*hWb);5
z`LV9+U)$|AciR_W00;nrKA+Dq9TWs%-kid~RCoT*egieo&tASG=hy%M002ovPDHLk
FV1lgCI7$Ej

diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 19699a4ba6b5..e412365c1b1c 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -886,32 +886,14 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
 
 /* bookmark sidebar & menu buttons */
 
-#bookmarks-menu-button {
+#bookmarks-button {
   -moz-image-region: rect(0, 180px, 20px, 160px);
 }
 
-#bookmarks-menu-button.bookmark-item {
-  -moz-image-region: rect(2px, 178px, 18px, 162px);
-  list-style-image: url("chrome://browser/skin/Toolbar.png");
-}
-
 @media (min-resolution: 2dppx) {
-  #bookmarks-menu-button {
+  #bookmarks-button {
     -moz-image-region: rect(0, 360px, 40px, 320px);
   }
-
-  #bookmarks-menu-button.bookmark-item {
-    -moz-image-region: rect(4px, 356px, 36px, 324px);
-    list-style-image: url("chrome://browser/skin/Toolbar@2x.png");
-  }
-
-  #bookmarks-menu-button.bookmark-item > .toolbarbutton-icon {
-    width: 16px;
-  }
-}
-
-#bookmarks-menu-button.toolbarbutton-1 {
-  -moz-box-orient: horizontal;
 }
 
 /* print button */
@@ -1727,35 +1709,50 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-/* Star button */
-#star-button {
+/* bookmarks menu-button */
+
+
+#bookmarks-menu-button {
+  -moz-image-region: rect(0px 500px 20px 480px);
+}
+
+#bookmarks-menu-button[starred] {
+  -moz-image-region: rect(20px 500px 40px 480px);
+}
+
+#bookmarks-menu-button.bookmark-item {
   list-style-image: url("chrome://browser/skin/places/star-icons.png");
-  -moz-image-region: rect(0, 16px, 16px, 0);
+  -moz-image-region: rect(0px 16px 16px 0px);
 }
 
-#star-button:hover:active,
-#star-button[starred="true"] {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
+#bookmarks-menu-button.bookmark-item[starred] {
+  -moz-image-region: rect(0px 32px 16px 16px);
 }
 
-#star-button:hover:active[starred="true"] {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
+#bookmarks-menu-button.bookmark-item > .toolbarbutton-menubutton-button {
+  padding: 0;
 }
 
 @media (min-resolution: 2dppx) {
-  #star-button {
+  #bookmarks-menu-button {
+    -moz-image-region: rect(0px, 1000px, 40px, 960px);
+  }
+
+  #bookmarks-menu-button[starred] {
+    -moz-image-region: rect(40px, 1000px, 80px, 960px);
+  }
+
+  #bookmarks-menu-button.bookmark-item {
     list-style-image: url("chrome://browser/skin/places/star-icons@2x.png");
-    -moz-image-region: rect(0, 32px, 32px, 0);
-    width: 22px;
+    -moz-image-region: rect(0px 32px 32px 0px);
   }
 
-  #star-button:hover:active,
-  #star-button[starred="true"] {
-    -moz-image-region: rect(0, 64px, 32px, 32px);
+  #bookmarks-menu-button.bookmark-item[starred] {
+    -moz-image-region: rect(0px 64px 32px 32px);
   }
 
-  #star-button:hover:active[starred="true"] {
-    -moz-image-region: rect(0, 96px, 32px, 64px);
+  #bookmarks-menu-button.bookmark-item > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
+    width: 16px;
   }
 }
 
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 8f22c7f0eb8c..d2c27a6ab845 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -217,7 +217,7 @@ toolbarbutton.bookmark-item[open="true"] {
   -moz-padding-end: 2px;
 }
 
-.bookmark-item:not(#bookmarks-menu-button) > .toolbarbutton-icon {
+.bookmark-item > .toolbarbutton-icon {
   width: 16px;
   height: 16px;
 }
@@ -691,18 +691,10 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   -moz-image-region: rect(0, 126px, 18px, 108px);
 }
 
-#bookmarks-menu-button {
+#bookmarks-button {
   -moz-image-region: rect(0, 144px, 18px, 126px);
 }
 
-#bookmarks-menu-button.bookmark-item {
-  list-style-image: url("chrome://browser/skin/Toolbar.png");
-}
-
-#bookmarks-menu-button.bookmark-item:-moz-lwtheme-brighttext {
-  list-style-image: url("chrome://browser/skin/Toolbar-inverted.png");
-}
-
 #print-button {
   -moz-image-region: rect(0, 162px, 18px, 144px);
 }
@@ -1416,25 +1408,27 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-/* star button */
+/* bookmarks menu-button */
 
-#star-button {
+#bookmarks-menu-button {
+  -moz-image-region: rect(0px 378px 18px 360px);
+}
+
+#bookmarks-menu-button[starred] {
+  -moz-image-region: rect(18px 378px 36px 360px);
+}
+
+#bookmarks-menu-button.bookmark-item {
   list-style-image: url("chrome://browser/skin/places/bookmark.png");
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
-#star-button:hover {
-  background-image: radial-gradient(circle closest-side, hsla(45,100%,73%,.3), hsla(45,100%,73%,0));
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
-
-#star-button:hover:active {
-  background-image: radial-gradient(circle closest-side, hsla(45,100%,73%,.1), hsla(45,100%,73%,0));
+#bookmarks-menu-button.bookmark-item[starred] {
   -moz-image-region: rect(0px 48px 16px 32px);
 }
 
-#star-button[starred] {
-  list-style-image: url("chrome://browser/skin/places/editBookmark.png");
+#bookmarks-menu-button.bookmark-item > .toolbarbutton-menubutton-button> .toolbarbutton-icon {
+  -moz-margin-start: 5px;
 }
 
 /* bookmarking panel */
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index 7b2e519825b2..d68e151b70b3 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -102,7 +102,6 @@ browser.jar:
         skin/classic/browser/newtab/noise.png                        (newtab/noise.png)
         skin/classic/browser/places/places.css                       (places/places.css)
 *       skin/classic/browser/places/organizer.css                    (places/organizer.css)
-        skin/classic/browser/places/editBookmark.png                 (places/editBookmark.png)
         skin/classic/browser/places/bookmark.png                     (places/bookmark.png)
         skin/classic/browser/places/query.png                        (places/query.png)
         skin/classic/browser/places/bookmarksMenu.png                (places/bookmarksMenu.png)
@@ -371,7 +370,6 @@ browser.jar:
 *       skin/classic/aero/browser/places/places.css                  (places/places-aero.css)
 *       skin/classic/aero/browser/places/organizer.css               (places/organizer-aero.css)
         skin/classic/aero/browser/places/bookmark.png                (places/bookmark.png)
-        skin/classic/aero/browser/places/editBookmark.png            (places/editBookmark.png)
         skin/classic/aero/browser/places/query.png                   (places/query-aero.png)
         skin/classic/aero/browser/places/bookmarksMenu.png           (places/bookmarksMenu-aero.png)
         skin/classic/aero/browser/places/bookmarksToolbar.png        (places/bookmarksToolbar-aero.png)
diff --git a/browser/themes/windows/places/editBookmark.png b/browser/themes/windows/places/editBookmark.png
deleted file mode 100644
index fbca0523df169b6892d2b5050035152fb6b92606..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1642
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


From b6915b87b0bb23d7d7dfe0f6e5475fc398fb03eb Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 6 Jun 2013 21:55:19 +0200
Subject: [PATCH 225/230] Bug 879977 - Restore Defaults button should be
 disabled, not hidden, when in the default state, r=mconley

---
 browser/base/content/browser.css                  |  5 -----
 .../customizableui/src/CustomizeMode.jsm          | 15 ++++++++-------
 .../shared/customizableui/panelUIOverlay.inc.css  |  2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 9b2bd7cd7be7..08dddb104aa4 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -696,8 +696,3 @@ chatbox:-moz-full-screen-ancestor > .chat-titlebar {
 *:-moz-full-screen-ancestor #social-sidebar-box:not(:-moz-full-screen-ancestor) {
   display: none;
 }
-
-#customization-reset-button[hidden="true"] {
-  display: -moz-box;
-  visibility: hidden;
-}
diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index f6a892a72398..c7f03261e50e 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -44,10 +44,6 @@ CustomizeMode.prototype = {
   _dragOverItem: null,
   _customizing: false,
 
-  get resetButton() {
-    return this.document.getElementById("customization-reset-button");
-  },
-
   get panelUIContents() {
     return this.document.getElementById("PanelUI-contents");
   },
@@ -136,7 +132,7 @@ CustomizeMode.prototype = {
     this.visiblePalette.addEventListener("drop", this, true);
     this.visiblePalette.addEventListener("dragend", this, true);
 
-    this.resetButton.hidden = CustomizableUI.inDefaultState;
+    this._updateResetButton();
 
     let customizableToolbars = document.querySelectorAll("toolbar[customizable=true]:not([autohide=true]):not([collapsed=true])");
     for (let toolbar of customizableToolbars)
@@ -483,7 +479,7 @@ CustomizeMode.prototype = {
       document.persist(toolbar.id, "currentset");
     }
 
-    this.resetButton.hidden = CustomizableUI.inDefaultState;
+    this._updateResetButton();
     this._showPanelCustomizationPlaceholders();
   },
 
@@ -507,10 +503,15 @@ CustomizeMode.prototype = {
 
   _onUIChange: function() {
     this._changed = true;
-    this.resetButton.hidden = CustomizableUI.inDefaultState;
+    this._updateResetButton();
     this.dispatchToolboxEvent("customizationchange");
   },
 
+  _updateResetButton: function() {
+    let btn = this.document.getElementById("customization-reset-button");
+    btn.disabled = CustomizableUI.inDefaultState;
+  },
+
   handleEvent: function(aEvent) {
     switch(aEvent.type) {
       case "contextmenu":
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index edef46ac4837..686150befad8 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -241,7 +241,7 @@ panelview toolbarbutton:not([disabled]):not([checked]):not([open]):not(:active):
 }
 
 panelview toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active),
-.customizationmode-button:hover:active,
+.customizationmode-button:not([disabled]):hover:active,
 #widget-overflow-list > toolbarbutton:not([disabled]):-moz-any([open],[checked],:hover:active) {
   background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
   background-color: hsla(210,54%,20%,.15);

From 04fd7799e8cce8350119a8948662a603ba7d362e Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Fri, 7 Jun 2013 23:28:29 -0400
Subject: [PATCH 226/230] Bug 879994 - LightweightThemeManager should allow
 lightweight themes to be temporarily disabled. r=Unfocused

---
 .../extensions/LightweightThemeManager.jsm    |  7 +++
 .../xpcshell/test_LightweightThemeManager.js  | 57 +++++++++++++++++--
 2 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/toolkit/mozapps/extensions/LightweightThemeManager.jsm b/toolkit/mozapps/extensions/LightweightThemeManager.jsm
index 926e29e7ca8c..64e0b83fe638 100644
--- a/toolkit/mozapps/extensions/LightweightThemeManager.jsm
+++ b/toolkit/mozapps/extensions/LightweightThemeManager.jsm
@@ -139,6 +139,13 @@ this.LightweightThemeManager = {
     AddonManagerPrivate.callAddonListeners("onUninstalled", wrapper);
   },
 
+  temporarilyToggleTheme: function LightweightThemeManager_temporarilyToggleTheme(aShouldEnable) {
+    if (aShouldEnable)
+      _notifyWindows(this.currentTheme);
+    else
+      _notifyWindows(null);
+  },
+
   previewTheme: function LightweightThemeManager_previewTheme(aData) {
     if (!aData)
       return;
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_LightweightThemeManager.js b/toolkit/mozapps/extensions/test/xpcshell/test_LightweightThemeManager.js
index c0cf78a893e1..56b39dbda201 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_LightweightThemeManager.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_LightweightThemeManager.js
@@ -19,17 +19,25 @@ function dummy(id) {
   };
 }
 
+function getLTM() {
+  var temp = {};
+  Components.utils.import("resource://gre/modules/LightweightThemeManager.jsm", temp);
+  do_check_eq(typeof temp.LightweightThemeManager, "object");
+
+  return temp.LightweightThemeManager;
+}
+
 function run_test() {
+  run_next_test();
+}
+
+add_test(function test() {
   createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9");
   startupManager();
 
   Services.prefs.setIntPref("lightweightThemes.maxUsedThemes", 8);
 
-  var temp = {};
-  Components.utils.import("resource://gre/modules/LightweightThemeManager.jsm", temp);
-  do_check_eq(typeof temp.LightweightThemeManager, "object");
-
-  var ltm = temp.LightweightThemeManager;
+  var ltm = getLTM();
 
   do_check_eq(typeof ltm.usedThemes, "object");
   do_check_eq(ltm.usedThemes.length, 0);
@@ -511,4 +519,41 @@ function run_test() {
   Services.prefs.clearUserPref("lightweightThemes.maxUsedThemes");
 
   do_check_eq(ltm.usedThemes.length, 30);
-}
+  run_next_test();
+});
+
+var usedThemeId;
+add_test(function test_temporaryDisableTheme() {
+  var ltm = getLTM();
+  usedThemeId = ltm.currentTheme && ltm.currentTheme.id;
+  var observerService = Cc["@mozilla.org/observer-service;1"]
+                          .getService(Ci.nsIObserverService);
+  var observerTopic = "lightweight-theme-styling-update";
+  var observer = {
+    observe: function(aSubject, aTopic, aData) {
+      observerService.removeObserver(observer, observerTopic);
+      do_check_eq(aTopic, observerTopic);
+      do_check_eq(aData, "null");
+      run_next_test();
+    }
+  };
+  observerService.addObserver(observer, observerTopic, false);
+  ltm.temporarilyToggleTheme(false);
+});
+
+add_test(function test_temporaryEnableTheme() {
+  var ltm = getLTM();
+  var observerService = Cc["@mozilla.org/observer-service;1"]
+                          .getService(Ci.nsIObserverService);
+  var observerTopic = "lightweight-theme-styling-update";
+  var observer = {
+    observe: function(aSubject, aTopic, aData) {
+      observerService.removeObserver(observer, observerTopic);
+      do_check_eq(aTopic, observerTopic);
+      do_check_eq(aData && JSON.parse(aData).id, usedThemeId);
+      run_next_test();
+    }
+  };
+  observerService.addObserver(observer, observerTopic, false);
+  ltm.temporarilyToggleTheme(true);
+});

From c73db3c30b59bf3acb3e7d65b29b31510213e56b Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Fri, 7 Jun 2013 23:29:47 -0400
Subject: [PATCH 227/230] Bug 870602 - Disable lightweight themes when in
 customization mode. r=Unfocused

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

diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index c7f03261e50e..998a4db78400 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -16,6 +16,7 @@ const kPlaceholderClass = "panel-customization-placeholder";
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource:///modules/CustomizableUI.jsm");
+Cu.import("resource://gre/modules/LightweightThemeManager.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 let gModuleName = "[CustomizeMode]";
@@ -76,6 +77,10 @@ CustomizeMode.prototype = {
       return;
     }
 
+    // Disable lightweight themes while in customization mode since
+    // they don't have large enough images to pad the full browser window.
+    LightweightThemeManager.temporarilyToggleTheme(false);
+
     this.dispatchToolboxEvent("beforecustomization");
 
     let window = this.window;
@@ -228,6 +233,7 @@ CustomizeMode.prototype = {
     deck.addEventListener("transitionend", function customizeTransitionEnd() {
       deck.removeEventListener("transitionend", customizeTransitionEnd);
       self.dispatchToolboxEvent("aftercustomization");
+      LightweightThemeManager.temporarilyToggleTheme(true);
     });
     documentElement.removeAttribute("customizing");
 

From e48c5dcbcec19771dc52ce2a7ef8c5d9680cfe96 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Mon, 10 Jun 2013 11:34:53 -0400
Subject: [PATCH 228/230] Bug 880789 - Remove dropmarker from the Bookmarks
 button when it's in the palette or the menu panel. r=jaws.

---
 browser/themes/shared/customizableui/panelUIOverlay.inc.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index 686150befad8..00f304b742ce 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -304,8 +304,8 @@ toolbarbutton.panel-multiview-anchor {
   -moz-image-region: rect(32px 96px 64px 64px);
 }
 
-#PanelUI-contents[type="grid"] #bookmarks-menu-button > .toolbarbutton-menu-dropmarker,
-#customization-palette #bookmarks-menu-button > .toolbarbutton-menu-dropmarker {
+#PanelUI-contents[type="grid"] #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker,
+#customization-palette #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker {
   display: none;
 }
 

From 7a607407a93f63e8e20595d54f40f3da5cec475b Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Mon, 10 Jun 2013 14:08:53 -0400
Subject: [PATCH 229/230] Bug 873066 - Enforce allowedAreaTypes for widgets.
 r=Gijs,feedback=Unfocused.

---
 browser/base/content/browser.xul              |   9 +
 .../customizableui/src/CustomizableUI.jsm     | 109 +++++++--
 .../src/CustomizableWidgets.jsm               |  33 ++-
 .../customizableui/test/Makefile.in           |   1 +
 .../test/browser_873066_allowedAreaTypes.js   | 226 ++++++++++++++++++
 .../components/customizableui/test/head.js    |  27 ++-
 6 files changed, 373 insertions(+), 32 deletions(-)
 create mode 100644 browser/components/customizableui/test/browser_873066_allowedAreaTypes.js

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 77b4a2dbd2cf..461ba05aeb7c 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -866,6 +866,7 @@
 
       <toolbaritem id="search-container" title="&searchItem.title;"
                    align="center" class="chromeclass-toolbar-additional"
+                   customizableui-areatypes="menu-panel,toolbar"
                    flex="100" persist="width" removable="true" noautoclose="true">
         <searchbar id="searchbar" flex="1"/>
       </toolbaritem>
@@ -875,6 +876,7 @@
                      persist="class"
                      removable="true"
                      type="menu-button"
+                     customizableui-areatypes="menu-panel,toolbar"
                      label="&bookmarksMenuButton.label;"
                      tooltiptext="&bookmarksMenuButton.tooltip;"
                      ondragenter="PlacesMenuDNDHandler.onDragEnter(event);"
@@ -948,6 +950,7 @@
 
       <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                      persist="class" removable="true"
+                     customizableui-areatypes="menu-panel,toolbar"
                      label="&homeButton.label;"
                      ondragover="homeButtonObserver.onDragOver(event)"
                      ondragenter="homeButtonObserver.onDragOver(event)"
@@ -957,6 +960,7 @@
                      aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
 
       <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+                     customizableui-areatypes="menu-panel,toolbar"
 #ifdef XP_MACOSX
                      command="cmd_print"
 #else
@@ -968,6 +972,7 @@
            during the customization of the toolbar, in the palette, and before
            the Downloads Indicator overlay is loaded. -->
       <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+                     customizableui-areatypes="menu-panel,toolbar"
                      oncommand="DownloadsIndicatorView.onCommand(event);"
                      ondrop="DownloadsIndicatorView.onDrop(event);"
                      ondragover="DownloadsIndicatorView.onDragOver(event);"
@@ -976,6 +981,7 @@
                      tooltiptext="&downloads.tooltip;"/>
 
       <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+                     customizableui-areatypes="menu-panel,toolbar"
                      label="&newNavigatorCmd.label;"
                      command="key_newNavigator"
                      tooltiptext="&newWindowButton.tooltip;"
@@ -985,6 +991,7 @@
                      ondragexit="newWindowButtonObserver.onDragExit(event)"/>
 
       <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+                     customizableui-areatypes="menu-panel,toolbar"
                      observes="View:FullScreen"
                      type="checkbox"
                      label="&fullScreenCmd.label;"
@@ -993,11 +1000,13 @@
 #ifdef MOZ_SERVICES_SYNC
       <toolbarbutton id="sync-button"
                      class="toolbarbutton-1 chromeclass-toolbar-additional"
+                     customizableui-areatypes="menu-panel,toolbar"
                      label="&syncToolbarButton.label;"
                      oncommand="gSyncUI.handleToolbarButton()"/>
 #endif
 
       <toolbarbutton id="tabview-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+                     customizableui-areatypes="menu-panel,toolbar"
                      label="&tabGroupsButton.label;"
                      command="Browser:ToggleTabView"
                      tooltiptext="&tabGroupsButton.tooltip;"
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 6d3e5ebe4a40..6c79bae2a207 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -15,6 +15,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "CustomizableWidgets",
   "resource:///modules/CustomizableWidgets.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "DeferredTask",
   "resource://gre/modules/DeferredTask.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "RecentWindow",
+  "resource:///modules/RecentWindow.jsm");
 XPCOMUtils.defineLazyGetter(this, "gWidgetsBundle", function() {
   const kUrl = "chrome://browser/locale/customizableui/customizableWidgets.properties";
   return Services.strings.createBundle(kUrl);
@@ -112,9 +114,15 @@ let CustomizableUIInternal = {
     this._defineBuiltInWidgets();
     this.loadSavedState();
 
+    // Before we register these areas, we need to ensure at least one
+    // browser window is registered, otherwise, we won't be able to get
+    // a read on XUL widget attributes to determine if items are allowed
+    // in these areas, or if they're removable, etc.
+    this.registerBuildWindow(RecentWindow.getMostRecentBrowserWindow());
+
     this.registerArea(CustomizableUI.AREA_PANEL, {
       anchor: "PanelUI-menu-button",
-      type: CustomizableUI.TYPE_MENU_PANEL,
+      type: CustomizableUI.AREATYPE_MENU_PANEL,
       defaultPlacements: [
         "edit-controls",
         "zoom-controls",
@@ -131,7 +139,7 @@ let CustomizableUIInternal = {
     });
     this.registerArea(CustomizableUI.AREA_NAVBAR, {
       legacy: true,
-      type: CustomizableUI.TYPE_TOOLBAR,
+      type: CustomizableUI.AREATYPE_TOOLBAR,
       overflowable: true,
       defaultPlacements: [
         "unified-back-forward-button",
@@ -148,14 +156,14 @@ let CustomizableUIInternal = {
     });
     this.registerArea(CustomizableUI.AREA_MENUBAR, {
       legacy: true,
-      type: CustomizableUI.TYPE_TOOLBAR,
+      type: CustomizableUI.AREATYPE_TOOLBAR,
       defaultPlacements: [
         "menubar-items",
       ]
     });
     this.registerArea(CustomizableUI.AREA_TABSTRIP, {
       legacy: true,
-      type: CustomizableUI.TYPE_TOOLBAR,
+      type: CustomizableUI.AREATYPE_TOOLBAR,
       defaultPlacements: [
         "tabbrowser-tabs",
         "new-tab-button",
@@ -165,7 +173,7 @@ let CustomizableUIInternal = {
     });
     this.registerArea(CustomizableUI.AREA_BOOKMARKS, {
       legacy: true,
-      type: CustomizableUI.TYPE_TOOLBAR,
+      type: CustomizableUI.AREATYPE_TOOLBAR,
       defaultPlacements: [
         "personal-bookmarks",
       ]
@@ -216,6 +224,11 @@ let CustomizableUIInternal = {
         props.set(key, aProperties[key]);
       }
     }
+
+    if (!props.has("type")) {
+      props.set("type", CustomizableUI.AREATYPE_TOOLBAR);
+    }
+
     gAreas.set(aName, props);
 
     if (props.get("legacy")) {
@@ -570,7 +583,8 @@ let CustomizableUIInternal = {
     let window = aNode.ownerDocument.defaultView;
     this.registerBuildWindow(window);
 
-    // Also register this build area's toolbox.
+    // Also register this build area's toolbox if it's not already
+    // in there.
     if (aNode.toolbox) {
       gBuildWindows.get(window).add(aNode.toolbox);
     }
@@ -584,7 +598,8 @@ let CustomizableUIInternal = {
 
   registerBuildWindow: function(aWindow) {
     if (!gBuildWindows.has(aWindow)) {
-      gBuildWindows.set(aWindow, new Set());
+      let toolboxes = aWindow.document.querySelectorAll("toolbox");
+      gBuildWindows.set(aWindow, new Set(toolboxes));
     }
 
     aWindow.addEventListener("unload", this, false);
@@ -707,7 +722,7 @@ let CustomizableUIInternal = {
       }
     }
 
-   let toolboxes = gBuildWindows.get(aWindow);
+    let toolboxes = gBuildWindows.get(aWindow);
     for (let toolbox of toolboxes) {
       if (toolbox.palette) {
         // Attempt to locate a node with a matching ID within
@@ -1327,7 +1342,7 @@ let CustomizableUIInternal = {
       currentArea: null,
       removable: false,
       defaultArea: null,
-      allowedAreas: [],
+      allowedAreaTypes: new Set([CustomizableUI.AREATYPE_TOOLBAR]),
       shortcut: null,
       description: null,
     };
@@ -1362,9 +1377,8 @@ let CustomizableUIInternal = {
       widget.defaultArea = aData.defaultArea;
     }
 
-    if (Array.isArray(aData.allowedAreas)) {
-      widget.allowedAreas =
-        [area for (area of aData.allowedAreas) if (gAreas.has(area))];
+    if (Array.isArray(aData.allowedAreaTypes)) {
+      widget.allowedAreaTypes = new Set(aData.allowedAreaTypes);
     }
 
     if ("type" in aData && gSupportedWidgetTypes.has(aData.type)) {
@@ -1623,12 +1637,28 @@ let CustomizableUIInternal = {
     return true;
   },
 
-  canWidgetMoveToArea: function(aWidgetId, aArea) {
-    let placement = this.getPlacementOfWidget(aWidgetId);
-    if (placement && placement.area != aArea &&
-        !this.isWidgetRemovable(aWidgetId)) {
+  canWidgetMoveToArea: function(aWidgetId, aAreaId) {
+    let areaProps = gAreas.get(aAreaId);
+    if (!areaProps) {
       return false;
     }
+
+    let widget = this.wrapWidget(aWidgetId);
+    if (!widget.allowedAreaTypes.has(CustomizableUI.AREATYPE_ANY) &&
+        !widget.allowedAreaTypes.has(areaProps.get("type"))) {
+      LOG("Widget " + aWidgetId + " cannot go into " + aAreaId + " with type: "
+          + areaProps.get("type"));
+      return false;
+    }
+
+    let placement = this.getPlacementOfWidget(aWidgetId);
+    if (placement && placement.area != aAreaId &&
+        !this.isWidgetRemovable(aWidgetId)) {
+      LOG("Widget " + aWidgetId + " is not removable, and so cannot move to "
+          + aAreaId);
+      return false;
+    }
+    LOG("Widget " + aWidgetId + " can move to " + aAreaId);
     return true;
   },
 
@@ -1694,9 +1724,9 @@ this.CustomizableUI = {
   get SOURCE_BUILTIN() "builtin",
   get SOURCE_EXTERNAL() "external",
 
-  get TYPE_BUTTON() "button",
-  get TYPE_MENU_PANEL() "menu-panel",
-  get TYPE_TOOLBAR() "toolbar",
+  get AREATYPE_ANY() "any",
+  get AREATYPE_MENU_PANEL() "menu-panel",
+  get AREATYPE_TOOLBAR() "toolbar",
 
   addListener: function(aListener) {
     CustomizableUIInternal.addListener(aListener);
@@ -1813,6 +1843,10 @@ function WidgetGroupWrapper(aWidget) {
 
   this.__defineGetter__("provider", function() CustomizableUI.PROVIDER_API);
 
+  this.__defineGetter__("allowedAreaTypes", function() {
+    return new ReadOnlySet(aWidget.allowedAreaTypes);
+  });
+
   this.__defineSetter__("disabled", function(aValue) {
     aValue = !!aValue;
     aWidget.disabled = aValue;
@@ -1820,7 +1854,7 @@ function WidgetGroupWrapper(aWidget) {
       instance.disabled = aValue;
     }
   });
-  
+
   this.forWindow = function WidgetGroupWrapper_forWindow(aWindow) {
     let instance = aWidget.instances.get(aWindow.document);
     if (!instance) {
@@ -1906,6 +1940,21 @@ function XULWidgetGroupWrapper(aWidgetId) {
   this.type = "custom";
   this.provider = CustomizableUI.PROVIDER_XUL;
 
+  Object.defineProperty(this, "allowedAreaTypes", {
+    get: function() {
+      // Pick any of the build windows to look at.
+      let [window,] = [...gBuildWindows][0];
+      let [, node] = CustomizableUIInternal.getWidgetNode(aWidgetId, window);
+      let areaTypes = node.getAttribute("customizableui-areatypes");
+      // If a XUL node has not declared what areas it is compatible
+      // with, we'll assume it can only go into toolbars.
+      if (!areaTypes) {
+        areaTypes = CustomizableUI.AREATYPE_TOOLBAR;
+      }
+      return new ReadOnlySet(areaTypes.split(","));
+    }
+  });
+
   this.forWindow = function XULWidgetGroupWrapper_forWindow(aWindow) {
     let instance = aWindow.document.getElementById(aWidgetId);
     if (!instance) {
@@ -2132,4 +2181,24 @@ function idToSelector(aId) {
   return "#" + aId.replace(/[ !"'#$%&\(\)*+\-,.\/:;<=>?@\[\\\]^`{|}~]/g, '\\$&');
 }
 
+function ReadOnlySet(aSettable) {
+  let internalSet = new Set(aSettable);
+
+  this.has = function(aValue) {
+    return internalSet.has(aValue);
+  };
+
+  this.iterator = function() {
+    return internalSet.iterator();
+  };
+
+  Object.defineProperty(this, "size", {
+    get: function() {
+      return internalSet.size;
+    }
+  });
+
+  Object.freeze(this);
+}
+
 CustomizableUIInternal.initialize();
diff --git a/browser/components/customizableui/src/CustomizableWidgets.jsm b/browser/components/customizableui/src/CustomizableWidgets.jsm
index fa642e4ef465..6f8425ca08ab 100644
--- a/browser/components/customizableui/src/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/src/CustomizableWidgets.jsm
@@ -38,7 +38,8 @@ const CustomizableWidgets = [{
     viewId: "PanelUI-history",
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
+    allowedAreaTypes: [CustomizableUI.AREATYPE_MENU_PANEL,
+                       CustomizableUI.AREATYPE_TOOLBAR],
     onViewShowing: function(aEvent) {
       // Populate our list of history
       const kMaxResults = 15;
@@ -101,7 +102,8 @@ const CustomizableWidgets = [{
     id: "privatebrowsing-button",
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL],
+    allowedAreaTypes: [CustomizableUI.AREATYPE_MENU_PANEL,
+                       CustomizableUI.AREATYPE_TOOLBAR],
     onCommand: function(e) {
       if (e.target && e.target.ownerDocument && e.target.ownerDocument.defaultView) {
         let win = e.target.ownerDocument.defaultView;
@@ -114,7 +116,8 @@ const CustomizableWidgets = [{
     id: "save-page-button",
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL],
+    allowedAreaTypes: [CustomizableUI.AREATYPE_MENU_PANEL,
+                       CustomizableUI.AREATYPE_TOOLBAR],
     onCommand: function(aEvent) {
       let win = aEvent.target &&
                 aEvent.target.ownerDocument &&
@@ -127,7 +130,8 @@ const CustomizableWidgets = [{
     id: "find-button",
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL],
+    allowedAreaTypes: [CustomizableUI.AREATYPE_MENU_PANEL,
+                       CustomizableUI.AREATYPE_TOOLBAR],
     onCommand: function(aEvent) {
       let win = aEvent.target &&
                 aEvent.target.ownerDocument &&
@@ -140,7 +144,8 @@ const CustomizableWidgets = [{
     id: "open-file-button",
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL],
+    allowedAreaTypes: [CustomizableUI.AREATYPE_MENU_PANEL,
+                       CustomizableUI.AREATYPE_TOOLBAR],
     onCommand: function(aEvent) {
       let win = aEvent.target
                 && aEvent.target.ownerDocument
@@ -153,7 +158,8 @@ const CustomizableWidgets = [{
     id: "developer-button",
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL],
+    allowedAreaTypes: [CustomizableUI.AREATYPE_MENU_PANEL,
+                       CustomizableUI.AREATYPE_TOOLBAR],
     onCommand: function(aEvent) {
       let win = aEvent.target &&
                 aEvent.target.ownerDocument &&
@@ -166,7 +172,8 @@ const CustomizableWidgets = [{
     id: "add-ons-button",
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL],
+    allowedAreaTypes: [CustomizableUI.AREATYPE_MENU_PANEL,
+                       CustomizableUI.AREATYPE_TOOLBAR],
     onCommand: function(aEvent) {
       let win = aEvent.target &&
                 aEvent.target.ownerDocument &&
@@ -179,7 +186,8 @@ const CustomizableWidgets = [{
     id: "preferences-button",
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL],
+    allowedAreaTypes: [CustomizableUI.AREATYPE_MENU_PANEL,
+                       CustomizableUI.AREATYPE_TOOLBAR],
     onCommand: function(aEvent) {
       let win = aEvent.target &&
                 aEvent.target.ownerDocument &&
@@ -193,7 +201,8 @@ const CustomizableWidgets = [{
     type: "custom",
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
+    allowedAreaTypes: [CustomizableUI.AREATYPE_MENU_PANEL,
+                       CustomizableUI.AREATYPE_TOOLBAR],
     onBuild: function(aDocument) {
       let inPanel = (this.currentArea == CustomizableUI.AREA_PANEL);
       let noautoclose = inPanel ? "true" : null;
@@ -318,7 +327,8 @@ const CustomizableWidgets = [{
     type: "custom",
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
+    allowedAreaTypes: [CustomizableUI.AREATYPE_MENU_PANEL,
+                       CustomizableUI.AREATYPE_TOOLBAR],
     onBuild: function(aDocument) {
       let inPanel = (this.currentArea == CustomizableUI.AREA_PANEL);
       let flex = inPanel ? "1" : null;
@@ -417,7 +427,8 @@ const CustomizableWidgets = [{
     viewId: "PanelUI-feeds",
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
-    allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
+    allowedAreasTypes: [CustomizableUI.AREATYPE_MENU_PANEL,
+                        CustomizableUI.AREATYPE_TOOLBAR],
     onClick: function(aEvent) {
       let win = aEvent.target.ownerDocument.defaultView;
       let feeds = win.gBrowser.selectedBrowser.feeds;
diff --git a/browser/components/customizableui/test/Makefile.in b/browser/components/customizableui/test/Makefile.in
index 3c62fd7a2a40..17387c26faf6 100644
--- a/browser/components/customizableui/test/Makefile.in
+++ b/browser/components/customizableui/test/Makefile.in
@@ -11,6 +11,7 @@ relativesrcdir  = @relativesrcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MOCHITEST_BROWSER_FILES = \
+  browser_873066_allowedAreaTypes.js \
   browser_873501_handle_specials.js \
   browser_877178_unregisterArea.js \
   browser_877447_skip_missing_ids.js \
diff --git a/browser/components/customizableui/test/browser_873066_allowedAreaTypes.js b/browser/components/customizableui/test/browser_873066_allowedAreaTypes.js
new file mode 100644
index 000000000000..e69622b560a2
--- /dev/null
+++ b/browser/components/customizableui/test/browser_873066_allowedAreaTypes.js
@@ -0,0 +1,226 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+let gTests = [
+  {
+    desc: "Make sure we can read customizableui-areatypes from XUL widgets",
+    run: function() {
+      // Create some XUL toolbar items and put them in the palette.
+      let items = {
+        "test-item1": {
+          properties: {
+            "customizableui-areatypes": [CustomizableUI.AREATYPE_MENU_PANEL,
+                                         CustomizableUI.AREATYPE_TOOLBAR].join(",")
+          },
+          expectedSet: new Set([CustomizableUI.AREATYPE_MENU_PANEL,
+                                CustomizableUI.AREATYPE_TOOLBAR])
+        },
+        "test-item2": {
+          properties: {
+            "customizableui-areatypes": CustomizableUI.AREATYPE_TOOLBAR
+          },
+          expectedSet: new Set([CustomizableUI.AREATYPE_TOOLBAR])
+        },
+        "test-item3": {
+          properties: {
+            "customizableui-areatypes": CustomizableUI.AREATYPE_MENU_PANEL
+          },
+          expectedSet: new Set([CustomizableUI.AREATYPE_MENU_PANEL])
+        },
+        "test-item4": {
+          properties: {
+            "customizableui-areatypes": ""
+          },
+          expectedSet: new Set([CustomizableUI.AREATYPE_TOOLBAR])
+        },
+        "test-item5": {
+          properties: {},
+          expectedSet: new Set([CustomizableUI.AREATYPE_TOOLBAR])
+        },
+        "test-item6": {
+          properties: {
+            "customizableui-areatypes": [CustomizableUI.AREATYPE_ANY]
+          },
+          expectedSet: new Set([CustomizableUI.AREATYPE_ANY])
+        }
+      }
+
+      for (let testItemId in items) {
+        let itemProperties = items[testItemId].properties;
+        let expectedSet = items[testItemId].expectedSet;
+        itemProperties.id = testItemId;
+
+        let node = createToolbarItem(itemProperties);
+        addToPalette(node);
+
+        let itemWrapper = CustomizableUI.getWidget(testItemId);
+        ok(itemWrapper, "Should be able to retrieve " + testItemId +
+                        " via getWidget");
+        assertSetsEqual(itemWrapper.allowedAreaTypes, expectedSet);
+
+        // Remove the node from the palette.
+        node.parentNode.removeChild(node);
+      }
+    }
+  },
+  {
+    desc: "Make sure we can read allowedAreaTypes from API widgets",
+    run: function() {
+      let items = {
+        "test-item1": {
+          properties: {
+            allowedAreaTypes: [
+              CustomizableUI.AREATYPE_MENU_PANEL,
+              CustomizableUI.AREATYPE_TOOLBAR
+            ]
+          },
+          expectedSet: new Set([CustomizableUI.AREATYPE_MENU_PANEL,
+                                CustomizableUI.AREATYPE_TOOLBAR])
+        },
+        "test-item2": {
+          properties: {
+            allowedAreaTypes: [
+              CustomizableUI.AREATYPE_TOOLBAR
+            ]
+          },
+          expectedSet: new Set([CustomizableUI.AREATYPE_TOOLBAR])
+        },
+        "test-item3": {
+          properties: {
+            allowedAreaTypes: [
+              CustomizableUI.AREATYPE_MENU_PANEL
+            ]
+          },
+          expectedSet: new Set([CustomizableUI.AREATYPE_MENU_PANEL])
+        },
+        "test-item4": {
+          properties: {
+            allowedAreaTypes: []
+          },
+          expectedSet: new Set([])
+        },
+        "test-item5": {
+          properties: {},
+          expectedSet: new Set([CustomizableUI.AREATYPE_TOOLBAR])
+        },
+        "test-item6": {
+          properties: {
+            allowedAreaTypes: [
+              CustomizableUI.AREATYPE_ANY
+            ]
+          },
+          expectedSet: new Set([CustomizableUI.AREATYPE_ANY])
+        }
+      }
+
+      for (let testItemId in items) {
+        let itemProperties = items[testItemId].properties;
+        let expectedSet = items[testItemId].expectedSet;
+        itemProperties.id = testItemId;
+
+        let itemWrapper = CustomizableUI.createWidget(itemProperties);
+        ok(itemWrapper, "Should have successfully gotten itemWrapper");
+        assertSetsEqual(itemWrapper.allowedAreaTypes, expectedSet);
+
+        CustomizableUI.destroyWidget(testItemId);
+      }
+    }
+  },
+  {
+    desc: "Make sure CustomizableUI.canWidgetMoveToArea is reflecting the allowedAreaTypes",
+    run: function() {
+      const kPanels = [CustomizableUI.AREA_PANEL];
+      const kToolbars = [CustomizableUI.AREA_NAVBAR,
+                         CustomizableUI.AREA_MENUBAR,
+                         CustomizableUI.AREA_TABSTRIP,
+                         CustomizableUI.AREA_BOOKMARKS];
+      const kAllAreas = kPanels.concat(kToolbars);
+
+      let items = {
+        "test-item1": {
+          properties: {
+            allowedAreaTypes: [
+              CustomizableUI.AREATYPE_MENU_PANEL,
+              CustomizableUI.AREATYPE_TOOLBAR
+            ]
+          },
+          allowed: kAllAreas,
+          disallowed: [],
+        },
+        "test-item2": {
+          properties: {
+            allowedAreaTypes: [
+              CustomizableUI.AREATYPE_TOOLBAR
+            ]
+          },
+          allowed: kToolbars,
+          disallowed: kPanels,
+        },
+        "test-item3": {
+          properties: {
+            allowedAreaTypes: [
+              CustomizableUI.AREATYPE_MENU_PANEL
+            ]
+          },
+          allowed: kPanels,
+          disallowed: kToolbars
+        },
+        "test-item4": {
+          properties: {
+            allowedAreaTypes: []
+          },
+          allowed: [],
+          disallowed: kAllAreas
+        },
+        "test-item5": {
+          properties: {},
+          allowed: kToolbars,
+          disallowed: kPanels
+        },
+        "test-item6": {
+          properties: {
+            allowedAreaTypes: [
+              CustomizableUI.AREATYPE_ANY
+            ]
+          },
+          allowed: kAllAreas,
+          disallowed: []
+        }
+      }
+
+      for (let testItemId in items) {
+        let itemProperties = items[testItemId].properties;
+        let allowed = items[testItemId].allowed;
+        let disallowed = items[testItemId].disallowed;
+        itemProperties.id = testItemId;
+
+        let itemWrapper = CustomizableUI.createWidget(itemProperties);
+        ok(itemWrapper, "Should have successfully gotten itemWrapper");
+
+        for (let areaId of allowed) {
+          ok(CustomizableUI.canWidgetMoveToArea(testItemId, areaId),
+             testItemId + " should be able to move to area " + areaId);
+        }
+
+        for (let areaId of disallowed) {
+          is(CustomizableUI.canWidgetMoveToArea(testItemId, areaId), false,
+             testItemId + " should not be able to move to area " + areaId);
+        }
+
+        CustomizableUI.destroyWidget(testItemId);
+      }
+    }
+  }
+];
+
+function cleanup() {
+  removeCustomToolbars();
+  resetCustomization();
+}
+
+function test() {
+  waitForExplicitFinish();
+  registerCleanupFunction(cleanup);
+  runTests(gTests);
+}
diff --git a/browser/components/customizableui/test/head.js b/browser/components/customizableui/test/head.js
index 8fb856ce7efb..dbc4a7922b7d 100644
--- a/browser/components/customizableui/test/head.js
+++ b/browser/components/customizableui/test/head.js
@@ -33,7 +33,7 @@ function createToolbarWithPlacements(id, placements) {
   tb.setAttribute("customizable", "true");
   document.getElementById("customToolbars").appendChild(tb);
   CustomizableUI.registerArea(id, {
-    type: CustomizableUI.TYPE_TOOLBAR,
+    type: CustomizableUI.AREATYPE_TOOLBAR,
     defaultPlacements: placements
   });
 }
@@ -75,6 +75,17 @@ function assertAreaPlacements(areaId, expectedPlacements) {
   }
 }
 
+function assertSetsEqual(aSetA, aSetB) {
+  if (aSetA.size != aSetB.size)
+    ok(false, "Sets were not equal in size.");
+
+  for (let item of aSetA) {
+    if (!aSetB.has(item)) {
+      ok(false, "Left set contained " + item + " which was not in right set.");
+    }
+  }
+}
+
 function getAreaWidgetIds(areaId) {
   let widgetAry = CustomizableUI.getWidgetsInArea(areaId);
   return widgetAry.map(x => x.id);
@@ -130,6 +141,20 @@ function startCustomizing() {
   return deferred.promise;
 }
 
+function createToolbarItem(aProperties) {
+  let node = document.createElement("toolbaritem");
+  for (let attribute in aProperties) {
+    node.setAttribute(attribute, aProperties[attribute]);
+  }
+  return node;
+}
+
+function addToPalette(...aNodes) {
+  for (let node of aNodes) {
+    gNavToolbox.palette.appendChild(node);
+  }
+}
+
 function testRunner(testAry) {
   for (let test of testAry) {
     info(test.desc);

From 59061167fce15aab3cf002a14f6c2ddc1b03c342 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Mon, 10 Jun 2013 15:56:22 -0400
Subject: [PATCH 230/230] Bug 881385 - Remove checks for text iconmodes in
 browser-social.js. r=mixedpuppy

--HG--
extra : rebase_source : 1256bc03ca86a6c1608178a0d8525653c7ba6e28
---
 browser/base/content/browser-social.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/browser/base/content/browser-social.js b/browser/base/content/browser-social.js
index 95dabefbcfda..91e34aef33b9 100644
--- a/browser/base/content/browser-social.js
+++ b/browser/base/content/browser-social.js
@@ -822,9 +822,7 @@ SocialShare = {
     iframe.setAttribute("src", shareEndpoint);
 
     let navBar = document.getElementById("nav-bar");
-    let anchor = navBar.getAttribute("mode") == "text" ?
-                   document.getAnonymousElementByAttribute(this.shareButton, "class", "toolbarbutton-text") :
-                   document.getAnonymousElementByAttribute(this.shareButton, "class", "toolbarbutton-icon");
+    let anchor = document.getAnonymousElementByAttribute(aToolbarButton, "class", "toolbarbutton-icon");
     this.panel.openPopup(anchor, "bottomcenter topright", 0, 0, false, false);
     Social.setErrorListener(iframe, this.setErrorMessage.bind(this));
   },
@@ -1264,9 +1262,7 @@ SocialToolbar = {
     });
 
     let navBar = document.getElementById("nav-bar");
-    let anchor = navBar.getAttribute("mode") == "text" ?
-                   document.getAnonymousElementByAttribute(aToolbarButton, "class", "toolbarbutton-text") :
-                   document.getAnonymousElementByAttribute(aToolbarButton, "class", "toolbarbutton-badge-container");
+    let anchor = document.getAnonymousElementByAttribute(aToolbarButton, "class", "toolbarbutton-badge-container");
     // Bug 849216 - open the popup in a setTimeout so we avoid the auto-rollup
     // handling from preventing it being opened in some cases.
     setTimeout(function() {