142 + <tooltip id="aHTMLTooltip" page="true"/> |
142 + <tooltip id="aHTMLTooltip" page="true"/> |
143 + <tooltip id="remoteBrowserTooltip"/> |
143 + <tooltip id="remoteBrowserTooltip"/> |
144 + |
144 + |
145 + <!-- for search and content formfill/pw manager --> |
145 + <!-- for search and content formfill/pw manager --> |
146 + <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/> |
146 + <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/> |
|
147 + |
|
148 + <!-- for search with one-off buttons --> |
|
149 + <panel type="autocomplete" id="PopupSearchAutoComplete" noautofocus="true" hidden="true"/> |
147 + |
150 + |
148 + <!-- for url bar autocomplete --> |
151 + <!-- for url bar autocomplete --> |
149 + <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/> |
152 + <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/> |
150 + |
153 + |
151 + <!-- for select dropdowns --> |
154 + <!-- for select dropdowns --> |
240 + flip="none" |
243 + flip="none" |
241 + consumeoutsideclicks="false" |
244 + consumeoutsideclicks="false" |
242 + mousethrough="always"> |
245 + mousethrough="always"> |
243 + <box id="UITourHighlight"></box> |
246 + <box id="UITourHighlight"></box> |
244 + </panel> |
247 + </panel> |
|
248 + <!-- Used to highlight the new search experience --> |
|
249 + <panel id="SearchHighlight1" |
|
250 + class="SearchHighlight" |
|
251 + type="arrow" |
|
252 + hidden="true" |
|
253 + noautofocus="true" |
|
254 + noautohide="true" |
|
255 + orient="vertical" |
|
256 + align="stretch"> |
|
257 + <label class="SearchHighlightTitle">One-Click Searches</label> |
|
258 + <description class="SearchHighlightText" flex="1">Search any of these sites instantly, without changing your default.</description> |
|
259 + <hbox class="SearchHighlightFooter" align="center"> |
|
260 + <spacer class="dot filled"/> |
|
261 + <spacer class="dot"/> |
|
262 + <spacer flex="1"/> |
|
263 + <button label="Next"/> |
|
264 + </hbox> |
|
265 + </panel> |
|
266 + <panel id="SearchHighlight2" |
|
267 + class="SearchHighlight" |
|
268 + type="arrow" |
|
269 + hidden="true" |
|
270 + noautofocus="true" |
|
271 + noautohide="true" |
|
272 + orient="vertical" |
|
273 + align="stretch"> |
|
274 + <label class="SearchHighlightTitle">Smart Suggestions</label> |
|
275 + <description class="SearchHighlightText" flex="1">Suggestions from your default search engine appear as you type.</description> |
|
276 + <hbox class="SearchHighlightFooter" align="center"> |
|
277 + <spacer class="dot"/> |
|
278 + <spacer class="dot filled"/> |
|
279 + <spacer flex="1"/> |
|
280 + <button label="Thanks!"/> |
|
281 + </hbox> |
|
282 + </panel> |
|
283 + |
|
284 + <panel id="abouthome-search-panel" orient="vertical" type="arrow" hidden="true"> |
|
285 + <hbox id="abouthome-search-panel-manage" class="abouthome-search-panel-item" |
|
286 + onclick="openPreferences('paneSearch')"> |
|
287 + <label>&cmd_engineManager.label;</label> |
|
288 + </hbox> |
|
289 + </panel> |
245 + |
290 + |
246 + <panel id="social-share-panel" |
291 + <panel id="social-share-panel" |
247 + class="social-panel" |
292 + class="social-panel" |
248 + type="arrow" |
293 + type="arrow" |
249 + orient="horizontal" |
294 + orient="horizontal" |
250 + onpopupshowing="SocialShare.onShowing()" |
295 + onpopupshowing="SocialShare.onShowing()" |
251 + onpopuphidden="SocialShare.onHidden()" |
296 + onpopuphidden="SocialShare.onHidden()" |
252 + hidden="true"> |
297 + hidden="true"> |
253 + <vbox class="social-share-toolbar"> |
298 + <vbox class="social-share-toolbar"> |
254 + <arrowscrollbox id="social-share-provider-buttons" orient="vertical" flex="1"/> |
299 + <arrowscrollbox id="social-share-provider-buttons" orient="vertical" flex="1"> |
|
300 + <toolbarbutton id="add-share-provider" class="toolbarbutton share-provider-button" type="radio" |
|
301 + group="share-providers" tooltiptext="&findShareServices.label;" |
|
302 + oncommand="SocialShare.showDirectory()"/> |
|
303 + </arrowscrollbox> |
255 + </vbox> |
304 + </vbox> |
256 + </panel> |
305 + </panel> |
257 + |
306 + |
258 + <panel id="social-notification-panel" |
307 + <panel id="social-notification-panel" |
259 + class="social-panel" |
308 + class="social-panel" |
499 +#else |
548 +#else |
500 + <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/> |
549 + <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/> |
501 +#endif |
550 +#endif |
502 + </tooltip> |
551 + </tooltip> |
503 + |
552 + |
|
553 + <tooltip id="share-button-tooltip" onpopupshowing="SocialShare.createTooltip(event);"> |
|
554 + <label class="tooltip-label"/> |
|
555 + <label class="tooltip-label"/> |
|
556 + </tooltip> |
|
557 + |
504 +#include popup-notifications.inc |
558 +#include popup-notifications.inc |
505 + |
559 + |
506 +#include ../../components/customizableui/content/panelUI.inc.xul |
560 +#include ../../components/customizableui/content/panelUI.inc.xul |
507 + |
561 + |
508 + <hbox id="downloads-animation-container" mousethrough="always"> |
562 + <hbox id="downloads-animation-container" mousethrough="always"> |
672 + --> |
726 + --> |
673 + <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar" |
727 + <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar" |
674 + aria-label="&navbarCmd.label;" |
728 + aria-label="&navbarCmd.label;" |
675 + fullscreentoolbar="true" mode="icons" customizable="true" |
729 + fullscreentoolbar="true" mode="icons" customizable="true" |
676 + iconsize="small" |
730 + iconsize="small" |
677 + defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,social-share-button,social-toolbar-item" |
731 +#ifdef MOZ_DEV_EDITION |
|
732 + defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button,loop-button-throttled" |
|
733 +#else |
|
734 + defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,loop-button-throttled" |
|
735 +#endif |
678 + customizationtarget="nav-bar-customization-target" |
736 + customizationtarget="nav-bar-customization-target" |
679 + overflowable="true" |
737 + overflowable="true" |
680 + overflowbutton="nav-bar-overflow-button" |
738 + overflowbutton="nav-bar-overflow-button" |
681 + overflowtarget="widget-overflow-list" |
739 + overflowtarget="widget-overflow-list" |
682 + overflowpanel="widget-overflow" |
740 + overflowpanel="widget-overflow" |
726 + <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> |
784 + <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> |
727 + <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> |
785 + <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> |
728 + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> |
786 + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> |
729 + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
787 + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
730 + <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/> |
788 + <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/> |
731 + <image id="plugin-install-notification-icon" class="notification-anchor-icon" role="button"/> |
|
732 + <image id="bad-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/> |
789 + <image id="bad-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/> |
733 + <image id="bad-content-unblocked-notification-icon" class="notification-anchor-icon" role="button"/> |
790 + <image id="bad-content-unblocked-notification-icon" class="notification-anchor-icon" role="button"/> |
734 + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
791 + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
735 + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
792 + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
736 + <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon" role="button"/> |
793 + <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon" role="button"/> |
759 + <label id="identity-icon-label" class="plain" flex="1"/> |
816 + <label id="identity-icon-label" class="plain" flex="1"/> |
760 + <label id="identity-icon-country-label" class="plain"/> |
817 + <label id="identity-icon-country-label" class="plain"/> |
761 + </hbox> |
818 + </hbox> |
762 + </box> |
819 + </box> |
763 + <box id="urlbar-display-box" align="center"> |
820 + <box id="urlbar-display-box" align="center"> |
764 + <label id="urlbar-display" value="&urlbar.switchToTab.label;"/> |
821 + <label class="urlbar-display urlbar-display-switchtab" value="&urlbar.switchToTab.label;"/> |
765 + </box> |
822 + </box> |
766 + <hbox id="urlbar-icons"> |
823 + <hbox id="urlbar-icons"> |
767 + <image id="page-report-button" |
824 + <image id="page-report-button" |
768 + class="urlbar-icon" |
825 + class="urlbar-icon" |
769 + hidden="true" |
826 + hidden="true" |
920 + ondragexit="homeButtonObserver.onDragExit(event)" |
977 + ondragexit="homeButtonObserver.onDragExit(event)" |
921 + key="goHome" |
978 + key="goHome" |
922 + onclick="BrowserGoHome(event);" |
979 + onclick="BrowserGoHome(event);" |
923 + cui-areatype="toolbar" |
980 + cui-areatype="toolbar" |
924 + aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> |
981 + aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> |
925 + |
|
926 + <toolbarbutton id="social-share-button" |
|
927 + class="toolbarbutton-1 chromeclass-toolbar-additional" |
|
928 + label="&sharePageCmd.label;" |
|
929 + tooltiptext="&sharePageCmd.label;" |
|
930 + cui-areatype="toolbar" |
|
931 + removable="true" |
|
932 + hidden="true" |
|
933 + command="Social:SharePage"/> |
|
934 + </hbox> |
982 + </hbox> |
935 + |
983 + |
936 + <toolbarbutton id="nav-bar-overflow-button" |
984 + <toolbarbutton id="nav-bar-overflow-button" |
937 + class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button" |
985 + class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button" |
938 + skipintoolbarset="true" |
986 + skipintoolbarset="true" |
1073 + tooltip="dynamic-shortcut-tooltip" |
1121 + tooltip="dynamic-shortcut-tooltip" |
1074 + observes="tabviewGroupsNumber"/> |
1122 + observes="tabviewGroupsNumber"/> |
1075 + </toolbarpalette> |
1123 + </toolbarpalette> |
1076 + </toolbox> |
1124 + </toolbox> |
1077 + |
1125 + |
1078 + <hbox id="fullscr-toggler" collapsed="true"/> |
1126 + <hbox id="fullscr-toggler" hidden="true"/> |
1079 + |
1127 + |
1080 + <deck id="content-deck" flex="1"> |
1128 + <deck id="content-deck" flex="1"> |
1081 + <hbox flex="1" id="browser"> |
1129 + <hbox flex="1" id="browser"> |
1082 + <vbox id="browser-border-start" hidden="true" layer="true"/> |
1130 + <vbox id="browser-border-start" hidden="true" layer="true"/> |
1083 + <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome"> |
1131 + <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome"> |
1228 + |
1276 + |
1229 +</window> |
1277 +</window> |
1230 diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul |
1278 diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul |
1231 --- a/browser/base/content/browser.xul |
1279 --- a/browser/base/content/browser.xul |
1232 +++ b/browser/base/content/browser.xul |
1280 +++ b/browser/base/content/browser.xul |
1233 @@ -171,17 +171,17 @@ |
1281 @@ -174,17 +174,17 @@ |
1234 class="editBookmarkPanelHeaderButton" |
1282 class="editBookmarkPanelHeaderButton" |
1235 oncommand="StarUI.removeBookmarkButtonCommand();" |
1283 oncommand="StarUI.removeBookmarkButtonCommand();" |
1236 accesskey="&editBookmark.removeBookmark.accessKey;"/> |
1284 accesskey="&editBookmark.removeBookmark.accessKey;"/> |
1237 </hbox> |
1285 </hbox> |
1238 </vbox> |
1286 </vbox> |
1247 default="true" |
1295 default="true" |
1248 oncommand="StarUI.panel.hidePopup();"/> |
1296 oncommand="StarUI.panel.hidePopup();"/> |
1249 <button id="editBookmarkPanelDeleteButton" |
1297 <button id="editBookmarkPanelDeleteButton" |
1250 class="editBookmarkPanelBottomButton" |
1298 class="editBookmarkPanelBottomButton" |
1251 label="&editBookmark.cancel.label;" |
1299 label="&editBookmark.cancel.label;" |
1252 @@ -1153,17 +1153,17 @@ |
1300 @@ -1198,17 +1198,17 @@ |
1253 |
1301 |
1254 <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
1302 <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
1255 <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> |
1303 <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> |
1256 <vbox id="full-screen-warning-message" align="center"> |
1304 <vbox id="full-screen-warning-message" align="center"> |
1257 <description id="full-screen-domain-text"/> |
1305 <description id="full-screen-domain-text"/> |
1842 + |
1890 + |
1843 +#endif // nsunixshellservice_h____ |
1891 +#endif // nsunixshellservice_h____ |
1844 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1892 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1845 --- a/browser/installer/package-manifest.in |
1893 --- a/browser/installer/package-manifest.in |
1846 +++ b/browser/installer/package-manifest.in |
1894 +++ b/browser/installer/package-manifest.in |
1847 @@ -697,19 +697,21 @@ |
1895 @@ -698,19 +698,21 @@ |
1848 @BINPATH@/defaults/autoconfig/prefcalls.js |
1896 @BINPATH@/defaults/autoconfig/prefcalls.js |
1849 @BINPATH@/browser/defaults/profile/prefs.js |
1897 @BINPATH@/browser/defaults/profile/prefs.js |
1850 |
1898 |
1851 #ifndef LIBXUL_SDK |
1899 #ifndef LIBXUL_SDK |
1852 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1900 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |