Bug 868640 - Implement private browsing indicator. r=mdeboer
authorDão Gottwald <dao@mozilla.com>
Thu, 19 Sep 2013 09:42:06 +0200
changeset 148389 729ae62cd13bfc448736e9072e2da5bac6c1184b
parent 148388 c6d3d1418c78d501386f2673d23302de4e02f3ae
child 148495 77b5a2c97a28b2bd6217de7d4572f652fd2dc596
push id429
push userdgottwald@mozilla.com
push dateThu, 19 Sep 2013 07:42:52 +0000
treeherderux@729ae62cd13b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmdeboer
bugs868640
milestone27.0a1
Bug 868640 - Implement private browsing indicator. r=mdeboer
browser/base/content/browser.xul
browser/themes/windows/browser.css
browser/themes/windows/jar.mn
browser/themes/windows/privatebrowsing-dark.png
browser/themes/windows/privatebrowsing-indicator.png
browser/themes/windows/privatebrowsing-light.png
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -869,17 +869,18 @@
                    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" skipintoolbarset="true">
+      <hbox id="window-controls" hidden="true" pack="end" skipintoolbarset="true"
+            ordinal="1000">
         <toolbarbutton id="minimize-button"
                        tooltiptext="&fullScreenMinimize.tooltip;"
                        oncommand="window.minimize();"/>
 
         <toolbarbutton id="restore-button"
                        tooltiptext="&fullScreenRestore.tooltip;"
                        oncommand="BrowserFullScreen();"/>
 
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2291,17 +2291,14 @@ chatbox {
 #customization-container {
   border-left: 1px solid @toolbarShadowColor@;
   border-right: 1px solid @toolbarShadowColor@;
   background-clip: padding-box;
 }
 
 /* End customization mode */
 
-#main-window[privatebrowsingmode=temporary] #toolbar-menubar {
-  background-image: url("chrome://browser/skin/privatebrowsing-dark.png");
-  background-position: top right;
-  background-repeat: no-repeat;
+#main-window[privatebrowsingmode=temporary] #TabsToolbar::after {
+  content: "";
+  display: -moz-box;
+  width: 40px;
+  background: url("chrome://browser/skin/privatebrowsing-indicator.png") no-repeat center center;
 }
-
-#main-window[privatebrowsingmode=temporary] #toolbar-menubar:-moz-locale-dir(rtl) {
-  background-position: top left;
-}
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -61,18 +61,17 @@ browser.jar:
         skin/classic/browser/page-livemarks.png                      (feeds/feedIcon16.png)
         skin/classic/browser/pluginInstall-16.png
         skin/classic/browser/pluginInstall-64.png
         skin/classic/browser/pointerLock-16.png
         skin/classic/browser/pointerLock-64.png
         skin/classic/browser/Privacy-16.png
         skin/classic/browser/Privacy-32.png
         skin/classic/browser/Privacy-48.png
-        skin/classic/browser/privatebrowsing-light.png
-        skin/classic/browser/privatebrowsing-dark.png
+        skin/classic/browser/privatebrowsing-indicator.png
         skin/classic/browser/reload-stop-go.png
         skin/classic/browser/searchbar.css
         skin/classic/browser/searchbar-dropdown-arrow.png
         skin/classic/browser/Secure24.png
         skin/classic/browser/setDesktopBackground.css
         skin/classic/browser/slowStartup-16.png
         skin/classic/browser/Toolbar.png
         skin/classic/browser/Toolbar-inverted.png
@@ -351,18 +350,17 @@ browser.jar:
         skin/classic/aero/browser/page-livemarks.png                 (feeds/feedIcon16-aero.png)
         skin/classic/aero/browser/pluginInstall-16.png
         skin/classic/aero/browser/pluginInstall-64.png
         skin/classic/aero/browser/pointerLock-16.png
         skin/classic/aero/browser/pointerLock-64.png
         skin/classic/aero/browser/Privacy-16.png                     (Privacy-16-aero.png)
         skin/classic/aero/browser/Privacy-32.png                     (Privacy-32-aero.png)
         skin/classic/aero/browser/Privacy-48.png                     (Privacy-48-aero.png)
-        skin/classic/aero/browser/privatebrowsing-light.png
-        skin/classic/aero/browser/privatebrowsing-dark.png
+        skin/classic/aero/browser/privatebrowsing-indicator.png
         skin/classic/aero/browser/reload-stop-go.png
         skin/classic/aero/browser/searchbar.css
         skin/classic/aero/browser/searchbar-dropdown-arrow.png       (searchbar-dropdown-arrow-aero.png)
         skin/classic/aero/browser/Secure24.png                       (Secure24-aero.png)
         skin/classic/aero/browser/setDesktopBackground.css
         skin/classic/aero/browser/slowStartup-16.png
         skin/classic/aero/browser/Toolbar.png                        (Toolbar-aero.png)
         skin/classic/aero/browser/Toolbar-inverted.png               (Toolbar-inverted-aero.png)
rename from browser/themes/windows/privatebrowsing-dark.png
rename to browser/themes/windows/privatebrowsing-indicator.png
deleted file mode 100644
index c12f50779858230c939f5f96582437fd60e82610..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001