Bug 505699 - Add UI for full screen mode on the Mac. ui-r=faaborg, r=dao

--HG--
extra : rebase_source : b4819e769990532fcb913df8185b6d3911e7efe2

browser/base/content/browser-menubar.inc

@@ -433,14 +433,12 @@
                           label="&pageSourceCmd.label;"
                           key="key_viewSource"
                           command="View:PageSource"/>
-#ifndef XP_MACOSX
                 <menuitem id="fullScreenItem"
                           accesskey="&fullScreenCmd.accesskey;"
                           label="&fullScreenCmd.label;"
                           key="key_fullScreen"
                           type="checkbox"
                           observes="View:FullScreen"/>
-#endif
                 <menuitem id="menu_showAllTabs"
                           hidden="true"
                           accesskey="&showAllTabsCmd.accesskey;"

browser/base/content/browser-sets.inc

@@ -266,6 +266,9 @@
     <key id="showAllHistoryKb" key="&showAllHistoryCmd.commandkey;" command="Browser:ShowAllHistory" modifiers="accel,shift"/>
     <key keycode="VK_F5" command="Browser:ReloadSkipCache" modifiers="accel"/>
     <key id="key_fullScreen" keycode="VK_F11" command="View:FullScreen"/>
+#else
+    <key id="key_fullScreen" key="&fullScreenCmd.macCommandKey;" command="View:FullScreen" modifiers="accel,shift"/>
+    <key keycode="VK_F11" command="View:FullScreen"/>
 #endif
     <key key="&reloadCmd.commandkey;" command="Browser:Reload" modifiers="accel" id="key_reload"/>
     <key key="&reloadCmd.commandkey;" command="Browser:ReloadSkipCache" modifiers="accel,shift"/>

browser/base/content/browser.js

@@ -3778,11 +3778,9 @@ var FullScreen =
     else
       gNavToolbox.setAttribute("inFullscreen", true);
 
-#ifndef XP_MACOSX
     var controls = document.getElementsByAttribute("fullscreencontrol", "true");
     for (var i = 0; i < controls.length; ++i)
       controls[i].hidden = aShow;
-#endif
   }
 };
 

browser/base/content/browser.xul

@@ -511,13 +511,11 @@
                        label="&pasteCmd.label;"
                        command="cmd_paste"
                        tooltiptext="&pasteButton.tooltip;"/>
-#ifndef XP_MACOSX
         <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                        observes="View:FullScreen"
                        type="checkbox"
                        label="&fullScreenCmd.label;"
                        tooltiptext="&fullScreenButton.tooltip;"/>
-#endif
     </toolbarpalette>
 
     <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
@@ -529,17 +527,12 @@
              iconsize="large"
 #endif
              customizable="true"
-#ifdef XP_MACOSX
-             defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,search-container"
-#else
 #ifdef WINCE
              defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,search-container,navigator-throbber,fullscreenflex,window-controls"
 #else
              defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,search-container,fullscreenflex,window-controls"
-#endif
 #endif
              context="toolbar-context-menu">
-#ifndef XP_MACOSX
       <hbox id="fullscreenflex" flex="1" hidden="true" fullscreencontrol="true"/>
       <hbox id="window-controls" hidden="true" fullscreencontrol="true">
         <toolbarbutton id="minimize-button" class="toolbarbutton-1"
@@ -554,7 +547,6 @@
                        tooltiptext="&fullScreenClose.tooltip;"
                        oncommand="BrowserTryToCloseWindow();"/>
       </hbox>
-#endif
     </toolbar>
 
     <toolbarset id="customToolbars" context="toolbar-context-menu"/>

browser/locales/en-US/chrome/browser/browser.dtd

@@ -50,6 +50,7 @@
 <!ENTITY pageInfoCmd.commandkey "i">
 <!ENTITY fullScreenCmd.label "Full Screen">
 <!ENTITY fullScreenCmd.accesskey "F">
