Mercurial Mercurial > hg > mozilla / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
firefox-kde.patch
changeset 178 77b00e921973
parent 164 995e803e8198
child 180 3b887a914979
equal deleted inserted replaced
177:99d24e6cabb5 178:77b00e921973 
    21  
    21  
    22 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 
    22 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 
    23 new file mode 100644
 
    23 new file mode 100644
 
    24 --- /dev/null
 
    24 --- /dev/null
 
    25 +++ b/browser/base/content/browser-kde.xul
 
    25 +++ b/browser/base/content/browser-kde.xul
 
    26 @@ -0,0 +1,1094 @@
 
    26 @@ -0,0 +1,1337 @@
 
    27 +#filter substitution
 
    27 +#filter substitution
 
    28 +<?xml version="1.0"?>
 
    28 +<?xml version="1.0"?>
 
    29 +# -*- Mode: HTML -*-
 
    29 +# -*- Mode: HTML -*-
 
    30 +#
 
    30 +#
 
    31 +# ***** BEGIN LICENSE BLOCK *****
 
    31 +# ***** BEGIN LICENSE BLOCK *****
 
    59 +#   Dão Gottwald <dao@mozilla.com>
 
    59 +#   Dão Gottwald <dao@mozilla.com>
 
    60 +#   Ehsan Akhgari <ehsan.akhgari@gmail.com>
 
    60 +#   Ehsan Akhgari <ehsan.akhgari@gmail.com>
 
    61 +#   Robert Strong <robert.bugzilla@gmail.com>
 
    61 +#   Robert Strong <robert.bugzilla@gmail.com>
 
    62 +#   Rob Campbell <rcampbell@mozilla.com>
 
    62 +#   Rob Campbell <rcampbell@mozilla.com>
 
    63 +#   Patrick Walton <pcwalton@mozilla.com>
 
    63 +#   Patrick Walton <pcwalton@mozilla.com>
 
       
    64 +#   David Dahl <ddahl@mozilla.com>
 
    64 +#
 
    65 +#
 
    65 +# Alternatively, the contents of this file may be used under the terms of
 
    66 +# Alternatively, the contents of this file may be used under the terms of
 
    66 +# either the GNU General Public License Version 2 or later (the "GPL"), or
 
    67 +# either the GNU General Public License Version 2 or later (the "GPL"), or
 
    67 +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
 
    68 +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
 
    68 +# in which case the provisions of the GPL or the LGPL are applicable instead
 
    69 +# in which case the provisions of the GPL or the LGPL are applicable instead
 
   126 +#endif
 
   127 +#endif
 
   127 +<script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
 
   128 +<script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
 
   128 +
 
   129 +
 
   129 +<script type="application/javascript" src="chrome://browser/content/places/editBookmarkOverlay.js"/>
 
   130 +<script type="application/javascript" src="chrome://browser/content/places/editBookmarkOverlay.js"/>
 
   130 +
 
   131 +
 
   131 +# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the 
   132 +# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the
 
   132 +# browser-sets.inc file for sharing with hiddenWindow.xul.
 
   133 +# browser-sets.inc file for sharing with hiddenWindow.xul.
 
   133 +#include browser-sets.inc
 
   134 +#include browser-sets.inc
 
   134 +
 
   135 +
 
   135 +  <popupset id="mainPopupSet">
 
   136 +  <popupset id="mainPopupSet">
 
   136 +    <menupopup id="tabContextMenu"
 
   137 +    <menupopup id="tabContextMenu"
 
   140 +                oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/>
 
   141 +                oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/>
 
   141 +      <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;"
 
   142 +      <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;"
 
   142 +                tbattr="tabbrowser-multiple"
 
   143 +                tbattr="tabbrowser-multiple"
 
   143 +                oncommand="gBrowser.reloadAllTabs();"/>
 
   144 +                oncommand="gBrowser.reloadAllTabs();"/>
 
   144 +      <menuseparator/>
 
   145 +      <menuseparator/>
 
   145 +      <menuitem id="context_openTabInWindow" label="&openTabInNewWindow.label;"
 
   146 +      <menuitem id="context_pinTab" label="&pinAppTab.label;"
 
   146 +                accesskey="&openTabInNewWindow.accesskey;"
 
   147 +                accesskey="&pinAppTab.accesskey;"
 
       
   148 +                oncommand="gBrowser.pinTab(TabContextMenu.contextTab);"/>
 
       
   149 +      <menuitem id="context_unpinTab" label="&unpinAppTab.label;" hidden="true"
 
       
   150 +                accesskey="&unpinAppTab.accesskey;"
 
       
   151 +                oncommand="gBrowser.unpinTab(TabContextMenu.contextTab);"/>
 
       
   152 +      <menu id="context_tabViewMenu" label="&moveToGroup.label;"
 
       
   153 +            accesskey="&moveToGroup.accesskey;">
 
       
   154 +        <menupopup id="context_tabViewMenuPopup"
 
       
   155 +                   onpopupshowing="if (event.target == this) TabView.updateContextMenu(TabContextMenu.contextTab, this);">
 
       
   156 +          <menuseparator id="context_tabViewNamedGroups" hidden="true"/>
 
       
   157 +          <menuitem label="&moveToNewGroup.label;"
 
       
   158 +                    oncommand="TabView.moveTabTo(TabContextMenu.contextTab, null);"/>
 
       
   159 +        </menupopup>
 
       
   160 +      </menu>
 
       
   161 +      <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;"
 
       
   162 +                accesskey="&moveToNewWindow.accesskey;"
 
   147 +                tbattr="tabbrowser-multiple"
 
   163 +                tbattr="tabbrowser-multiple"
 
   148 +                oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/>
 
   164 +                oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/>
 
   149 +      <menuitem id="context_pinTab" label="&pinTab.label;"
 
       
   150 +                accesskey="&pinTab.accesskey;"
 
       
   151 +                oncommand="gBrowser.pinTab(TabContextMenu.contextTab);"/>
 
       
   152 +      <menuitem id="context_unpinTab" label="&unpinTab.label;" hidden="true"
 
       
   153 +                accesskey="&unpinTab.accesskey;"
 
       
   154 +                oncommand="gBrowser.unpinTab(TabContextMenu.contextTab);"/>
 
       
   155 +      <menuseparator/>
 
   165 +      <menuseparator/>
 
   156 +      <menuitem id="context_bookmarkTab"
 
       
   157 +                label="&bookmarkThisTab.label;"
 
       
   158 +                accesskey="&bookmarkThisTab.accesskey;"
 
       
   159 +                oncommand="BookmarkThisTab(TabContextMenu.contextTab);"/>
 
       
   160 +      <menuitem id="context_bookmarkAllTabs"
 
   166 +      <menuitem id="context_bookmarkAllTabs"
 
   161 +                label="&bookmarkAllTabs.label;"
 
   167 +                label="&bookmarkAllTabs.label;"
 
   162 +                accesskey="&bookmarkAllTabs.accesskey;"
 
   168 +                accesskey="&bookmarkAllTabs.accesskey;"
 
   163 +                command="Browser:BookmarkAllTabs"/>
 
   169 +                command="Browser:BookmarkAllTabs"/>
 
   164 +      <menuseparator/>
 
   170 +      <menuseparator/>
 
   181 +    <!-- for search and content formfill/pw manager -->
 
   187 +    <!-- for search and content formfill/pw manager -->
 
   182 +    <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/>
 
   188 +    <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/>
 
   183 +
 
   189 +
 
   184 +    <!-- for url bar autocomplete -->
 
   190 +    <!-- for url bar autocomplete -->
 
   185 +    <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
 
   191 +    <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
 
       
   192 +
 
       
   193 +    <!-- for invalid form error message -->
 
       
   194 +    <panel id="invalid-form-popup" noautofocus="true" hidden="true" level="parent"/>
 
   186 +
 
   195 +
 
   187 +    <panel id="editBookmarkPanel"
 
   196 +    <panel id="editBookmarkPanel"
 
   188 +           orient="vertical"
 
   197 +           orient="vertical"
 
   189 +           ignorekeys="true"
 
   198 +           ignorekeys="true"
 
   190 +           hidden="true"
 
   199 +           hidden="true"
 
   216 +          </hbox>
 
   225 +          </hbox>
 
   217 +        </vbox>
 
   226 +        </vbox>
 
   218 +      </row>
 
   227 +      </row>
 
   219 +      <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/>
 
   228 +      <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/>
 
   220 +      <hbox id="editBookmarkPanelBottomButtons" pack="end">
 
   229 +      <hbox id="editBookmarkPanelBottomButtons" pack="end">
 
   221 +#ifndef XP_UNIX
 
   230 +#ifdef XP_UNIX // XP_UNIX != KDE
 
   222 +        <button id="editBookmarkPanelDoneButton"
 
   231 +        <button id="editBookmarkPanelDoneButton"
 
   223 +                class="editBookmarkPanelBottomButton"
 
   232 +                class="editBookmarkPanelBottomButton"
 
   224 +                label="&editBookmark.done.label;"
 
   233 +                label="&editBookmark.done.label;"
 
   225 +                default="true"
 
   234 +                default="true"
 
   226 +                oncommand="StarUI.panel.hidePopup();"/>
 
   235 +                oncommand="StarUI.panel.hidePopup();"/>
 
   227 +        <button id="editBookmarkPanelDeleteButton"
 
   236 +        <button id="editBookmarkPanelDeleteButton"
 
   228 +                class="editBookmarkPanelBottomButton"
 
   237 +                class="editBookmarkPanelBottomButton"
 
   229 +                label="&editBookmark.cancel.label;"
 
   238 +                label="&editBookmark.cancel.label;"
 
   230 +                oncommand="StarUI.cancelButtonOnCommand();"/>
 
   239 +                oncommand="StarUI.cancelButtonOnCommand();"/>
 
   231 +#elif XP_UNIX_GNOME
 
   240 +#else
 
   232 +        <button id="editBookmarkPanelDeleteButton"
 
   241 +        <button id="editBookmarkPanelDeleteButton"
 
   233 +                class="editBookmarkPanelBottomButton"
 
   242 +                class="editBookmarkPanelBottomButton"
 
   234 +                label="&editBookmark.cancel.label;"
 
   243 +                label="&editBookmark.cancel.label;"
 
   235 +                oncommand="StarUI.cancelButtonOnCommand();"/>
 
   244 +                oncommand="StarUI.cancelButtonOnCommand();"/>
 
   236 +        <button id="editBookmarkPanelDoneButton"
 
   245 +        <button id="editBookmarkPanelDoneButton"
 
   237 +                class="editBookmarkPanelBottomButton"
 
   246 +                class="editBookmarkPanelBottomButton"
 
   238 +                label="&editBookmark.done.label;"
 
   247 +                label="&editBookmark.done.label;"
 
   239 +                default="true"
 
   248 +                default="true"
 
   240 +                oncommand="StarUI.panel.hidePopup();"/>
 
   249 +                oncommand="StarUI.panel.hidePopup();"/>
 
   241 +#else
 
       
   242 +        <button id="editBookmarkPanelDoneButton"
 
       
   243 +                class="editBookmarkPanelBottomButton"
 
       
   244 +                label="&editBookmark.done.label;"
 
       
   245 +                default="true"
 
       
   246 +                oncommand="StarUI.panel.hidePopup();"/>
 
       
   247 +        <button id="editBookmarkPanelDeleteButton"
 
       
   248 +                class="editBookmarkPanelBottomButton"
 
       
   249 +                label="&editBookmark.cancel.label;"
 
       
   250 +                oncommand="StarUI.cancelButtonOnCommand();"/>
 
       
   251 +#endif
 
   250 +#endif
 
   252 +      </hbox>
 
   251 +      </hbox>
 
   253 +    </panel>
 
   252 +    </panel>
 
   254 +
 
   253 +
 
   255 +    <panel id="highlighter-panel"
 
   254 +    <panel id="highlighter-panel"
 
   259 +           noautohide="true"
 
   258 +           noautohide="true"
 
   260 +           onclick="InspectorUI.stopInspecting();"
 
   259 +           onclick="InspectorUI.stopInspecting();"
 
   261 +           onmousemove="InspectorUI.highlighter.handleMouseMove(event);"
 
   260 +           onmousemove="InspectorUI.highlighter.handleMouseMove(event);"
 
   262 +           onMozMousePixelScroll="InspectorUI.highlighter.handlePixelScroll(event);"/>
 
   261 +           onMozMousePixelScroll="InspectorUI.highlighter.handlePixelScroll(event);"/>
 
   263 +
 
   262 +
 
   264 +    <panel id="inspector-panel"
 
   263 +    <panel id="inspector-tree-panel"
 
   265 +           orient="vertical"
 
   264 +           orient="vertical"
 
   266 +           hidden="true"
 
   265 +           hidden="true"
 
   267 +           ignorekeys="true"
 
   266 +           ignorekeys="true"
 
   268 +           noautofocus="true"
 
   267 +           noautofocus="true"
 
   269 +           noautohide="true"
 
   268 +           noautohide="true"
 
   270 +           level="top"
 
       
   271 +           titlebar="normal"
 
   269 +           titlebar="normal"
 
       
   270 +           close="true"
 
       
   271 +           onpopuphiding="InspectorUI.closeInspectorUI(true);"
 
   272 +           label="&inspectPanelTitle.label;">
 
   272 +           label="&inspectPanelTitle.label;">
 
   273 +      <toolbar id="inspector-toolbar"
 
   273 +      <toolbar id="inspector-toolbar"
 
   274 +               nowindowdrag="true">
 
   274 +               nowindowdrag="true">
 
   275 +        <toolbarbutton id="inspector-inspect-toolbutton"
 
   275 +        <toolbarbutton id="inspector-inspect-toolbutton"
 
   276 +                       label="&inspectButton.label;"
 
   276 +                       label="&inspectButton.label;"
 
   289 +                       command="Inspector:Next"/>
 
   289 +                       command="Inspector:Next"/>
 
   290 +        <toolbarbutton id="inspector-style-toolbutton"
 
   290 +        <toolbarbutton id="inspector-style-toolbutton"
 
   291 +                       label="&inspectStyleButton.label;"
 
   291 +                       label="&inspectStyleButton.label;"
 
   292 +                       accesskey="&inspectStyleButton.accesskey;"
 
   292 +                       accesskey="&inspectStyleButton.accesskey;"
 
   293 +                       class="toolbarbutton-text"
 
   293 +                       class="toolbarbutton-text"
 
   294 +                       command="Inspector:Style"/>
 
   294 +                       oncommand="InspectorUI.toggleStylePanel();"/>
 
       
   295 +        <toolbarbutton id="inspector-dom-toolbutton"
 
       
   296 +                       label="&inspectObjectButton.label;"
 
       
   297 +                       accesskey="&inspectObjectButton.accesskey;"
 
       
   298 +                       class="toolbarbutton-text"
 
       
   299 +                       oncommand="InspectorUI.toggleDOMPanel();"/>
 
   295 +      </toolbar>
 
   300 +      </toolbar>
 
   296 +      <tree id="inspector-tree" class="plain"
 
   301 +      <hbox id="tree-panel-resizer-box" align="end">
 
   297 +            seltype="single"
 
       
   298 +            treelines="true"
 
       
   299 +            onselect="InspectorUI.onTreeSelected()"
 
       
   300 +            flex="1">
 
       
   301 +        <treecols>
 
       
   302 +          <treecol id="colNodeName" label="nodeName" primary="true"
 
       
   303 +                   persist="width,hidden,ordinal" flex="1"/>
 
       
   304 +          <splitter class="tree-splitter"/>
 
       
   305 +          <treecol id="colNodeValue" label="nodeValue"
 
       
   306 +                   persist="width,hidden,ordinal" flex="1"/>
 
       
   307 +        </treecols>
 
       
   308 +        <treechildren id="inspector-tree-body"/>
 
       
   309 +      </tree>
 
       
   310 +      <hbox align="end">
 
       
   311 +        <spacer flex="1" />
 
   302 +        <spacer flex="1" />
 
   312 +        <resizer dir="bottomend" />
 
   303 +        <resizer dir="bottomend" />
 
   313 +      </hbox>
 
   304 +      </hbox>
 
   314 +    </panel>
 
   305 +    </panel>
 
   315 +
 
   306 +
 
   317 +           hidden="true"
 
   308 +           hidden="true"
 
   318 +           orient="vertical"
 
   309 +           orient="vertical"
 
   319 +           ignorekeys="true"
 
   310 +           ignorekeys="true"
 
   320 +           noautofocus="true"
 
   311 +           noautofocus="true"
 
   321 +           noautohide="true"
 
   312 +           noautohide="true"
 
   322 +           level="top"
 
       
   323 +           titlebar="normal"
 
   313 +           titlebar="normal"
 
   324 +           label="&inspectStylePanelTitle.label;">
 
   314 +           label="&inspectStylePanelTitle.label;">
 
   325 +        <listbox id="inspector-style-listbox" flex="1"/>
 
   315 +        <listbox id="inspector-style-listbox" flex="1"/>
 
   326 +        <hbox align="end">
 
   316 +        <hbox align="end">
 
   327 +          <spacer flex="1" />
 
   317 +          <spacer flex="1" />
 
   328 +          <resizer dir="bottomend" />
 
   318 +          <resizer dir="bottomend"/>
 
   329 +        </hbox>
 
   319 +        </hbox>
 
   330 +    </panel>
 
   320 +    </panel>
 
   331 +
 
   321 +
 
   332 +    <menupopup id="toolbar-context-menu"
 
   322 +    <menupopup id="toolbar-context-menu"
 
   333 +               onpopupshowing="onViewToolbarsPopupShowing(event);">
 
   323 +               onpopupshowing="onViewToolbarsPopupShowing(event);">
 
   450 +                       tooltiptext="&closeCmd.label;"/>
 
   440 +                       tooltiptext="&closeCmd.label;"/>
 
   451 +      </hbox>
 
   441 +      </hbox>
 
   452 +      <stack id="allTabs-stack">
 
   442 +      <stack id="allTabs-stack">
 
   453 +        <vbox id="allTabs-container"><hbox/></vbox>
 
   443 +        <vbox id="allTabs-container"><hbox/></vbox>
 
   454 +        <toolbarbutton id="allTabs-tab-close-button"
 
   444 +        <toolbarbutton id="allTabs-tab-close-button"
 
   455 +                       class="tab-close-button"
 
   445 +                       class="tabs-closebutton"
 
   456 +                       oncommand="allTabs.closeTab(event);"
 
   446 +                       oncommand="allTabs.closeTab(event);"
 
   457 +                       tooltiptext="&closeCmd.label;"
 
   447 +                       tooltiptext="&closeCmd.label;"
 
   458 +                       style="visibility:hidden"/>
 
   448 +                       style="visibility:hidden"/>
 
   459 +      </stack>
 
   449 +      </stack>
 
   460 +    </panel>
 
   450 +    </panel>
 
   471 +
 
   461 +
 
   472 +    <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/>
 
   462 +    <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/>
 
   473 +  </popupset>
 
   463 +  </popupset>
 
   474 +
 
   464 +
 
   475 +#ifdef MENUBAR_CAN_AUTOHIDE
 
   465 +#ifdef MENUBAR_CAN_AUTOHIDE
 
   476 +  <hbox id="appmenu-button-container">
 
   466 +  <vbox id="titlebar">
 
   477 +    <button id="appmenu-button"
 
   467 +  <hbox id="titlebar-content">
 
   478 +            type="menu"
 
   468 +  <hbox id="appmenu-button-container" align="start">
 
   479 +            label="&brandShortName;"
 
   469 +  <button id="appmenu-button"
 
   480 +            style="-moz-user-focus: ignore;">
 
   470 +          type="menu"
 
   481 +      <menupopup id="appmenu-popup">
 
   471 +#ifdef XP_WIN
 
   482 +        <hbox flex="1" class="split-menuitem">
 
   472 +          label="&brandShortName;"
 
   483 +          <menuitem id="appmenu_newTab"
 
   473 +#else
 
   484 +                    class="split-menuitem-item"
 
   474 +          label="&appMenuButton.label;"
 
   485 +                    flex="1"
 
   475 +#endif
 
   486 +                    label="&tabCmd.label;"
 
   476 +          style="-moz-user-focus: ignore;">
 
   487 +                    command="cmd_newNavigatorTab"/>
 
   477 +    <menupopup id="appmenu-popup"
 
   488 +          <menu class="split-menuitem-menu">
 
   478 +#ifdef MOZ_SERVICES_SYNC
 
   489 +            <menupopup>
 
   479 +               onpopupshowing="updateEditUIVisibility();gSyncUI.updateUI();">
 
   490 +              <menuitem id="appmenu_newTab_sub"
 
   480 +#else
 
   491 +                        label="&tabCmd.label;"
 
   481 +               onpopupshowing="updateEditUIVisibility();">
 
   492 +                        command="cmd_newNavigatorTab"/>
 
   482 +#endif
 
   493 +              <menuitem id="appmenu_newNavigator"
 
   483 +      <hbox>
 
   494 +                        label="&newNavigatorCmd.label;"
 
   484 +        <vbox id="appmenuPrimaryPane">
 
   495 +                        command="cmd_newNavigator"/>
 
   485 +          <hbox flex="1"
 
       
   486 +                class="split-menuitem">
 
       
   487 +            <menuitem id="appmenu_newTab"
 
       
   488 +                      class="menuitem-tooltip split-menuitem-item"
 
       
   489 +                      flex="1"
 
       
   490 +                      label="&tabCmd.label;"
 
       
   491 +                      command="cmd_newNavigatorTab"
 
       
   492 +                      key="key_newNavigatorTab"/>
 
       
   493 +              <menu class="split-menuitem-menu">
 
       
   494 +                <menupopup>
 
       
   495 +                  <menuitem id="appmenu_newTab_popup"
 
       
   496 +                            label="&tabCmd.label;"
 
       
   497 +                            command="cmd_newNavigatorTab"
 
       
   498 +                            key="key_newNavigatorTab"/>
 
       
   499 +                  <menuitem id="appmenu_newNavigator"
 
       
   500 +                            label="&newNavigatorCmd.label;"
 
       
   501 +                            command="cmd_newNavigator"
 
       
   502 +                            key="key_newNavigator"/>
 
       
   503 +                  <menuseparator/>
 
       
   504 +                  <menuitem id="appmenu_openFile"
 
       
   505 +                            label="&openFileCmd.label;"
 
       
   506 +                            command="Browser:OpenFile"
 
       
   507 +                            key="openFileKb"/>
 
       
   508 +                </menupopup>
 
       
   509 +               </menu>
 
       
   510 +          </hbox>
 
       
   511 +          <menuitem id="appmenu_privateBrowsing"
 
       
   512 +                    class="menuitem-iconic menuitem-iconic-tooltip"
 
       
   513 +                    label="&privateBrowsingCmd.start.label;"
 
       
   514 +                    startlabel="&privateBrowsingCmd.start.label;"
 
       
   515 +                    stoplabel="&privateBrowsingCmd.stop.label;"
 
       
   516 +                    command="Tools:PrivateBrowsing"
 
       
   517 +                    key="key_privatebrowsing"/>
 
       
   518 +          <menuitem label="&goOfflineCmd.label;"
 
       
   519 +                    id="appmenu_offlineModeRecovery"
 
       
   520 +                    type="checkbox"
 
       
   521 +                    observes="workOfflineMenuitemState"
 
       
   522 +                    oncommand="BrowserOffline.toggleOfflineStatus();"/>
 
       
   523 +          <menuseparator class="appmenu-menuseparator"/>
 
       
   524 +          <hbox>
 
       
   525 +            <menuitem id="appmenu-edit-label"
 
       
   526 +                      label="&appMenuEdit.label;"
 
       
   527 +                      disabled="true"/>
 
       
   528 +            <toolbarbutton id="appmenu-cut"
 
       
   529 +                           class="appmenu-edit-button"
 
       
   530 +                           command="cmd_cut"
 
       
   531 +                           onclick="if (!this.disabled) hidePopup();"
 
       
   532 +                           tooltiptext="&cutButton.tooltip;"/>
 
       
   533 +            <toolbarbutton id="appmenu-copy"
 
       
   534 +                           class="appmenu-edit-button"
 
       
   535 +                           command="cmd_copy"
 
       
   536 +                           onclick="if (!this.disabled) hidePopup();"
 
       
   537 +                           tooltiptext="&copyButton.tooltip;"/>
 
       
   538 +            <toolbarbutton id="appmenu-paste"
 
       
   539 +                           class="appmenu-edit-button"
 
       
   540 +                           command="cmd_paste"
 
       
   541 +                           onclick="if (!this.disabled) hidePopup();"
 
       
   542 +                           tooltiptext="&pasteButton.tooltip;"/>
 
       
   543 +          </hbox>
 
       
   544 +          <menuitem id="appmenu_find"
 
       
   545 +                    class="menuitem-tooltip"
 
       
   546 +                    label="&appMenuFind.label;"
 
       
   547 +                    command="cmd_find"
 
       
   548 +                    key="key_find"/>
 
       
   549 +          <menuseparator class="appmenu-menuseparator"/>
 
       
   550 +          <menuitem id="appmenu_savePage"
 
       
   551 +                    class="menuitem-tooltip"
 
       
   552 +                    label="&savePageCmd.label;"
 
       
   553 +                    command="Browser:SavePage"
 
       
   554 +                    key="key_savePage"/>
 
       
   555 +          <menuitem id="appmenu_sendLink"
 
       
   556 +                    label="&sendPageCmd.label;"
 
       
   557 +                    command="Browser:SendLink"/>
 
       
   558 +          <hbox flex="1"
 
       
   559 +                class="split-menuitem">
 
       
   560 +            <menuitem id="appmenu_print"
 
       
   561 +                      class="menuitem-iconic menuitem-iconic-tooltip split-menuitem-item"
 
       
   562 +                      flex="1"
 
       
   563 +                      label="&printCmd.label;"
 
       
   564 +                      command="cmd_print"
 
       
   565 +                      key="printKb"/>
 
       
   566 +            <menu class="split-menuitem-menu">
 
       
   567 +              <menupopup>
 
       
   568 +                <menuitem id="appmenu_print_popup"
 
       
   569 +                          class="menuitem-iconic"
 
       
   570 +                          label="&printCmd.label;"
 
       
   571 +                          command="cmd_print"
 
       
   572 +                          key="printKb"/>
 
       
   573 +                <menuitem id="appmenu_printPreview"
 
       
   574 +                          label="&printPreviewCmd.label;"
 
       
   575 +                          command="cmd_printPreview"/>
 
       
   576 +                <menuitem id="appmenu_printSetup"
 
       
   577 +                          label="&printSetupCmd.label;"
 
       
   578 +                          command="cmd_pageSetup"/>
 
       
   579 +              </menupopup>
 
       
   580 +            </menu>
 
       
   581 +          </hbox>
 
       
   582 +          <menuseparator class="appmenu-menuseparator"/>
 
       
   583 +          <menu id="appmenu_webDeveloper"
 
       
   584 +                label="&appMenuWebDeveloper.label;">
 
       
   585 +            <menupopup id="appmenu_webDeveloper_popup">
 
       
   586 +              <menuitem id="appmenu_webConsole"
 
       
   587 +                        label="&webConsoleCmd.label;"
 
       
   588 +                        type="checkbox"
 
       
   589 +                        oncommand="HUDConsoleUI.toggleHUD();"
 
       
   590 +                        key="key_webConsole"/>
 
       
   591 +              <menuitem id="appmenu_pageInspect"
 
       
   592 +                        hidden="true"
 
       
   593 +                        label="&inspectMenu.label;"
 
       
   594 +                        type="checkbox"
 
       
   595 +                        command="Tools:Inspect"
 
       
   596 +                        key="key_inspect"/>
 
       
   597 +              <menuseparator/>
 
       
   598 +              <menuitem id="appmenu_pageSource"
 
       
   599 +                        label="&viewPageSourceCmd.label;"
 
       
   600 +                        command="View:PageSource"
 
       
   601 +                        key="key_viewSource"/>
 
       
   602 +              <menuseparator/>
 
       
   603 +#define ID_PREFIX appmenu_developer_
 
       
   604 +#include browser-charsetmenu.inc
 
       
   605 +#undef ID_PREFIX
 
       
   606 +              <menuseparator/>
 
       
   607 +              <menuitem label="&goOfflineCmd.label;"
 
       
   608 +                        type="checkbox"
 
       
   609 +                        observes="workOfflineMenuitemState"
 
       
   610 +                        oncommand="BrowserOffline.toggleOfflineStatus();"/>
 
   496 +            </menupopup>
 
   611 +            </menupopup>
 
   497 +          </menu>
 
   612 +          </menu>
 
   498 +        </hbox>
 
   613 +          <menuseparator class="appmenu-menuseparator"/>
 
   499 +        <menuseparator/>
 
   614 +#define ID_PREFIX appmenu_
 
   500 +        <menuitem id="appmenu_savePage"
 
   615 +#include browser-charsetmenu.inc
 
   501 +                  label="&savePageCmd.label;"
 
   616 +#undef ID_PREFIX
 
   502 +                  command="Browser:SavePage"/>
 
   617 +          <menuitem id="appmenu_fullScreen"
 
   503 +        <menuitem id="appmenu_sendLink"
 
   618 +                    class="menuitem-tooltip"
 
   504 +                  label="&sendPageCmd.label;"
 
   619 +                    label="&fullScreenCmd.label;"
 
   505 +                  command="Browser:SendLink"/>
 
   620 +                    type="checkbox"
 
   506 +        <hbox flex="1" class="split-menuitem">
 
   621 +                    observes="View:FullScreen"
 
   507 +          <menuitem id="appmenu_print"
 
   622 +                    key="key_fullScreen"/>
 
   508 +                    class="split-menuitem-item"
 
   623 +          <menuitem id="appmenu-quit"
 
   509 +                    flex="1"
 
   624 +                    class="menuitem-iconic"
 
   510 +                    label="&appMenuPrintCmd.label;"
 
   625 +#ifdef XP_WIN
 
   511 +                    command="cmd_print"/>
 
   626 +                    label="&quitApplicationCmdWin.label;"
 
   512 +          <menu class="split-menuitem-menu">
 
   627 +#else
 
   513 +            <menupopup>
 
   628 +                    label="&quitApplicationCmd.label;"
 
   514 +              <menuitem id="menu_printSetup"
 
   629 +#endif
 
   515 +                        label="&printSetupCmd.label;"
 
   630 +                    command="cmd_quitApplication"/>
 
   516 +                        command="cmd_pageSetup"/>
 
   631 +        </vbox>
 
   517 +              <menuitem id="menu_printPreview"
 
   632 +        <vbox id="appmenuSecondaryPane">
 
   518 +                        label="&printPreviewCmd.label;"
 
   633 +          <hbox class="split-menuitem">
 
   519 +                        command="cmd_printPreview"/>
 
   634 +            <menuitem id="appmenu_bookmarks"
 
   520 +            </menupopup>
 
   635 +                      class="menuitem-iconic menuitem-iconic-tooltip split-menuitem-item"
 
   521 +          </menu>
 
   636 +                      flex="1"
 
   522 +        </hbox>
 
   637 +                      label="&bookmarksMenu.label;"
 
   523 +        <menuitem id="appmenu_find"
 
   638 +                      command="Browser:ShowAllBookmarks"
 
   524 +                  label="&findOnCmd.label;"
 
   639 +                      key="manBookmarkKb"/>
 
   525 +                  command="cmd_find"/>
 
   640 +            <menu id="appmenu_bookmarksMenu"
 
   526 +        <menuseparator/>
 
   641 +                  class="split-menuitem-menu">
 
   527 +        <menu id="appmenu_history"
 
   642 +              <menupopup id="appmenu_bookmarksPopup"
 
   528 +              label="&historyMenu.label;">
 
   643 +                         placespopup="true"
 
   529 +          <menupopup id="appmenu_history_popup"
 
   644 +                         context="placesContext"
 
   530 +                     placespopup="true"
 
   645 +                         openInTabs="children"
 
   531 +                     oncommand="this.parentNode._placesView._onCommand(event);"
 
   646 +                         oncommand="BookmarksEventHandler.onCommand(event);"
 
   532 +                     onclick="checkForMiddleClick(this, event);"
 
   647 +                         onclick="BookmarksEventHandler.onClick(event);"
 
   533 +                     onpopupshowing="if (!this.parentNode._placesView)
 
   648 +                         onpopupshowing="BookmarksMenuButton.onPopupShowing(event);
 
   534 +                                       new HistoryMenu(event);"
 
   649 +                                         if (!this.parentNode._placesView)
 
   535 +                     tooltip="bhTooltip"
 
   650 +                                           new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');"
 
   536 +                     popupsinherittooltip="true">
 
   651 +                         tooltip="bhTooltip"
 
   537 +            <menuitem id="appmenu_sanitizeHistory"
 
   652 +                         popupsinherittooltip="true">
 
   538 +                      label="&clearRecentHistory.label;"
 
   653 +                <menuitem id="appmenu_showAllBookmarks"
 
   539 +                      key="key_sanitize"
 
   654 +                          label="&showAllBookmarks.label;"
 
   540 +                      command="Tools:Sanitize"/>
 
   655 +                          command="Browser:ShowAllBookmarks"
 
   541 +            <menuseparator/>
 
   656 +                          context=""
 
   542 +            <menuitem id="appmenu_showAllHistory"
 
   657 +                          key="manBookmarkKb"/>
 
   543 +                      label="&showAllHistoryCmd2.label;"
 
   658 +                <menuseparator/>
 
   544 +                      key="showAllHistoryKb"
 
   659 +                <menuitem id="appmenu_bookmarkThisPage"
 
   545 +                      command="Browser:ShowAllHistory"/>
 
   660 +                          class="menuitem-iconic"
 
   546 +            <menuseparator class="hide-if-empty-places-result"/>
 
   661 +                          label="&bookmarkThisPageCmd.label;"
 
   547 +          </menupopup>
 
   662 +                          command="Browser:AddBookmarkAs"
 
   548 +        </menu>
 
   663 +                          key="addBookmarkAsKb"/>
 
   549 +        <menuseparator/>
 
   664 +                <menuitem id="appmenu_subscribeToPage"
 
   550 +        <menu id="appmenu_developer"
 
   665 +                          class="menuitem-iconic"
 
   551 +              label="&developerMenu.label;">
 
   666 +                          label="&subscribeToPageMenuitem.label;"
 
   552 +          <menupopup id="appmenu_developer_popup">
 
   667 +                          oncommand="return FeedHandler.subscribeToFeed(null, event);"
 
   553 +            <menuitem id="appmenu_pageSource"
 
   668 +                          onclick="checkForMiddleClick(this, event);"
 
   554 +                      label="&pageSourceCmd.label;"
 
   669 +                          observes="singleFeedMenuitemState"/>
 
   555 +                      command="View:PageSource"/>
 
   670 +                <menu id="appmenu_subscribeToPageMenu"
 
   556 +            <menuseparator/>
 
   671 +                      class="menu-iconic"
 
   557 +            <menuitem id="appmenu_pageInspect"
 
   672 +                      label="&subscribeToPageMenupopup.label;"
 
   558 +                      label="&inspectMenu.label;"
 
   673 +                      observes="multipleFeedsMenuState">
 
   559 +                      command="Tools:Inspect"/>
 
   674 +                  <menupopup id="appmenu_subscribeToPageMenupopup"
 
   560 +            <menuitem id="appmenu_webConsole"
 
   675 +                             onpopupshowing="return FeedHandler.buildFeedList(event.target);"
 
   561 +                      label="&webConsoleCmd.label;"
 
   676 +                             oncommand="return FeedHandler.subscribeToFeed(null, event);"
 
   562 +                      oncommand="HUDConsoleUI.toggleHUD();"/>
 
   677 +                             onclick="checkForMiddleClick(this, event);"/>
 
   563 +          </menupopup>
 
   678 +                </menu>
 
   564 +        </menu>
 
   679 +                <menuseparator/>
 
   565 +        <menuseparator/>
 
   680 +                <menu id="appmenu_bookmarksToolbar"
 
   566 +        <menu id="appmenu_customize"
 
   681 +                      placesanonid="toolbar-autohide"
 
   567 +              label="&appMenuCustomize.label;">
 
   682 +                      class="menu-iconic bookmark-item"
 
   568 +          <menupopup id="appmenu_customizeMenu"
 
   683 +                      label="&personalbarCmd.label;"
 
   569 +                     onpopupshowing="onViewToolbarsPopupShowing(event);">
 
   684 +                      container="true">
 
   570 +            <menuseparator/>
 
   685 +                  <menupopup id="appmenu_bookmarksToolbarPopup"
 
   571 +            <menuitem command="cmd_ToggleTabsOnTop"
 
   686 +                             placespopup="true"
 
   572 +                      type="checkbox"
 
   687 +                             context="placesContext"
 
   573 +                      label="&viewTabsOnTop.label;"/>
 
   688 +                             onpopupshowing="if (!this.parentNode._placesView)
 
   574 +            <menuitem id="appmenu_toolbarLayout"
 
   689 +                                               new PlacesMenu(event, 'place:folder=TOOLBAR');"/>
 
   575 +                      label="&appMenuToolbarLayout.label;"
 
   690 +                </menu>
 
   576 +                      command="cmd_CustomizeToolbars"/>
 
   691 +                <menuseparator/>
 
   577 +            <menu id="appmenu_sidebars"
 
   692 +                <!-- Bookmarks menu items -->
 
   578 +                  label="&appMenuSidebars.label;">
 
   693 +                <menuseparator builder="end"
 
   579 +              <menupopup id="appmenu_sidebarMenu">
 
   694 +                               class="hide-if-empty-places-result"/>
 
   580 +                <menuitem id="appmenu_bookmarksSidebar"
 
   695 +                <menuitem id="appmenu_unsortedBookmarks"
 
   581 +                          key="viewBookmarksSidebarKb"
 
   696 +                          label="&appMenuUnsorted.label;"
 
   582 +                          observes="viewBookmarksSidebar"/>
 
   697 +                          oncommand="PlacesCommandHook.showPlacesOrganizer('UnfiledBookmarks');"
 
   583 +                <menuitem id="appmenu_historySidebar"
 
   698 +                          class="menuitem-iconic"/>
 
   584 +                          key="key_gotoHistory"
 
       
   585 +                          observes="viewHistorySidebar"
 
       
   586 +                          label="&historyButton.label;"/>
 
       
   587 +              </menupopup>
 
   699 +              </menupopup>
 
   588 +            </menu>
 
   700 +            </menu>
 
   589 +            <menuseparator/>
 
   701 +          </hbox>
 
   590 +            <menuitem id="appmenu_openAddons"
 
   702 +          <hbox class="split-menuitem">
 
       
   703 +            <menuitem id="appmenu_history"
 
       
   704 +                      class="menuitem-iconic menuitem-iconic-tooltip split-menuitem-item"
 
       
   705 +                      flex="1"
 
       
   706 +                      label="&historyMenu.label;"
 
       
   707 +                      command="Browser:ShowAllHistory"
 
       
   708 +                      key="showAllHistoryKb"/>
 
       
   709 +            <menu id="appmenu_historyMenu"
 
       
   710 +                  class="split-menuitem-menu">
 
       
   711 +              <menupopup id="appmenu_historyMenupopup"
 
       
   712 +                         placespopup="true"
 
       
   713 +                         oncommand="this.parentNode._placesView._onCommand(event);"
 
       
   714 +                         onclick="checkForMiddleClick(this, event);"
 
       
   715 +                         onpopupshowing="if (!this.parentNode._placesView)
 
       
   716 +                                           new HistoryMenu(event);"
 
       
   717 +                         tooltip="bhTooltip"
 
       
   718 +                         popupsinherittooltip="true">
 
       
   719 +                <menuitem id="appmenu_showAllHistory"
 
       
   720 +                          label="&showAllHistoryCmd2.label;"
 
       
   721 +                          command="Browser:ShowAllHistory"
 
       
   722 +                          key="showAllHistoryKb"/>
 
       
   723 +                <menuseparator/>
 
       
   724 +                <menuitem id="appmenu_sanitizeHistory"
 
       
   725 +                          label="&clearRecentHistory.label;"
 
       
   726 +                          key="key_sanitize"
 
       
   727 +                          command="Tools:Sanitize"/>
 
       
   728 +                <menuseparator class="hide-if-empty-places-result"/>
 
       
   729 +                <menuitem id="appmenu_restoreLastSession"
 
       
   730 +                          class="restoreLastSession"
 
       
   731 +                          label="&historyRestoreLastSession.label;"
 
       
   732 +                          oncommand="restoreLastSession();"
 
       
   733 +                          disabled="true"/>
 
       
   734 +                <menu id="appmenu_recentlyClosedTabsMenu"
 
       
   735 +                      class="recentlyClosedTabsMenu"
 
       
   736 +                      label="&historyUndoMenu.label;"
 
       
   737 +                      disabled="true">
 
       
   738 +                  <menupopup id="appmenu_recentlyClosedTabsMenupopup"
 
       
   739 +                             onpopupshowing="document.getElementById('appmenu_historyMenu')._placesView.populateUndoSubmenu();"/>
 
       
   740 +                </menu>
 
       
   741 +                <menu id="appmenu_recentlyClosedWindowsMenu"
 
       
   742 +                      class="recentlyClosedWindowsMenu"
 
       
   743 +                      label="&historyUndoWindowMenu.label;"
 
       
   744 +                      disabled="true">
 
       
   745 +                  <menupopup id="appmenu_recentlyClosedWindowsMenupopup"
 
       
   746 +                             onpopupshowing="document.getElementById('appmenu_historyMenu')._placesView.populateUndoWindowSubmenu();"/>
 
       
   747 +                </menu>
 
       
   748 +                <menuseparator/>
 
       
   749 +              </menupopup>
 
       
   750 +            </menu>
 
       
   751 +          </hbox>
 
       
   752 +            <menuitem id="appmenu_downloads"
 
       
   753 +                      class="menuitem-tooltip"
 
       
   754 +                      label="&downloads.label;"
 
       
   755 +                      command="Tools:Downloads"
 
       
   756 +                      key="key_openDownloads"/>
 
       
   757 +            <spacer id="appmenuSecondaryPane-spacer"/>
 
       
   758 +            <menuitem id="appmenu_addons"
 
       
   759 +                      class="menuitem-iconic menuitem-iconic-tooltip"
 
   591 +                      label="&addons.label;"
 
   760 +                      label="&addons.label;"
 
   592 +                      command="Tools:Addons"/>
 
   761 +                      command="Tools:Addons"
 
   593 +          </menupopup>
 
   762 +                      key="key_openAddons"/>
 
   594 +        </menu>
 
   763 +            <hbox class="split-menuitem">
 
   595 +        <menuitem id="appmenu_preferences"
 
   764 +              <menuitem id="appmenu_customize"
 
       
   765 +                        label="&preferencesCmd.label;"
 
       
   766 +                        class="split-menuitem-item"
 
       
   767 +                        flex="1"
 
       
   768 +                        oncommand="openPreferences();"/>
 
       
   769 +              <menu class="split-menuitem-menu"
 
       
   770 +                    label="&preferencesCmd.label;">
 
       
   771 +                <menupopup id="appmenu_customizeMenu"
 
       
   772 +                           onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('appmenu_toggleTabsOnTop').previousSibling);">
 
       
   773 +                  <menuitem id="appmenu_preferences"
 
   596 +#ifdef XP_UNIX
 
   774 +#ifdef XP_UNIX
 
   597 +                  label="&preferencesCmdUnix.label;"
 
   775 +                            label="&preferencesCmdUnix.label;"
 
   598 +#else
 
   776 +#else
 
   599 +                  label="&preferencesCmd.label;"
 
   777 +                            label="&preferencesCmd.label;"
 
   600 +#endif
 
   778 +#endif
 
   601 +                  oncommand="openPreferences();"/>
 
   779 +                            oncommand="openPreferences();"/>
 
   602 +        <menuitem id="appmenu_openHelp"
 
   780 +                  <menuseparator/>
 
   603 +                  label="&appMenuHelp.label;"
 
   781 +                  <menuseparator/>
 
   604 +                  oncommand="openHelpLink('firefox-help')"
 
   782 +                  <menuitem id="appmenu_toggleTabsOnTop"
 
   605 +                  onclick="checkForMiddleClick(this, event);"/>
 
   783 +                            label="&viewTabsOnTop.label;"
 
   606 +        <menuseparator/>
 
   784 +                            type="checkbox"
 
   607 +        <menuitem id="appmenu_quit"
 
   785 +                            command="cmd_ToggleTabsOnTop"/>
 
   608 +#ifdef XP_WIN
 
   786 +                  <menuitem id="appmenu_toolbarLayout"
 
   609 +                  label="&quitApplicationCmdWin.label;"
 
   787 +                            label="&appMenuToolbarLayout.label;"
 
   610 +#else
 
   788 +                            command="cmd_CustomizeToolbars"/>
 
   611 +                  label="&quitApplicationCmd.label;"
 
   789 +                </menupopup>
 
       
   790 +              </menu>
 
       
   791 +            </hbox>
 
       
   792 +            <hbox class="split-menuitem">
 
       
   793 +              <menuitem id="appmenu_help"
 
       
   794 +                        class="split-menuitem-item"
 
       
   795 +                        flex="1"
 
       
   796 +                        label="&helpMenu.label;"
 
       
   797 +                        oncommand="openHelpLink('firefox-help')"/>
 
       
   798 +              <menu class="split-menuitem-menu">
 
       
   799 +                <menupopup id="appmenu_helpMenupopup">
 
       
   800 +                  <menuitem id="appmenu_openHelp"
 
       
   801 +                            label="&helpMenu.label;"
 
       
   802 +                            oncommand="openHelpLink('firefox-help')"
 
       
   803 +                            onclick="checkForMiddleClick(this, event);"/>
 
       
   804 +                  <menuitem id="appmenu_gettingStarted"
 
       
   805 +                            label="&appMenuGettingStarted.label;"
 
       
   806 +                            oncommand="gBrowser.loadOneTab('http://www.mozilla.com/firefox/central/', {inBackground: false});"
 
       
   807 +                            onclick="checkForMiddleClick(this, event);"/>
 
       
   808 +                  <menuitem id="appmenu_troubleshootingInfo"
 
       
   809 +                            label="&helpTroubleshootingInfo.label;"
 
       
   810 +                            oncommand="openTroubleshootingPage()"
 
       
   811 +                            onclick="checkForMiddleClick(this,event);"/>
 
       
   812 +                  <menuseparator/>
 
       
   813 +                  <menuitem id="appmenu_safeMode"
 
       
   814 +                            accesskey="&appMenuSafeMode.accesskey;"
 
       
   815 +                            label="&appMenuSafeMode.label;"
 
       
   816 +                            oncommand="safeModeRestart();"/>
 
       
   817 +                  <menuseparator/>
 
       
   818 +                  <menuitem id="appmenu_about"
 
       
   819 +                            label="&aboutProduct.label;"
 
       
   820 +                            oncommand="openAboutDialog();"/>
 
       
   821 +                </menupopup>
 
       
   822 +              </menu>
 
       
   823 +            </hbox>
 
       
   824 +#ifdef MOZ_SERVICES_SYNC
 
       
   825 +            <spacer flex="1"/>
 
       
   826 +            <!-- only one of sync-setup or sync-syncnow will be showing at once -->
 
       
   827 +            <menuitem id="sync-setup-appmenu"
 
       
   828 +                      label="&syncSetup.label;"
 
       
   829 +                      observes="sync-setup-state"
 
       
   830 +                      oncommand="gSyncUI.openSetup()"/>
 
       
   831 +            <menuitem id="sync-syncnowitem-appmenu"
 
       
   832 +                      label="&syncSyncNowItem.label;"
 
       
   833 +                      observes="sync-syncnow-state"
 
       
   834 +                      oncommand="gSyncUI.doSync(event);"/>
 
   612 +#endif
 
   835 +#endif
 
   613 +                  command="cmd_quitApplication"/>
 
   836 +        </vbox>
 
   614 +      </menupopup>
 
   837 +      </hbox>
 
   615 +    </button>
 
   838 +    </menupopup>
 
       
   839 +  </button>
 
   616 +  </hbox>
 
   840 +  </hbox>
 
       
   841 +  <spacer id="titlebar-spacer" flex="1"/>
 
       
   842 +  <hbox id="titlebar-buttonbox">
 
       
   843 +    <toolbarbutton id="titlebar-min" oncommand="window.minimize();"/>
 
       
   844 +    <toolbarbutton id="titlebar-max" oncommand="onTitlebarMaxClick();"/>
 
       
   845 +    <toolbarbutton id="titlebar-close" command="cmd_closeWindow"/>
 
       
   846 +  </hbox>
 
       
   847 +  </hbox>
 
       
   848 +  </vbox>
 
   617 +#endif
 
   849 +#endif
 
       
   850 +
 
       
   851 +<deck flex="1" id="tab-view-deck">
 
       
   852 +<vbox flex="1">
 
   618 +
 
   853 +
 
   619 +  <toolbox id="navigator-toolbox"
 
   854 +  <toolbox id="navigator-toolbox"
 
   620 +           defaultmode="icons" mode="icons"
 
   855 +           defaultmode="icons" mode="icons"
 
   621 +#ifdef WINCE
 
   856 +#ifdef WINCE
 
   622 +           defaulticonsize="small" iconsize="small"
 
   857 +           defaulticonsize="small" iconsize="small"
 
   648 +    <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
 
   883 +    <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
 
   649 +             toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
 
   884 +             toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
 
   650 +             fullscreentoolbar="true" mode="icons" customizable="true"
 
   885 +             fullscreentoolbar="true" mode="icons" customizable="true"
 
   651 +#ifdef WINCE
 
   886 +#ifdef WINCE
 
   652 +             iconsize="small" defaulticonsize="small"
 
   887 +             iconsize="small" defaulticonsize="small"
 
   653 +             defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,search-container,bookmarks-menu-button-container,navigator-throbber,fullscreenflex,window-controls"
 
   888 +             defaultset="unified-back-forward-button,home-button,urlbar-container,reload-button,stop-button,search-container,bookmarks-menu-button-container,navigator-throbber,fullscreenflex,window-controls"
 
   654 +#else
 
   889 +#else
 
   655 +             iconsize="large"
 
   890 +             iconsize="large"
 
   656 +             defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,search-container,bookmarks-menu-button-container,fullscreenflex,window-controls"
 
   891 +             defaultset="unified-back-forward-button,home-button,urlbar-container,reload-button,stop-button,search-container,bookmarks-menu-button-container,fullscreenflex,window-controls"
 
   657 +#endif
 
   892 +#endif
 
   658 +             context="toolbar-context-menu">
 
   893 +             context="toolbar-context-menu">
 
   659 +
 
   894 +
 
   660 +      <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
 
   895 +      <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
 
   661 +                   context="backForwardMenu" removable="true"
 
   896 +                   context="backForwardMenu" removable="true"
 
   685 +          <observes element="Browser:Back" attribute="disabled"/>
 
   920 +          <observes element="Browser:Back" attribute="disabled"/>
 
   686 +          <observes element="Browser:Forward" attribute="disabled"/>
 
   921 +          <observes element="Browser:Forward" attribute="disabled"/>
 
   687 +        </toolbarbutton>
 
   922 +        </toolbarbutton>
 
   688 +      </toolbaritem>
 
   923 +      </toolbaritem>
 
   689 +
 
   924 +
 
   690 +      <toolbarbutton id="reload-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
 
       
   691 +                     label="&reloadCmd.label;" removable="true"
 
       
   692 +                     command="Browser:ReloadOrDuplicate"
 
       
   693 +                     onclick="checkForMiddleClick(this, event);"
 
       
   694 +                     tooltiptext="&reloadButton.tooltip;"/>
 
       
   695 +
 
       
   696 +      <toolbarbutton id="stop-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
 
       
   697 +                     label="&stopCmd.label;" removable="true"
 
       
   698 +                     command="Browser:Stop"
 
       
   699 +                     tooltiptext="&stopButton.tooltip;"/>
 
       
   700 +
 
       
   701 +      <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
 
   925 +      <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
 
   702 +                     persist="class" removable="true"
 
   926 +                     persist="class" removable="true"
 
   703 +                     label="&homeButton.label;"
 
   927 +                     label="&homeButton.label;"
 
   704 +                     ondragover="homeButtonObserver.onDragOver(event)"
 
   928 +                     ondragover="homeButtonObserver.onDragOver(event)"
 
   705 +                     ondragenter="homeButtonObserver.onDragOver(event)"
 
   929 +                     ondragenter="homeButtonObserver.onDragOver(event)"
 
   706 +                     ondrop="homeButtonObserver.onDrop(event)"
 
   930 +                     ondrop="homeButtonObserver.onDrop(event)"
 
   707 +                     ondragleave="homeButtonObserver.onDragLeave(event)"
 
   931 +                     ondragleave="homeButtonObserver.onDragLeave(event)"
 
   708 +                     onclick="BrowserGoHome(event);"/>
 
   932 +                     onclick="BrowserGoHome(event);"
 
   709 +
 
   933 +                     aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
 
   710 +      <toolbaritem id="urlbar-container" align="center" flex="400" persist="width"
 
   934 +
 
       
   935 +      <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true"
 
   711 +                   title="&locationItem.title;" class="chromeclass-location" removable="true">
 
   936 +                   title="&locationItem.title;" class="chromeclass-location" removable="true">
 
   712 +        <textbox id="urlbar" flex="1"
 
   937 +        <textbox id="urlbar" flex="1"
 
   713 +                 placeholder="&urlbar.placeholder;"
 
   938 +                 placeholder="&urlbar.placeholder;"
 
   714 +                 type="autocomplete"
 
   939 +                 type="autocomplete"
 
   715 +                 autocompletesearch="history"
 
   940 +                 autocompletesearch="history"
 
   731 +                 onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
 
   956 +                 onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
 
   732 +                 onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
 
   957 +                 onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
 
   733 +          <box id="notification-popup-box" hidden="true" align="center">
 
   958 +          <box id="notification-popup-box" hidden="true" align="center">
 
   734 +            <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
 
   959 +            <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
 
   735 +            <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
 
   960 +            <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
 
       
   961 +            <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
 
       
   962 +            <image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
 
   736 +          </box>
 
   963 +          </box>
 
   737 +          <!-- Use onclick instead of normal popup= syntax since the popup
 
   964 +          <!-- Use onclick instead of normal popup= syntax since the popup
 
   738 +               code fires onmousedown, and hence eats our favicon drag events.
 
   965 +               code fires onmousedown, and hence eats our favicon drag events.
 
   739 +               We only add the identity-box button to the tab order when the location bar
 
   966 +               We only add the identity-box button to the tab order when the location bar
 
   740 +               has focus, otherwise pressing F6 focuses it instead of the location bar -->
 
   967 +               has focus, otherwise pressing F6 focuses it instead of the location bar -->
 
   741 +          <box id="identity-box" role="button"
 
   968 +          <box id="identity-box" role="button"
 
   742 +               onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
 
   969 +               onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
 
   743 +               onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);">
 
   970 +               onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
 
       
   971 +               ondragstart="gIdentityHandler.onDragStart(event);">
 
   744 +            <hbox id="identity-box-inner" align="center">
 
   972 +            <hbox id="identity-box-inner" align="center">
 
   745 +              <stack id="page-proxy-stack"
 
   973 +              <stack id="page-proxy-stack"
 
   746 +                     onclick="PageProxyClickHandler(event);">
 
   974 +                     onclick="PageProxyClickHandler(event);">
 
   747 +                <image id="urlbar-throbber" busy="false"/>
 
   975 +                <image id="urlbar-throbber" busy="false"/>
 
   748 +                <image id="page-proxy-favicon" validate="never"
 
   976 +                <image id="page-proxy-favicon" validate="never"
 
   749 +                       pageproxystate="invalid"
 
   977 +                       pageproxystate="invalid"
 
   750 +                       ondragstart="proxyIconDNDObserver.onDragStart(event);"
 
       
   751 +                       onerror="this.removeAttribute('src');"/>
 
   978 +                       onerror="this.removeAttribute('src');"/>
 
   752 +              </stack>
 
   979 +              </stack>
 
   753 +              <hbox id="identity-icon-labels">
 
   980 +              <hbox id="identity-icon-labels">
 
   754 +                <label id="identity-icon-label" class="plain" flex="1"/>
 
   981 +                <label id="identity-icon-label" class="plain" flex="1"/>
 
   755 +                <label id="identity-icon-country-label" class="plain"/>
 
   982 +                <label id="identity-icon-country-label" class="plain"/>
 
   756 +              </hbox>
 
   983 +              </hbox>
 
   757 +            </hbox>
 
   984 +            </hbox>
 
   758 +          </box>
 
   985 +          </box>
 
   759 +          <label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
 
   986 +          <label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
 
   760 +          <hbox id="urlbar-icons">
 
   987 +          <hbox id="urlbar-icons">
 
   761 +            <button type="menu"
 
       
   762 +                    style="-moz-user-focus: none"
 
       
   763 +                    class="plain urlbar-icon"
 
       
   764 +                    id="feed-button"
 
       
   765 +                    collapsed="true"
 
       
   766 +                    tooltiptext="&feedButton.tooltip;"
 
       
   767 +                    onclick="return FeedHandler.onFeedButtonClick(event);">
 
       
   768 +              <menupopup position="after_end"
 
       
   769 +                         id="feed-menu"
 
       
   770 +                         onpopupshowing="return FeedHandler.buildFeedList(this);"
 
       
   771 +                         oncommand="return FeedHandler.subscribeToFeed(null, event);"
 
       
   772 +                         onclick="checkForMiddleClick(this, event);"/>
 
       
   773 +            </button>
 
       
   774 +            <image id="star-button"
 
   988 +            <image id="star-button"
 
   775 +                   class="urlbar-icon"
 
   989 +                   class="urlbar-icon"
 
   776 +                   onclick="PlacesStarButton.onClick(event);"/>
 
   990 +                   onclick="PlacesStarButton.onClick(event);"/>
 
   777 +            <image id="go-button"
 
   991 +            <image id="go-button"
 
   778 +                   class="urlbar-icon"
 
   992 +                   class="urlbar-icon"
 
   779 +                   tooltiptext="&goEndCap.tooltip;"
 
   993 +                   tooltiptext="&goEndCap.tooltip;"
 
   780 +                   onclick="gURLBar.handleCommand(event);"/>
 
   994 +                   onclick="gURLBar.handleCommand(event);"/>
 
   781 +          </hbox>
 
   995 +          </hbox>
 
       
   996 +          <progressmeter id="urlbar-progress" mode="normal" value="0" collapsed="true"/>
 
       
   997 +          <toolbarbutton id="urlbar-go-button"
 
       
   998 +                         onclick="gURLBar.handleCommand(event);"
 
       
   999 +                         tooltiptext="&goEndCap.tooltip;"/>
 
       
  1000 +          <toolbarbutton id="urlbar-reload-button"
 
       
  1001 +                         command="Browser:ReloadOrDuplicate"
 
       
  1002 +                         onclick="checkForMiddleClick(this, event);"
 
       
  1003 +                         tooltiptext="&reloadButton.tooltip;"/>
 
       
  1004 +          <toolbarbutton id="urlbar-stop-button"
 
       
  1005 +                         command="Browser:Stop"
 
       
  1006 +                         tooltiptext="&stopButton.tooltip;"/>
 
   782 +        </textbox>
 
  1007 +        </textbox>
 
   783 +      </toolbaritem>
 
  1008 +      </toolbaritem>
 
       
  1009 +
 
       
  1010 +      <toolbarbutton id="reload-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
 
       
  1011 +                     label="&reloadCmd.label;" removable="true"
 
       
  1012 +                     command="Browser:ReloadOrDuplicate"
 
       
  1013 +                     onclick="checkForMiddleClick(this, event);"
 
       
  1014 +                     tooltiptext="&reloadButton.tooltip;"/>
 
       
  1015 +
 
       
  1016 +      <toolbarbutton id="stop-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
 
       
  1017 +                     label="&stopCmd.label;" removable="true"
 
       
  1018 +                     command="Browser:Stop"
 
       
  1019 +                     tooltiptext="&stopButton.tooltip;"/>
 
   784 +
 
  1020 +
 
   785 +      <toolbaritem id="search-container" title="&searchItem.title;"
 
  1021 +      <toolbaritem id="search-container" title="&searchItem.title;"
 
   786 +                   align="center" class="chromeclass-toolbar-additional"
 
  1022 +                   align="center" class="chromeclass-toolbar-additional"
 
   787 +                   flex="100" persist="width" removable="true">
 
  1023 +                   flex="100" persist="width" removable="true">
 
   788 +        <searchbar id="searchbar" flex="1"/>
 
  1024 +        <searchbar id="searchbar" flex="1"/>
 
   809 +                     onclick="BookmarksEventHandler.onClick(event);"
 
  1045 +                     onclick="BookmarksEventHandler.onClick(event);"
 
   810 +                     onpopupshowing="BookmarksMenuButton.onPopupShowing(event);
 
  1046 +                     onpopupshowing="BookmarksMenuButton.onPopupShowing(event);
 
   811 +                                     if (!this.parentNode._placesView)
 
  1047 +                                     if (!this.parentNode._placesView)
 
   812 +                                       new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');"
 
  1048 +                                       new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');"
 
   813 +                     tooltip="bhTooltip" popupsinherittooltip="true">
 
  1049 +                     tooltip="bhTooltip" popupsinherittooltip="true">
 
   814 +            <menuitem id="BMB_bookmarkAllTabs"
 
  1050 +            <menuitem id="BMB_viewBookmarksToolbar"
 
   815 +                      label="&addCurPagesCmd.label;"
 
  1051 +                      placesanonid="view-toolbar"
 
   816 +                      command="Browser:BookmarkAllTabs"
 
  1052 +                      toolbarId="PersonalToolbar"
 
   817 +                      key="bookmarkAllTabsKb"/>
 
  1053 +                      type="checkbox"
 
       
  1054 +                      oncommand="onViewToolbarCommand(event)"
 
       
  1055 +                      label="&viewBookmarksToolbar.label;"/>
 
       
  1056 +            <menuseparator/>
 
   818 +            <menuitem id="BMB_bookmarksShowAll"
 
  1057 +            <menuitem id="BMB_bookmarksShowAll"
 
   819 +                      label="&organizeBookmarks.label;"
 
  1058 +                      label="&showAllBookmarks.label;"
 
   820 +                      command="Browser:ShowAllBookmarks"
 
  1059 +                      command="Browser:ShowAllBookmarks"
 
   821 +                      key="manBookmarkKb"/>
 
  1060 +                      key="manBookmarkKb"/>
 
   822 +            <menuseparator/>
 
  1061 +            <menuseparator/>
 
   823 +            <menuitem id="BMB_viewBookmarksToolbar"
 
  1062 +            <menuitem id="BMB_bookmarkThisPage"
 
   824 +                      type="checkbox"
 
  1063 +                      class="menuitem-iconic"
 
   825 +                      oncommand="onViewToolbarCommand(event)"
 
  1064 +                      label="&bookmarkThisPageCmd.label;"
 
   826 +                      label="&viewBookmarksToolbar.label;"/>
 
  1065 +                      command="Browser:AddBookmarkAs"
 
   827 +            <menuitem id="BMB_viewBookmarksSidebar"
 
  1066 +                      key="addBookmarkAsKb"/>
 
   828 +                      label="&viewBookmarksSidebar.label;"
 
  1067 +            <menuitem id="BMB_subscribeToPageMenuitem"
 
   829 +                      type="checkbox"
 
  1068 +                      label="&subscribeToPageMenuitem.label;"
 
   830 +                      oncommand="toggleSidebar('viewBookmarksSidebar');"
 
  1069 +                      oncommand="return FeedHandler.subscribeToFeed(null, event);"
 
   831 +                      key="viewBookmarksSidebarKb">
 
  1070 +                      onclick="checkForMiddleClick(this, event);"
 
   832 +              <observes element="viewBookmarksSidebar" attribute="checked"/>
 
  1071 +                      observes="singleFeedMenuitemState"/>
 
   833 +            </menuitem>
 
  1072 +            <menu id="BMB_subscribeToPageMenupopup"
 
       
  1073 +                  label="&subscribeToPageMenupopup.label;"
 
       
  1074 +                  observes="multipleFeedsMenuState">
 
       
  1075 +              <menupopup id="BMB_subscribeToPageSubmenuMenupopup"
 
       
  1076 +                         onpopupshowing="return FeedHandler.buildFeedList(event.target);"
 
       
  1077 +                         oncommand="return FeedHandler.subscribeToFeed(null, event);"
 
       
  1078 +                         onclick="checkForMiddleClick(this, event);"/>
 
       
  1079 +            </menu>
 
   834 +            <menuseparator/>
 
  1080 +            <menuseparator/>
 
   835 +            <menu id="BMB_bookmarksToolbarFolderMenu"
 
  1081 +            <menu id="BMB_bookmarksToolbar"
 
       
  1082 +                  placesanonid="toolbar-autohide"
 
   836 +                  class="menu-iconic bookmark-item"
 
  1083 +                  class="menu-iconic bookmark-item"
 
   837 +                  label="&personalbarCmd.label;"
 
  1084 +                  label="&personalbarCmd.label;"
 
   838 +                  container="true">
 
  1085 +                  container="true">
 
   839 +              <menupopup id="BMB_bookmarksToolbarFolderPopup"
 
  1086 +              <menupopup id="BMB_bookmarksToolbarPopup"
 
   840 +                         placespopup="true"
 
  1087 +                         placespopup="true"
 
   841 +                         context="placesContext"
 
  1088 +                         context="placesContext"
 
   842 +                         onpopupshowing="if (!this.parentNode._placesView)
 
  1089 +                         onpopupshowing="if (!this.parentNode._placesView)
 
   843 +                                           new PlacesMenu(event, 'place:folder=TOOLBAR');"/>
 
  1090 +                                           new PlacesMenu(event, 'place:folder=TOOLBAR');"/>
 
   844 +            </menu>
 
  1091 +            </menu>
 
   845 +            <menu id="BMB_unsortedBookmarksFolderMenu"
 
       
   846 +                  class="menu-iconic bookmark-item"
 
       
   847 +                  container="true">
 
       
   848 +              <menupopup id="BMB_unsortedBookmarksFolderPopup"
 
       
   849 +                         placespopup="true"
 
       
   850 +                         context="placesContext"
 
       
   851 +                         onpopupshowing="if (!this.parentNode._placesView)
 
       
   852 +                                           new PlacesMenu(event, 'place:folder=UNFILED_BOOKMARKS');"/>
 
       
   853 +            </menu>
 
       
   854 +            <menuseparator/>
 
  1092 +            <menuseparator/>
 
       
  1093 +            <!-- Bookmarks menu items -->
 
       
  1094 +            <menuseparator builder="end"
 
       
  1095 +                           class="hide-if-empty-places-result"/>
 
       
  1096 +            <menuitem id="BMB_unsortedBookmarks"
 
       
  1097 +                      label="&bookmarksMenuButton.unsorted.label;"
 
       
  1098 +                      oncommand="PlacesCommandHook.showPlacesOrganizer('UnfiledBookmarks');"
 
       
  1099 +                      class="menuitem-iconic"/>
 
   855 +          </menupopup>
 
  1100 +          </menupopup>
 
   856 +        </toolbarbutton>
 
  1101 +        </toolbarbutton>
 
   857 +      </toolbaritem>
 
  1102 +      </toolbaritem>
 
   858 +
 
  1103 +
 
   859 +      <hbox id="fullscreenflex" flex="1" hidden="true" fullscreencontrol="true"/>
 
  1104 +      <hbox id="fullscreenflex" flex="1" hidden="true" fullscreencontrol="true"/>
 
   927 +             customizable="true"
 
  1172 +             customizable="true"
 
   928 +             mode="icons" lockmode="true"
 
  1173 +             mode="icons" lockmode="true"
 
   929 +             iconsize="small" defaulticonsize="small" lockiconsize="true"
 
  1174 +             iconsize="small" defaulticonsize="small" lockiconsize="true"
 
   930 +             aria-label="&tabsToolbar.label;"
 
  1175 +             aria-label="&tabsToolbar.label;"
 
   931 +             context="toolbar-context-menu"
 
  1176 +             context="toolbar-context-menu"
 
   932 +             defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton"
 
  1177 +             defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabview-button,tabs-closebutton"
 
   933 +             collapsed="true">
 
  1178 +             collapsed="true">
 
   934 +
 
  1179 +
 
   935 +      <tabs id="tabbrowser-tabs"
 
  1180 +      <tabs id="tabbrowser-tabs"
 
   936 +            class="tabbrowser-tabs"
 
  1181 +            class="tabbrowser-tabs"
 
   937 +            tabbrowser="content"
 
  1182 +            tabbrowser="content"
 
   961 +                     removable="true">
 
  1206 +                     removable="true">
 
   962 +        <menupopup id="alltabs-popup"
 
  1207 +        <menupopup id="alltabs-popup"
 
   963 +                   position="after_end"/>
 
  1208 +                   position="after_end"/>
 
   964 +      </toolbarbutton>
 
  1209 +      </toolbarbutton>
 
   965 +
 
  1210 +
 
       
  1211 +      <toolbarbutton id="tabview-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
 
       
  1212 +                     label="&tabGroupsButton.label;"
 
       
  1213 +                     command="Browser:ToggleTabView"
 
       
  1214 +                     tooltiptext="&tabGroupsButton.tooltip;"
 
       
  1215 +                     removable="true"
 
       
  1216 +                     observes="tabviewGroupsNumber"/>
 
       
  1217 +
 
   966 +      <toolbarbutton id="tabs-closebutton"
 
  1218 +      <toolbarbutton id="tabs-closebutton"
 
   967 +                     class="close-button tabs-closebutton"
 
  1219 +                     class="close-button tabs-closebutton"
 
   968 +                     command="cmd_close"
 
  1220 +                     command="cmd_close"
 
   969 +                     label="&closeTab.label;"
 
  1221 +                     label="&closeTab.label;"
 
   970 +                     tooltiptext="&closeTab.label;"/>
 
  1222 +                     tooltiptext="&closeTab.label;"/>
 
   971 +
 
  1223 +
 
   972 +    </toolbar>
 
  1224 +    </toolbar>
 
   973 +
 
  1225 +
 
   974 +    <toolbarpalette id="BrowserToolbarPalette">
 
  1226 +    <toolbarpalette id="BrowserToolbarPalette">
 
       
  1227 +
 
       
  1228 +# Update primaryToolbarButtons in browser/themes/browserShared.inc when adding
 
       
  1229 +# or removing default items with the toolbarbutton-1 class.
 
   975 +
 
  1230 +
 
   976 +      <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
 
  1231 +      <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
 
   977 +                     label="&printButton.label;" command="cmd_print"
 
  1232 +                     label="&printButton.label;" command="cmd_print"
 
   978 +                     tooltiptext="&printButton.tooltip;"/>
 
  1233 +                     tooltiptext="&printButton.tooltip;"/>
 
   979 +
 
  1234 +
 
  1031 +                     observes="View:FullScreen"
 
  1286 +                     observes="View:FullScreen"
 
  1032 +                     type="checkbox"
 
  1287 +                     type="checkbox"
 
  1033 +                     label="&fullScreenCmd.label;"
 
  1288 +                     label="&fullScreenCmd.label;"
 
  1034 +                     tooltiptext="&fullScreenButton.tooltip;"/>
 
  1289 +                     tooltiptext="&fullScreenButton.tooltip;"/>
 
  1035 +
 
  1290 +
 
       
  1291 +      <toolbaritem id="zoom-controls" class="chromeclass-toolbar-additional"
 
       
  1292 +                   title="&zoomControls.label;">
 
       
  1293 +        <toolbarbutton id="zoom-out-button" class="toolbarbutton-1"
 
       
  1294 +                       label="&fullZoomReduceCmd.label;"
 
       
  1295 +                       command="cmd_fullZoomReduce"
 
       
  1296 +                       tooltiptext="&zoomOutButton.tooltip;"/>
 
       
  1297 +        <toolbarbutton id="zoom-in-button" class="toolbarbutton-1"
 
       
  1298 +                       label="&fullZoomEnlargeCmd.label;"
 
       
  1299 +                       command="cmd_fullZoomEnlarge"
 
       
  1300 +                       tooltiptext="&zoomInButton.tooltip;"/>
 
       
  1301 +      </toolbaritem>
 
       
  1302 +#ifdef MOZ_SERVICES_SYNC
 
       
  1303 +      <toolbarbutton id="sync-button"
 
       
  1304 +                     class="toolbarbutton-1 chromeclass-toolbar-additional"
 
       
  1305 +                     label="&syncToolbarButton.label;"
 
       
  1306 +                     oncommand="gSyncUI.handleToolbarButton()"/>
 
       
  1307 +#endif
 
  1036 +    </toolbarpalette>
 
  1308 +    </toolbarpalette>
 
  1037 +  </toolbox>
 
  1309 +  </toolbox>
 
  1038 +
 
  1310 +
 
  1039 +  <hbox flex="1" id="browser">
 
  1311 +  <hbox flex="1" id="browser">
 
  1040 +    <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
 
  1312 +    <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
 
  1056 +                  autocompletepopup="PopupAutoComplete"
 
  1328 +                  autocompletepopup="PopupAutoComplete"
 
  1057 +                  onclick="return contentAreaClick(event, false);"/>
 
  1329 +                  onclick="return contentAreaClick(event, false);"/>
 
  1058 +    </vbox>
 
  1330 +    </vbox>
 
  1059 +  </hbox>
 
  1331 +  </hbox>
 
  1060 +
 
  1332 +
 
  1061 +  <vbox id="browser-bottombox">
 
  1333 +  <vbox id="browser-bottombox" layer="true">
 
  1062 +    <statusbar class="chromeclass-status" id="status-bar"
 
  1334 +    <toolbar id="addon-bar" toolbarname="&addonBarCmd.label;" collapsed="true"
 
  1063 +#ifdef WINCE
 
  1335 +             class="toolbar-primary chromeclass-toolbar"
 
  1064 +               hidden="true"
 
  1336 +             context="toolbar-context-menu" toolboxid="navigator-toolbox"
 
  1065 +#endif
 
  1337 +             mode="icons" iconsize="small" defaulticonsize="small"
 
  1066 +               >
 
  1338 +             lockiconsize="true"
 
  1067 +      <statusbarpanel id="statusbar-display" label="" flex="1"/>
 
  1339 +             customizable="true" align="right">
 
  1068 +      <statusbarpanel class="statusbarpanel-progress" collapsed="true" id="statusbar-progresspanel">
 
  1340 +      <statusbar id="status-bar"/>
 
  1069 +        <progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0"/>
 
  1341 +    </toolbar>
 
  1070 +      </statusbarpanel>
 
       
  1071 +      <statusbarpanel id="download-monitor" class="statusbarpanel-iconic-text"
 
       
  1072 +                      tooltiptext="&downloadMonitor2.tooltip;" hidden="true"
 
       
  1073 +                      command="Tools:Downloads"/>
 
       
  1074 +      <statusbarpanel id="security-button" class="statusbarpanel-iconic"
 
       
  1075 +                      hidden="true"
 
       
  1076 +                      onclick="if (event.button == 0 &amp;&amp; event.detail == 1) displaySecurityInfo();"/>
 
       
  1077 +#ifdef MOZ_SERVICES_SYNC
 
       
  1078 +      <statusbarpanel id="sync-status-button"
 
       
  1079 +                      class="statusbarpanel-iconic-text"
 
       
  1080 +                      image="chrome://browser/skin/sync-16.png"
 
       
  1081 +                      label="&syncLogInItem.label;"
 
       
  1082 +                      oncommand="gSyncUI.handleStatusbarButton();"
 
       
  1083 +                      onmousedown="event.preventDefault();">
 
       
  1084 +      </statusbarpanel>
 
       
  1085 +      <separator class="thin"/>
 
       
  1086 +      <statusbarpanel id="sync-notifications-button"
 
       
  1087 +                      class="statusbarpanel-iconic-text"
 
       
  1088 +                      hidden="true"
 
       
  1089 +                      popup="sync-notifications-panel">
 
       
  1090 +      </statusbarpanel>
 
       
  1091 +      <panel id="sync-notifications-panel" position="before_end">
 
       
  1092 +          <notificationbox id="sync-notifications-box"/>
 
       
  1093 +      </panel>
 
       
  1094 +#endif
 
       
  1095 +      <statusbarpanel id="page-report-button" type="menu"
 
       
  1096 +                      class="statusbarpanel-menu-iconic"
 
       
  1097 +                      hidden="true"
 
       
  1098 +                      tooltiptext="&pageReportIcon.tooltip;">
 
       
  1099 +        <menupopup onpopupshowing="gPopupBlockerObserver.fillPopupList(event);">
 
       
  1100 +          <menuitem observes="blockedPopupAllowSite"/>
 
       
  1101 +          <menuitem observes="blockedPopupEditSettings"/>
 
       
  1102 +          <menuitem observes="blockedPopupDontShowMessage"/>
 
       
  1103 +          <menuseparator observes="blockedPopupsSeparator"/>
 
       
  1104 +        </menupopup>
 
       
  1105 +      </statusbarpanel>
 
       
  1106 +    </statusbar>
 
       
  1107 +  </vbox>
 
  1342 +  </vbox>
 
       
  1343 +
 
  1108 +#ifndef XP_UNIX
 
  1344 +#ifndef XP_UNIX
 
  1109 +  <svg:svg height="0">
 
  1345 +  <svg:svg height="0">
 
  1110 +    <svg:mask id="winstripe-keyhole-forward-mask" maskContentUnits="objectBoundingBox">
 
  1346 +    <svg:mask id="winstripe-keyhole-forward-mask" maskContentUnits="objectBoundingBox">
 
  1111 +      <svg:rect x="0" y="0" width="1" height="1" fill="white"/>
 
  1347 +      <svg:rect x="0" y="0" width="1" height="1" fill="white"/>
 
  1112 +      <svg:circle cx="-0.46" cy="0.5" r="0.63"/>
 
  1348 +      <svg:circle cx="-0.46" cy="0.5" r="0.63"/>
 
  1115 +      <svg:rect x="0" y="0" width="1" height="1" fill="white"/>
 
  1351 +      <svg:rect x="0" y="0" width="1" height="1" fill="white"/>
 
  1116 +      <svg:circle cx="-0.35" cy="0.5" r="0.58"/>
 
  1352 +      <svg:circle cx="-0.35" cy="0.5" r="0.58"/>
 
  1117 +    </svg:mask>
 
  1353 +    </svg:mask>
 
  1118 +  </svg:svg>
 
  1354 +  </svg:svg>
 
  1119 +#endif
 
  1355 +#endif
 
       
  1356 +
 
       
  1357 +</vbox>
 
       
  1358 +# <iframe id="tab-view"> is dynamically appended as the 2nd child of #tab-view-deck.
 
       
  1359 +#     Introducing the iframe dynamically, as needed, was found to be better than
 
       
  1360 +#     starting with an empty iframe here in browser.xul from a Ts standpoint.
 
       
  1361 +</deck>
 
       
  1362 +
 
  1120 +</window>
 
  1363 +</window>
 
  1121 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 
  1364 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 
  1122 --- a/browser/base/jar.mn
 
  1365 --- a/browser/base/jar.mn
 
  1123 +++ b/browser/base/jar.mn
 
  1366 +++ b/browser/base/jar.mn
 
  1124 @@ -20,16 +20,18 @@ browser.jar:
 
  1367 @@ -20,16 +20,18 @@ browser.jar:
mozilla