104 + </menu> |
104 + </menu> |
105 + <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;" |
105 + <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;" |
106 + accesskey="&moveToNewWindow.accesskey;" |
106 + accesskey="&moveToNewWindow.accesskey;" |
107 + tbattr="tabbrowser-multiple" |
107 + tbattr="tabbrowser-multiple" |
108 + oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/> |
108 + oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/> |
|
109 +#ifdef E10S_TESTING_ONLY |
|
110 + <menuitem id="context_openNonRemoteWindow" label="Open in new non-e10s window" |
|
111 + tbattr="tabbrowser-remote" |
|
112 + hidden="true" |
|
113 + oncommand="gBrowser.openNonRemoteWindow(TabContextMenu.contextTab);"/> |
|
114 +#endif |
109 + <menuseparator/> |
115 + <menuseparator/> |
110 + <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;" |
116 + <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;" |
111 + tbattr="tabbrowser-multiple-visible" |
117 + tbattr="tabbrowser-multiple-visible" |
112 + oncommand="gBrowser.reloadAllTabs();"/> |
118 + oncommand="gBrowser.reloadAllTabs();"/> |
113 + <menuitem id="context_bookmarkAllTabs" |
119 + <menuitem id="context_bookmarkAllTabs" |
243 + orient="horizontal" |
249 + orient="horizontal" |
244 + onpopupshowing="SocialShare.onShowing()" |
250 + onpopupshowing="SocialShare.onShowing()" |
245 + onpopuphidden="SocialShare.onHidden()" |
251 + onpopuphidden="SocialShare.onHidden()" |
246 + hidden="true"> |
252 + hidden="true"> |
247 + <vbox class="social-share-toolbar"> |
253 + <vbox class="social-share-toolbar"> |
248 + <vbox id="social-share-provider-buttons" flex="1"/> |
254 + <arrowscrollbox id="social-share-provider-buttons" orient="vertical" flex="1"/> |
249 + </vbox> |
255 + </vbox> |
250 + </panel> |
256 + </panel> |
251 + |
257 + |
252 + <panel id="social-notification-panel" |
258 + <panel id="social-notification-panel" |
253 + class="social-panel" |
259 + class="social-panel" |
309 + <menuitem label="&fullScreenExit.label;" |
315 + <menuitem label="&fullScreenExit.label;" |
310 + accesskey="&fullScreenExit.accesskey;" |
316 + accesskey="&fullScreenExit.accesskey;" |
311 + oncommand="BrowserFullScreen();"/> |
317 + oncommand="BrowserFullScreen();"/> |
312 + </menupopup> |
318 + </menupopup> |
313 + |
319 + |
314 + <menupopup id="contentAreaContextMenu" pagemenu="start" |
320 + <menupopup id="contentAreaContextMenu" pagemenu="#page-menu-separator" |
315 + onpopupshowing="if (event.target != this) |
321 + onpopupshowing="if (event.target != this) |
316 + return true; |
322 + return true; |
317 + gContextMenu = new nsContextMenu(this, event.shiftKey); |
323 + gContextMenu = new nsContextMenu(this, event.shiftKey); |
318 + if (gContextMenu.shouldDisplay) |
324 + if (gContextMenu.shouldDisplay) |
319 + updateEditUIVisibility(); |
325 + updateEditUIVisibility(); |
576 + <toolbarbutton id="new-tab-button" |
582 + <toolbarbutton id="new-tab-button" |
577 + class="toolbarbutton-1 chromeclass-toolbar-additional" |
583 + class="toolbarbutton-1 chromeclass-toolbar-additional" |
578 + label="&tabCmd.label;" |
584 + label="&tabCmd.label;" |
579 + command="cmd_newNavigatorTab" |
585 + command="cmd_newNavigatorTab" |
580 + onclick="checkForMiddleClick(this, event);" |
586 + onclick="checkForMiddleClick(this, event);" |
581 + tooltiptext="&newTabButton.tooltip;" |
587 + tooltip="dynamic-shortcut-tooltip" |
582 + ondrop="newTabButtonObserver.onDrop(event)" |
588 + ondrop="newTabButtonObserver.onDrop(event)" |
583 + ondragover="newTabButtonObserver.onDragOver(event)" |
589 + ondragover="newTabButtonObserver.onDragOver(event)" |
584 + ondragenter="newTabButtonObserver.onDragOver(event)" |
590 + ondragenter="newTabButtonObserver.onDragOver(event)" |
585 + ondragexit="newTabButtonObserver.onDragExit(event)" |
591 + ondragexit="newTabButtonObserver.onDragExit(event)" |
586 + cui-areatype="toolbar" |
592 + cui-areatype="toolbar" |
872 + |
878 + |
873 + <!-- This is a placeholder for the Downloads Indicator. It is visible |
879 + <!-- This is a placeholder for the Downloads Indicator. It is visible |
874 + during the customization of the toolbar, in the palette, and before |
880 + during the customization of the toolbar, in the palette, and before |
875 + the Downloads Indicator overlay is loaded. --> |
881 + the Downloads Indicator overlay is loaded. --> |
876 + <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
882 + <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
|
883 + key="key_openDownloads" |
877 + oncommand="DownloadsIndicatorView.onCommand(event);" |
884 + oncommand="DownloadsIndicatorView.onCommand(event);" |
878 + ondrop="DownloadsIndicatorView.onDrop(event);" |
885 + ondrop="DownloadsIndicatorView.onDrop(event);" |
879 + ondragover="DownloadsIndicatorView.onDragOver(event);" |
886 + ondragover="DownloadsIndicatorView.onDragOver(event);" |
880 + ondragenter="DownloadsIndicatorView.onDragOver(event);" |
887 + ondragenter="DownloadsIndicatorView.onDragOver(event);" |
881 + label="&downloads.label;" |
888 + label="&downloads.label;" |
882 + removable="true" |
889 + removable="true" |
883 + cui-areatype="toolbar" |
890 + cui-areatype="toolbar" |
884 + tooltiptext="&downloads.tooltip;"/> |
891 + tooltip="dynamic-shortcut-tooltip"/> |
885 + |
892 + |
886 + <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
893 + <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
887 + persist="class" removable="true" |
894 + persist="class" removable="true" |
888 + label="&homeButton.label;" |
895 + label="&homeButton.label;" |
889 + ondragover="homeButtonObserver.onDragOver(event)" |
896 + ondragover="homeButtonObserver.onDragOver(event)" |
890 + ondragenter="homeButtonObserver.onDragOver(event)" |
897 + ondragenter="homeButtonObserver.onDragOver(event)" |
891 + ondrop="homeButtonObserver.onDrop(event)" |
898 + ondrop="homeButtonObserver.onDrop(event)" |
892 + ondragexit="homeButtonObserver.onDragExit(event)" |
899 + ondragexit="homeButtonObserver.onDragExit(event)" |
|
900 + key="goHome" |
893 + onclick="BrowserGoHome(event);" |
901 + onclick="BrowserGoHome(event);" |
894 + cui-areatype="toolbar" |
902 + cui-areatype="toolbar" |
895 + aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> |
903 + aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> |
896 + |
904 + |
897 + |
905 + |
898 + <toolbarbutton id="social-share-button" |
906 + <toolbarbutton id="social-share-button" |
899 + class="toolbarbutton-1 chromeclass-toolbar-additional" |
907 + class="toolbarbutton-1 chromeclass-toolbar-additional" |
900 + hidden="true" |
|
901 + overflows="false" |
|
902 + label="&sharePageCmd.label;" |
908 + label="&sharePageCmd.label;" |
903 + tooltiptext="&sharePageCmd.label;" |
909 + tooltiptext="&sharePageCmd.label;" |
904 + cui-areatype="toolbar" |
910 + cui-areatype="toolbar" |
|
911 + removable="true" |
905 + command="Social:SharePage"/> |
912 + command="Social:SharePage"/> |
906 + </hbox> |
913 + </hbox> |
907 + |
914 + |
908 + <toolbarbutton id="nav-bar-overflow-button" |
915 + <toolbarbutton id="nav-bar-overflow-button" |
909 + class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button" |
916 + class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button" |
1009 +# Update primaryToolbarButtons in browser/themes/shared/browser.inc when adding |
1016 +# Update primaryToolbarButtons in browser/themes/shared/browser.inc when adding |
1010 +# or removing default items with the toolbarbutton-1 class. |
1017 +# or removing default items with the toolbarbutton-1 class. |
1011 + |
1018 + |
1012 + <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
1019 + <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
1013 +#ifdef XP_MACOSX |
1020 +#ifdef XP_MACOSX |
1014 + command="cmd_print" tooltip="dynamic-shortcut-tooltip" |
1021 + command="cmd_print" |
|
1022 + tooltip="dynamic-shortcut-tooltip" |
1015 +#else |
1023 +#else |
1016 + command="cmd_printPreview" tooltiptext="&printButton.tooltip;" |
1024 + command="cmd_printPreview" |
|
1025 + tooltiptext="&printButton.tooltip;" |
1017 +#endif |
1026 +#endif |
1018 + label="&printButton.label;"/> |
1027 + label="&printButton.label;"/> |
1019 + |
1028 + |
1020 + |
1029 + |
1021 + <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
1030 + <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
1068 + <tabbrowser id="content" |
1077 + <tabbrowser id="content" |
1069 + flex="1" contenttooltip="aHTMLTooltip" |
1078 + flex="1" contenttooltip="aHTMLTooltip" |
1070 + tabcontainer="tabbrowser-tabs" |
1079 + tabcontainer="tabbrowser-tabs" |
1071 + contentcontextmenu="contentAreaContextMenu" |
1080 + contentcontextmenu="contentAreaContextMenu" |
1072 + autocompletepopup="PopupAutoComplete" |
1081 + autocompletepopup="PopupAutoComplete" |
1073 + selectpopup="ContentSelectDropdown" |
1082 + selectpopup="ContentSelectDropdown"/> |
1074 + onclick="contentAreaClick(event, false);"/> |
|
1075 + <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/> |
1083 + <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/> |
1076 + </vbox> |
1084 + </vbox> |
1077 + <splitter id="social-sidebar-splitter" |
1085 + <splitter id="social-sidebar-splitter" |
1078 + class="chromeclass-extrachrome sidebar-splitter" |
1086 + class="chromeclass-extrachrome sidebar-splitter" |
1079 + observes="socialSidebarBroadcaster"/> |
1087 + observes="socialSidebarBroadcaster"/> |
1201 + |
1209 + |
1202 +</window> |
1210 +</window> |
1203 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1211 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1204 --- a/browser/base/jar.mn |
1212 --- a/browser/base/jar.mn |
1205 +++ b/browser/base/jar.mn |
1213 +++ b/browser/base/jar.mn |
1206 @@ -65,16 +65,18 @@ browser.jar: |
1214 @@ -70,16 +70,18 @@ browser.jar: |
1207 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1215 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1208 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1216 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1209 content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
1217 content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
1210 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1218 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1211 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1219 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1215 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1223 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1216 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1224 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1217 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1225 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1218 * content/browser/chatWindow.xul (content/chatWindow.xul) |
1226 * content/browser/chatWindow.xul (content/chatWindow.xul) |
1219 content/browser/content.js (content/content.js) |
1227 content/browser/content.js (content/content.js) |
1220 content/browser/fonts/ClearSans-Regular.woff (content/fonts/ClearSans-Regular.woff) |
|
1221 content/browser/fonts/FiraSans-Regular.woff (content/fonts/FiraSans-Regular.woff) |
|
1222 content/browser/fonts/FiraSans-Light.woff (content/fonts/FiraSans-Light.woff) |
|
1223 content/browser/newtab/newTab.xul (content/newtab/newTab.xul) |
1228 content/browser/newtab/newTab.xul (content/newtab/newTab.xul) |
1224 * content/browser/newtab/newTab.js (content/newtab/newTab.js) |
1229 * content/browser/newtab/newTab.js (content/newtab/newTab.js) |
|
1230 content/browser/newtab/newTab.css (content/newtab/newTab.css) |
|
1231 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
|
1232 content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
1225 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1233 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1226 --- a/browser/components/build/nsModule.cpp |
1234 --- a/browser/components/build/nsModule.cpp |
1227 +++ b/browser/components/build/nsModule.cpp |
1235 +++ b/browser/components/build/nsModule.cpp |
1228 @@ -8,17 +8,17 @@ |
1236 @@ -8,17 +8,17 @@ |
1229 #include "nsBrowserCompsCID.h" |
1237 #include "nsBrowserCompsCID.h" |
1306 // In Windows 8 we launch the control panel since it's the only |
1314 // In Windows 8 we launch the control panel since it's the only |
1307 // way to get all file type association prefs. So we don't know |
1315 // way to get all file type association prefs. So we don't know |
1308 // when the user will select the default. We refresh here periodically |
1316 // when the user will select the default. We refresh here periodically |
1309 // in case the default changes. On other Windows OS's defaults can also |
1317 // in case the default changes. On other Windows OS's defaults can also |
1310 // be set while the prefs are open. |
1318 // be set while the prefs are open. |
1311 @@ -884,14 +890,25 @@ var gAdvancedPane = { |
1319 @@ -875,14 +881,25 @@ var gAdvancedPane = { |
1312 * Set browser as the operating system default browser. |
1320 * Set browser as the operating system default browser. |
1313 */ |
1321 */ |
1314 setDefaultBrowser: function() |
1322 setDefaultBrowser: function() |
1315 { |
1323 { |
1316 let shellSvc = getShellService(); |
1324 let shellSvc = getShellService(); |
1788 + |
1796 + |
1789 +#endif // nsunixshellservice_h____ |
1797 +#endif // nsunixshellservice_h____ |
1790 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1798 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1791 --- a/browser/installer/package-manifest.in |
1799 --- a/browser/installer/package-manifest.in |
1792 +++ b/browser/installer/package-manifest.in |
1800 +++ b/browser/installer/package-manifest.in |
1793 @@ -643,19 +643,21 @@ |
1801 @@ -666,19 +666,21 @@ |
1794 @BINPATH@/defaults/autoconfig/prefcalls.js |
1802 @BINPATH@/defaults/autoconfig/prefcalls.js |
1795 @BINPATH@/browser/defaults/profile/prefs.js |
1803 @BINPATH@/browser/defaults/profile/prefs.js |
1796 |
1804 |
1797 #ifndef LIBXUL_SDK |
1805 #ifndef LIBXUL_SDK |
1798 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1806 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |