Bug 940093 - offer UI option in Australis' customization mode to toggle titlebar, r=jaws
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Wed, 29 Jan 2014 17:19:23 +0000
changeset 181862 481cc4221926763d9f0a1330a0f49e0e22589c11
parent 181861 67fcec5a2779eb6c553f13e30e4a978a8be04f31
child 181863 e50578e8c8a4fb3e11e06e74eef622cd33ab24b9
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws
bugs940093
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 940093 - offer UI option in Australis' customization mode to toggle titlebar, r=jaws
browser/base/moz.build
browser/components/customizableui/content/customizeMode.inc.xul
browser/components/customizableui/src/CustomizeMode.jsm
browser/components/customizableui/src/moz.build
browser/locales/en-US/chrome/browser/browser.dtd
browser/themes/osx/browser.css
browser/themes/osx/customizableui/customize-titleBar-toggle.png
browser/themes/osx/customizableui/customize-titleBar-toggle@2x.png
browser/themes/osx/jar.mn
browser/themes/shared/customizableui/customizeMode.inc.css
browser/themes/shared/customizableui/panelUIOverlay.inc.css
browser/themes/windows/customizableui/customize-titleBar-toggle.png
browser/themes/windows/jar.mn
--- a/browser/base/moz.build
+++ b/browser/base/moz.build
@@ -30,9 +30,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('win
     DEFINES['CONTEXT_COPY_IMAGE_CONTENTS'] = 1
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):
     DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
     DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1
 
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
+JAR_MANIFESTS += ['jar.mn']
--- a/browser/components/customizableui/content/customizeMode.inc.xul
+++ b/browser/components/customizableui/content/customizeMode.inc.xul
@@ -13,17 +13,24 @@
              onkeypress="BrowserOpenAddonsMgr('addons://discovery/');"
              id="customization-more-tools"
              class="text-link">
         &customizeMode.menuAndToolbars.emptyLink;
       </label>
     </hbox>
     <vbox id="customization-palette" class="customization-palette" flex="1"/>
     <spacer id="customization-spacer" flex="1"/>
-    <hbox>
+    <hbox id="customization-footer">
+#ifdef CAN_DRAW_IN_TITLEBAR
+      <button id="customization-titlebar-visibility-button" class="customizationmode-button"
+              label="&customizeMode.titlebar;" type="checkbox"
+#NB: because oncommand fires after click, by the time we've fired, the checkbox binding
+#    will already have switched the button's state, so this is correct:
+              oncommand="gCustomizeMode.toggleTitlebar(this.hasAttribute('checked'))"/>
+#endif
       <button id="customization-toolbar-visibility-button" label="&customizeMode.toolbars;" class="customizationmode-button" type="menu">
         <menupopup id="customization-toolbar-menu" onpopupshowing="onViewToolbarsPopupShowing(event)"/>
       </button>
       <spacer flex="1"/>
       <button id="customization-reset-button" oncommand="gCustomizeMode.reset();" label="&customizeMode.restoreDefaults;" class="customizationmode-button"/>
     </hbox>
   </vbox>
   <vbox id="customization-panel-container">
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -11,16 +11,17 @@ const {classes: Cc, interfaces: Ci, util
 const kPrefCustomizationDebug = "browser.uiCustomization.debug";
 const kPrefCustomizationAnimation = "browser.uiCustomization.disableAnimation";
 const kPaletteId = "customization-palette";
 const kAboutURI = "about:customizing";
 const kDragDataTypePrefix = "text/toolbarwrapper-id/";
 const kPlaceholderClass = "panel-customization-placeholder";
 const kSkipSourceNodePref = "browser.uiCustomization.skipSourceNodeCheck";
 const kToolbarVisibilityBtn = "customization-toolbar-visibility-button";
+const kDrawInTitlebarPref = "browser.tabs.drawInTitlebar";
 const kMaxTransitionDurationMs = 2000;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource:///modules/CustomizableUI.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource://gre/modules/Promise.jsm");
 
@@ -45,16 +46,21 @@ function CustomizeMode(aWindow) {
 
   // 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.paletteEmptyNotice = this.document.getElementById("customization-empty");
   this.paletteSpacer = this.document.getElementById("customization-spacer");
+#ifdef CAN_DRAW_IN_TITLEBAR
+  this._updateTitlebarButton();
+  Services.prefs.addObserver(kDrawInTitlebarPref, this, false);
+  this.window.addEventListener("unload", this);
+#endif
 };
 
 CustomizeMode.prototype = {
   _changed: false,
   _transitioning: false,
   window: null,
   document: null,
   // areas is used to cache the customizable areas when in customization mode.
@@ -75,16 +81,22 @@ CustomizeMode.prototype = {
   get panelUIContents() {
     return this.document.getElementById("PanelUI-contents");
   },
 
   get _handler() {
     return this.window.CustomizationHandler;
   },
 
+  uninit: function() {
+#ifdef CAN_DRAW_IN_TITLEBAR
+    Services.prefs.removeObserver(kDrawInTitlebarPref, this);
+#endif
+  },
+
   toggle: function() {
     if (this._handler.isEnteringCustomizeMode || this._handler.isExitingCustomizeMode) {
       this._wantToBeInCustomizeMode = !this._wantToBeInCustomizeMode;
       return;
     }
     if (this._customizing) {
       this.exit();
     } else {
@@ -962,19 +974,53 @@ CustomizeMode.prototype = {
       case "mouseup":
         this._onMouseUp(aEvent);
         break;
       case "keypress":
         if (aEvent.keyCode == aEvent.DOM_VK_ESCAPE) {
           this.exit();
         }
         break;
+#ifdef CAN_DRAW_IN_TITLEBAR
+      case "unload":
+        this.uninit();
+        break;
+#endif
+    }
+  },
+
+#ifdef CAN_DRAW_IN_TITLEBAR
+  observe: function(aSubject, aTopic, aData) {
+    switch (aTopic) {
+      case "nsPref:changed":
+        this._updateTitlebarButton();
+        break;
     }
   },
 
+  _updateTitlebarButton: function() {
+    let drawInTitlebar = true;
+    try {
+      drawInTitlebar = Services.prefs.getBoolPref(kDrawInTitlebarPref);
+    } catch (ex) { }
+    let button = this.document.getElementById("customization-titlebar-visibility-button");
+    // Drawing in the titlebar means 'hiding' the titlebar:
+    if (drawInTitlebar) {
+      button.removeAttribute("checked");
+    } else {
+      button.setAttribute("checked", "true");
+    }
+  },
+
+  toggleTitlebar: function(aShouldShowTitlebar) {
+    // Drawing in the titlebar means not showing the titlebar, hence the negation:
+    Services.prefs.setBoolPref(kDrawInTitlebarPref, !aShouldShowTitlebar);
+  },
+#endif
+
   _onDragStart: function(aEvent) {
     __dumpDragData(aEvent);
     let item = aEvent.target;
     while (item && item.localName != "toolbarpaletteitem") {
       if (item.localName == "toolbar") {
         return;
       }
       item = item.parentNode;
--- a/browser/components/customizableui/src/moz.build
+++ b/browser/components/customizableui/src/moz.build
@@ -4,14 +4,17 @@
 # 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/.
 
 EXTRA_JS_MODULES += [
     'DragPositionManager.jsm',
     'ScrollbarSampler.jsm',
 ]
 
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):
+    DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
+
 EXTRA_PP_JS_MODULES += [
     'CustomizableUI.jsm',
     'CustomizableWidgets.jsm',
     'CustomizeMode.jsm',
     'PanelWideWidgetTracker.jsm',
 ]
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -688,16 +688,17 @@ just addresses the organization to follo
 
 <!ENTITY customizeMode.tabTitle "Customize &brandShortName;">
 <!ENTITY customizeMode.menuAndToolbars.label "Menu and toolbars">
 <!ENTITY customizeMode.menuAndToolbars.header2 "Additional Tools and Features">
 <!ENTITY customizeMode.menuAndToolbars.empty "Want more tools?">
 <!ENTITY customizeMode.menuAndToolbars.emptyLink "Choose from thousands of add-ons">
 <!ENTITY customizeMode.restoreDefaults "Restore Defaults">
 <!ENTITY customizeMode.toolbars "Show / Hide Toolbars">
+<!ENTITY customizeMode.titlebar "Title Bar">
 
 <!ENTITY social.chatBar.commandkey "c">
 <!ENTITY social.chatBar.label "Focus chats">
 <!ENTITY social.chatBar.accesskey "c">
 
 <!ENTITY social.markpageMenu.accesskey "P">
 <!ENTITY social.markpageMenu.label "Save Page To…">
 <!ENTITY social.marklinkMenu.accesskey "L">
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -4051,16 +4051,31 @@ window > chatbox {
 
 #main-window[customize-entered] #TabsToolbar {
   margin-top: 9px;
   background-clip: padding-box;
   border-right: 3px solid transparent;
   border-left: 3px solid transparent;
 }
 
+@media (min-resolution: 2dppx) {
+  #customization-titlebar-visibility-button {
+    list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle@2x.png");
+    -moz-image-region: rect(0, 48px, 48px, 0);
+  }
+
+  #customization-titlebar-visibility-button[checked] {
+    -moz-image-region: rect(0, 96px, 48px, 48px);
+  }
+
+  #customization-titlebar-visibility-button > .button-box > .button-icon {
+    width: 24px;
+  }
+}
+
 /* End customization mode */
 
 #main-window[privatebrowsingmode=temporary] {
   background-image: url("chrome://browser/skin/privatebrowsing-mask.png");
   background-position: top right;
   background-repeat: no-repeat;
   background-color: -moz-mac-chrome-active;
 }
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..fb0edd2566a4f803e43914f431b4c2050f5aba18
GIT binary patch
literal 317
zc$@(}0mA-?P)<h;3K|Lk000e1NJLTq001xm000;W1ONa47WB4P00035Nkl<ZcmeIu
zu}T9$7{u}acP^U3a79cJPAr5xg)d-hXXP7+g++QRTk!>KtkWH&u-7_*U?CV16iguq
zlICt~Z;1!H#a8+&rW)9t&qypIF?aIJkZ><laebE$_Xs!Jhm6CKY;xJm-PXR#Sh4~-
zUhXh&zbFq=%uhi}-@)pa9|4Sx2j4V&ZeHBhTL7~Xx?V15;{@DKF?lJ(%^gdcwrd1j
z9TDto>_msx68c^W@$?~@j2r`~2qql#=mB^s3JTUOh~>nbbcBQJh?|~{;}^u;G=71A
zln-Pi_P^i{EJ%MMDEkDO<Ph7p^T)TM5<xa>@J<!iHyzL=+!w_4O{Db$0%dt!Va1}<
P00000NkvXXu0mjftImXR
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7200e74c2bdcbc6363d5f3903111c45572210b0e
GIT binary patch
literal 538
zc$@(m0_FXQP)<h;3K|Lk000e1NJLTq003YB001xu1ONa4L?5?A0005uNkl<ZcmeI!
zJ!=$E7{&45Y$oG`#bA6TsMy5DZy=;s38b)7!<Lo`sYHCiwXqOHKY}23BJnj}!qUcI
z5rSe6Eh0%aF<vDS2r{^n%}lXy|I?geIL|%Y^9+;db7FuPV3#!Xe}LA_R;LwecshTa
zwQBZHTin>6rK;y=_U*d6YW7dbv!fDa38mL6SkA$wf5##?Oo7^C=lu0gb3;&Sz*j5E
zFytV}w*^`>_V~ifr;~G23e<7EkR#0zx(+x7R-CzZ?!7L&IW>DPAZ)t}xb$MA(|Ueu
zsz?PpCrFSc&~*R=bUps&JF`MTDes>iY_H!gR=ty!ACTbAhS%K_C^-HhAEv`};v@yC
zf&gU(<UYPqf>HkxWKLMtlu@9<ZUO{>QUeZXSksNnh+xYX7HqNRd!g!`G=PAn=6@8h
zug6dA!%3BMbp}#`1^r0aeglstRnC=}_%l~_iR&S#mjD_;eZ&gI0C9=q62}{eOB^c{
zD-;970C9<HCsrs{C{`#|=+mI;C~&OLzX7x-<}(#CpS34|y8V;O27ctt&w^@6j9OhX
zj9UHE0pkzeogcQe`YWi6MzS|=7=H$8^-rF-c-EkLSoapS`X_-S#tf*Q4RgMz**^*T
co4yb58^&2}PxRWO-~a#s07*qoM6N<$g7u~JF#rGn
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -19,20 +19,22 @@ browser.jar:
 #endif
   skin/classic/browser/aboutTabCrashed.css
   skin/classic/browser/actionicon-tab.png
   skin/classic/browser/actionicon-tab@2x.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/background-noise-toolbar.png  (customizableui/background-noise-toolbar.png)
+  skin/classic/browser/customizableui/customize-titleBar-toggle.png  (customizableui/customize-titleBar-toggle.png)
+  skin/classic/browser/customizableui/customize-titleBar-toggle@2x.png  (customizableui/customize-titleBar-toggle@2x.png)
+  skin/classic/browser/customizableui/customizeFavicon.ico  (../shared/customizableui/customizeFavicon.ico)
   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/customizeFavicon.ico  (../shared/customizableui/customizeFavicon.ico)
 * skin/classic/browser/engineManager.css                    (engineManager.css)
   skin/classic/browser/fullscreen-darknoise.png
   skin/classic/browser/Geolocation-16.png
   skin/classic/browser/Geolocation-16@2x.png
   skin/classic/browser/Geolocation-64.png
   skin/classic/browser/Geolocation-64@2x.png
   skin/classic/browser/home.png
   skin/classic/browser/identity.png
--- a/browser/themes/shared/customizableui/customizeMode.inc.css
+++ b/browser/themes/shared/customizableui/customizeMode.inc.css
@@ -31,33 +31,75 @@
   padding-left: 10px;
   padding-right: 10px;
 }
 
 #customization-container {
   background-color: rgb(247,247,247);
 }
 
-#customization-palette-container {
-  padding: 25px;
+#customization-palette,
+#customization-empty {
+  padding: 0 25px 25px;
 }
 
 #customization-header {
   font-size: 1.5em;
   line-height: 1.5em;
   color: rgb(64,100,128);
   font-weight: lighter;
   margin-bottom: 1em;
+  padding: 25px 25px 0;
 }
 
 #customization-panel-container {
   padding: 15px 25px 25px;
   background-image: linear-gradient(to bottom, #3e86ce, #3878ba);
 }
 
+#customization-footer {
+  background-color: rgb(236,236,236);
+  border-top: 1px solid rgb(221,221,221);
+  padding: 15px;
+}
+
+.customizationmode-button {
+  border: 1px solid rgb(192,192,192);
+  border-radius: 3px;
+  margin: 0;
+  padding: 2px 12px;
+  background-color: rgb(251,251,251);
+  color: rgb(71,71,71);
+  box-shadow: 0 1px rgba(255, 255, 255, 0.5),
+              inset 0 1px rgba(255, 255, 255, 0.5);
+  -moz-appearance: none;
+}
+
+#customization-titlebar-visibility-button {
+  list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle.png");
+  -moz-image-region: rect(0, 24px, 24px, 0);
+  padding: 2px 7px;
+  -moz-margin-end: 10px;
+}
+
+#customization-titlebar-visibility-button > .button-box > .button-text {
+  /* Sadly, button.css thinks its margins are perfect for everyone. */
+  -moz-margin-start: 6px !important;
+}
+
+#customization-titlebar-visibility-button[checked] {
+  -moz-image-region: rect(0, 48px, 24px, 24px);
+  background-color: rgb(218, 218, 218);
+  border-color: rgb(168, 168, 168);
+  text-shadow: 0 1px rgb(236, 236, 236);
+  box-shadow: 0 1px rgba(255, 255, 255, 0.5),
+              inset 0 1px rgb(196, 196, 196);
+}
+
+
 #main-window[customize-entered] #customization-panel-container {
   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;
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -386,17 +386,16 @@ toolbarpaletteitem[place="palette"] > to
 #customization-palette .toolbarbutton-multiline-text,
 #customization-palette .toolbarbutton-text {
   display: none;
 }
 
 panelview .toolbarbutton-1,
 .subviewbutton,
 .widget-overflow-list .toolbarbutton-1,
-.customizationmode-button,
 .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button,
 #edit-controls@inAnyPanel@ > toolbarbutton,
 #zoom-controls@inAnyPanel@ > toolbarbutton {
   -moz-appearance: none;
   padding: 2px 6px;
   background-color: hsla(210,4%,10%,0);
   border-radius: 2px;
   border: 1px solid;
@@ -445,31 +444,29 @@ panelview .toolbarbutton-1,
 
 .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   border: 0;
 }
 
 panelview .toolbarbutton-1@buttonStateHover@,
 .subviewbutton@buttonStateHover@,
 .widget-overflow-list .toolbarbutton-1@buttonStateHover@,
-.customizationmode-button,
 #edit-controls@inAnyPanel@ > toolbarbutton@buttonStateHover@,
 #zoom-controls@inAnyPanel@ > toolbarbutton@buttonStateHover@ {
   background-color: hsla(210,4%,10%,.08);
   border-color: hsla(210,4%,10%,.1);
 }
 
 #edit-controls@inAnyPanel@@buttonStateHover@,
 #zoom-controls@inAnyPanel@@buttonStateHover@ {
   border-color: hsla(210,4%,10%,.1);
 }
 
 panelview .toolbarbutton-1@buttonStateActive@,
 .subviewbutton@buttonStateActive@,
-.customizationmode-button@buttonStateActive@,
 .widget-overflow-list .toolbarbutton-1@buttonStateActive@,
 #edit-controls@inAnyPanel@ > toolbarbutton@buttonStateActive@,
 #zoom-controls@inAnyPanel@ > toolbarbutton@buttonStateActive@ {
   background-color: hsla(210,4%,10%,.15);
   border-color: hsla(210,4%,10%,.15);
   box-shadow: 0 1px 0 0 hsla(210,4%,10%,.05) inset;
 }
 
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..01dcf09a2b7db12a4d8af85ee05ddfeb2134e4bc
GIT binary patch
literal 550
zc$@(y0@?kEP)<h;3K|Lk000e1NJLTq001xm000;W1^@s6y#0RM0005)Nkl<ZSi|j@
z$xgyh6o&5$I6R9(RFpWaUAf{7RMa8`3N27thEhZZ2gFx0afmU|xYf9HE3U5RZ){==
z8YP?%6K?XSKk2#O$<Mi$1wsthfLAnS-De6_nJpglRbUePp%=bkS7ahn^pwh#yL#Pn
zJ-$d2+-;t*2<%??cI8mU(uL)ik)Jd2`;wkZq`-$?gty$L$EE=LvQ#^fxpG}*iq&t0
z_o#E5ZRylo)THUDP(AAEQRDB$p1%nDV}>0hP3yJ`KTn!5@)h_1JZiueNM$<pj-r`k
zKOHrCKTdVB+-OUrSB?Cts@n@Xjr)sVAs_U=A&edS{Av6~I3DqI!INe>UA@m1NM$;;
zS4GQ?{2U-VN_7<AlmaxQs$26>-I~y?GW;z0$xnU?HJC1ambBJ51hz0}L>PUxM3;xc
zd?&m|9garv;MhA-5JuU}qXzqwM20N@*aA1+skK-Hwi0IyKy0CzCGRp|68#jIVDHA$
zYyrR)k)$afpPoY;0(*xs0N7$DX7Dv2HaA~vt9%W>=H`pAs<Sl!o0~7f(G*_;VsrCF
zcrVG<fY{u8vBlT`Y;OMl53m{0*cyP%&Hw)aaFfq3u0s8WUtZs=`@ce*e6gV<Zs{z&
o(etIBB4&r4cijBpp8|tk?|1m$=MZ@D6951J07*qoM6N<$f|6nb!T<mO
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -21,20 +21,21 @@ browser.jar:
         skin/classic/browser/aboutSyncTabs.css
 #endif
         skin/classic/browser/aboutTabCrashed.css
         skin/classic/browser/actionicon-tab.png
 *       skin/classic/browser/browser.css
 *       skin/classic/browser/browser-lightweightTheme.css
         skin/classic/browser/click-to-play-warning-stripes.png
         skin/classic/browser/customizableui/background-noise-toolbar.png  (customizableui/background-noise-toolbar.png)
+        skin/classic/browser/customizableui/customizeFavicon.ico  (../shared/customizableui/customizeFavicon.ico)
+        skin/classic/browser/customizableui/customize-titleBar-toggle.png  (customizableui/customize-titleBar-toggle.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/customizableui/customizeFavicon.ico  (../shared/customizableui/customizeFavicon.ico)
 *       skin/classic/browser/engineManager.css
         skin/classic/browser/fullscreen-darknoise.png
         skin/classic/browser/Geolocation-16.png
         skin/classic/browser/Geolocation-64.png
         skin/classic/browser/Info.png
         skin/classic/browser/identity.png
         skin/classic/browser/identity-icons-generic.png
         skin/classic/browser/identity-icons-https.png
@@ -347,20 +348,21 @@ browser.jar:
         skin/classic/aero/browser/aboutSyncTabs.css
 #endif
         skin/classic/aero/browser/aboutTabCrashed.css
         skin/classic/aero/browser/actionicon-tab.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/customizableui/background-noise-toolbar.png  (customizableui/background-noise-toolbar.png)
+        skin/classic/aero/browser/customizableui/customize-titleBar-toggle.png  (customizableui/customize-titleBar-toggle.png)
+        skin/classic/aero/browser/customizableui/customizeFavicon.ico  (../shared/customizableui/customizeFavicon.ico)
         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/customizeFavicon.ico  (../shared/customizableui/customizeFavicon.ico)
 *       skin/classic/aero/browser/engineManager.css
         skin/classic/aero/browser/fullscreen-darknoise.png
         skin/classic/aero/browser/Geolocation-16.png
         skin/classic/aero/browser/Geolocation-64.png
         skin/classic/aero/browser/Info.png                           (Info-aero.png)
         skin/classic/aero/browser/identity.png                       (identity-aero.png)
         skin/classic/aero/browser/identity-icons-generic.png
         skin/classic/aero/browser/identity-icons-https.png