+<!ENTITY fullScreenCmd.macCommandKey "f">
 <!ENTITY showAllTabsCmd.label "Show All Tabs">
 <!ENTITY showAllTabsCmd.accesskey "A">
 

browser/themes/pinstripe/browser/browser.css

@@ -648,6 +648,7 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
 #copy-button[checked="true"] {
   -moz-image-region: rect(46px, 468px, 69px, 432px);
 }
+
 /* ----- DEFAULT PASTE BUTTON ----- */	
 
 #paste-button {
@@ -661,24 +662,34 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
   -moz-image-region: rect(46px, 504px, 69px, 468px);
 }
 
+/* ----- FULLSCREEN AND RESTORE BUTTON ----- */
+
+#fullscreen-button {
+  -moz-image-region: rect(0px, 684px, 23px, 648px);
+}
+
+#fullscreen-button:hover:active {
+  -moz-image-region: rect(46px, 684px, 69px, 648px);
+}
+
+#fullscreen-button[checked="true"],
+#restore-button {
+  background-color: transparent;
+  border-color: transparent;
+  -moz-image-region: rect(0px, 720px, 23px, 684px);
+}
+
+#fullscreen-button[checked="true"]:hover:active,
+#restore-button:hover:active {
+  -moz-image-region: rect(46px, 720px, 69px, 684px);
+}
 
 /* ----- FULLSCREEN WINDOW CONTROLS ----- */
 
-#window-controls {
+#minimize-button,
-  -moz-box-align: center;
+#close-button,
-  padding: 0;
+#fullscreen-button ~ #window-controls > #restore-button {
-  -moz-padding-start: 4px;
+  display: none;
-  -moz-padding-end: 2px;
-}
-
-#minimize-button {
-  list-style-image: url("chrome://global/skin/icons/minimize.gif");
-}
-#restore-button {
-  list-style-image: url("chrome://global/skin/icons/restore.gif");
-}
-#close-button {
-  list-style-image: url("chrome://global/skin/icons/close.gif");
 }
 
 /* ::::: nav-bar-inner ::::: */

toolkit/themes/pinstripe/global/jar.mn

@@ -82,7 +82,6 @@ toolkit.jar:
 +  skin/classic/global/icons/blacklist_favicon.png                    (icons/blacklist_favicon.png)
 +  skin/classic/global/icons/blacklist_64.png                         (icons/blacklist_64.png)
 +  skin/classic/global/icons/chevron.png                              (icons/chevron.png)
-+  skin/classic/global/icons/close.gif                                (icons/close.gif)
 +  skin/classic/global/icons/checkbox.png                             (icons/checkbox.png)
 +  skin/classic/global/icons/closetab-active.png                      (icons/closetab-active.png)
 +  skin/classic/global/icons/closetab-hover.png                       (icons/closetab-hover.png)
@@ -94,13 +93,11 @@ 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/minimize.gif                             (icons/minimize.gif)
 +  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)
 +  skin/classic/global/icons/question-mark.png                        (icons/question-mark.png)
-+  skin/classic/global/icons/restore.gif                              (icons/restore.gif)
 +  skin/classic/global/icons/search-textbox.png                       (icons/search-textbox.png)
 +  skin/classic/global/icons/searchfield-regular-cancel.png           (icons/searchfield-regular-cancel.png)
 +  skin/classic/global/icons/searchfield-small-cancel.png             (icons/searchfield-small-cancel.png)

toolkit/themes/pinstripe/global/toolbar.css

@@ -52,7 +52,7 @@ toolbox {
 
 toolbar {
   min-width: 1px;
-  min-height: 20px !important;
+  min-height: 20px;
   -moz-appearance: toolbar;
 }
 
@@ -77,7 +77,7 @@ toolbarseparator {
 }
 
 .toolbar-primary {
-	min-height: 24px !important;
+	min-height: 24px;
 }
 
 .toolbar-primary,