595 + <label id="identity-icon-label" class="plain" flex="1"/> |
595 + <label id="identity-icon-label" class="plain" flex="1"/> |
596 + <label id="identity-icon-country-label" class="plain"/> |
596 + <label id="identity-icon-country-label" class="plain"/> |
597 + </hbox> |
597 + </hbox> |
598 + </hbox> |
598 + </hbox> |
599 + </box> |
599 + </box> |
600 + <label id="urlbar-display" value="&urlbar.switchToTab.label;"/> |
600 + <box id="urlbar-display-box" align="center"> |
|
601 + <label id="urlbar-display" value="&urlbar.switchToTab.label;"/> |
|
602 + </box> |
601 + <hbox id="urlbar-icons"> |
603 + <hbox id="urlbar-icons"> |
602 + <image id="page-report-button" |
604 + <image id="page-report-button" |
603 + class="urlbar-icon" |
605 + class="urlbar-icon" |
604 + hidden="true" |
606 + hidden="true" |
605 + tooltiptext="&pageReportIcon.tooltip;" |
607 + tooltiptext="&pageReportIcon.tooltip;" |
671 + ondrop="PlacesMenuDNDHandler.onDrop(event);"> |
673 + ondrop="PlacesMenuDNDHandler.onDrop(event);"> |
672 + <menupopup id="BMB_bookmarksPopup" |
674 + <menupopup id="BMB_bookmarksPopup" |
673 + placespopup="true" |
675 + placespopup="true" |
674 + context="placesContext" |
676 + context="placesContext" |
675 + openInTabs="children" |
677 + openInTabs="children" |
676 + oncommand="BookmarksEventHandler.onCommand(event);" |
678 + oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);" |
677 + onclick="BookmarksEventHandler.onClick(event);" |
679 + onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);" |
678 + onpopupshowing="BookmarksMenuButton.onPopupShowing(event); |
680 + onpopupshowing="BookmarksMenuButton.onPopupShowing(event); |
679 + if (!this.parentNode._placesView) |
681 + if (!this.parentNode._placesView) |
680 + new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');" |
682 + new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');" |
681 + tooltip="bhTooltip" popupsinherittooltip="true"> |
683 + tooltip="bhTooltip" popupsinherittooltip="true"> |
682 + <menuitem id="BMB_viewBookmarksToolbar" |
684 + <menuitem id="BMB_viewBookmarksToolbar" |
771 + <toolbaritem flex="1" id="personal-bookmarks" title="&bookmarksItem.title;" |
773 + <toolbaritem flex="1" id="personal-bookmarks" title="&bookmarksItem.title;" |
772 + removable="true"> |
774 + removable="true"> |
773 + <hbox flex="1" |
775 + <hbox flex="1" |
774 + id="PlacesToolbar" |
776 + id="PlacesToolbar" |
775 + context="placesContext" |
777 + context="placesContext" |
776 + onclick="BookmarksEventHandler.onClick(event);" |
778 + onclick="BookmarksEventHandler.onClick(event, this._placesView);" |
777 + oncommand="BookmarksEventHandler.onCommand(event);" |
779 + oncommand="BookmarksEventHandler.onCommand(event, this._placesView);" |
778 + tooltip="bhTooltip" |
780 + tooltip="bhTooltip" |
779 + popupsinherittooltip="true"> |
781 + popupsinherittooltip="true"> |
780 + <toolbarbutton class="bookmark-item bookmarks-toolbar-customize" |
782 + <toolbarbutton class="bookmark-item bookmarks-toolbar-customize" |
781 + mousethrough="never" |
783 + mousethrough="never" |
782 + label="&bookmarksToolbarItem.label;"/> |
784 + label="&bookmarksToolbarItem.label;"/> |
1003 + flex="1" contenttooltip="aHTMLTooltip" |
1005 + flex="1" contenttooltip="aHTMLTooltip" |
1004 + tabcontainer="tabbrowser-tabs" |
1006 + tabcontainer="tabbrowser-tabs" |
1005 + contentcontextmenu="contentAreaContextMenu" |
1007 + contentcontextmenu="contentAreaContextMenu" |
1006 + autocompletepopup="PopupAutoComplete" |
1008 + autocompletepopup="PopupAutoComplete" |
1007 + onclick="return contentAreaClick(event, false);"/> |
1009 + onclick="return contentAreaClick(event, false);"/> |
|
1010 + <statuspanel id="statusbar-display" label=""/> |
1008 + </vbox> |
1011 + </vbox> |
1009 + <vbox id="browser-border-end" hidden="true" layer="true"/> |
1012 + <vbox id="browser-border-end" hidden="true" layer="true"/> |
1010 + </hbox> |
1013 + </hbox> |
1011 + |
1014 + |
1012 + <vbox id="browser-bottombox" layer="true"> |
1015 + <vbox id="browser-bottombox" layer="true"> |
1016 + class="toolbar-primary chromeclass-toolbar" |
1019 + class="toolbar-primary chromeclass-toolbar" |
1017 + context="toolbar-context-menu" toolboxid="navigator-toolbox" |
1020 + context="toolbar-context-menu" toolboxid="navigator-toolbox" |
1018 + mode="icons" iconsize="small" defaulticonsize="small" |
1021 + mode="icons" iconsize="small" defaulticonsize="small" |
1019 + lockiconsize="true" |
1022 + lockiconsize="true" |
1020 + defaultset="addonbar-closebutton,spring,status-bar" |
1023 + defaultset="addonbar-closebutton,spring,status-bar" |
1021 + customizable="true"> |
1024 + customizable="true" |
|
1025 + key="key_toggleAddonBar"> |
1022 + <toolbarbutton id="addonbar-closebutton" |
1026 + <toolbarbutton id="addonbar-closebutton" |
1023 + tooltiptext="&addonBarCloseButton.tooltip;" |
1027 + tooltiptext="&addonBarCloseButton.tooltip;" |
1024 + oncommand="setToolbarVisibility(this.parentNode, false);"/> |
1028 + oncommand="setToolbarVisibility(this.parentNode, false);"/> |
1025 + <statusbar id="status-bar"/> |
1029 + <statusbar id="status-bar"/> |
1026 + </toolbar> |
1030 + </toolbar> |
1087 + |
1091 + |
1088 +</window> |
1092 +</window> |
1089 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1093 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1090 --- a/browser/base/jar.mn |
1094 --- a/browser/base/jar.mn |
1091 +++ b/browser/base/jar.mn |
1095 +++ b/browser/base/jar.mn |
1092 @@ -20,16 +20,18 @@ browser.jar: |
1096 @@ -22,16 +22,18 @@ browser.jar: |
1093 * content/browser/aboutHome.xhtml (content/aboutHome.xhtml) |
|
1094 * content/browser/aboutHome.js (content/aboutHome.js) |
|
1095 * content/browser/aboutHome.css (content/aboutHome.css) |
1097 * content/browser/aboutHome.css (content/aboutHome.css) |
|
1098 content/browser/aboutHome-restore-icon.png (content/aboutHome-restore-icon.png) |
|
1099 content/browser/aboutHome-restore-icon-rtl.png (content/aboutHome-restore-icon-rtl.png) |
1096 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1100 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1097 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1101 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1098 * content/browser/browser.css (content/browser.css) |
1102 * content/browser/browser.css (content/browser.css) |
1099 * content/browser/browser.js (content/browser.js) |
1103 * content/browser/browser.js (content/browser.js) |
1100 * content/browser/browser.xul (content/browser.xul) |
1104 * content/browser/browser.xul (content/browser.xul) |