290 +#include browser-context.inc |
290 +#include browser-context.inc |
291 + </menupopup> |
291 + </menupopup> |
292 + |
292 + |
293 + <menupopup id="placesContext"/> |
293 + <menupopup id="placesContext"/> |
294 + |
294 + |
|
295 + <!-- Popup for site identity information --> |
|
296 + <panel id="identity-popup" |
|
297 + type="arrow" |
|
298 + hidden="true" |
|
299 + noautofocus="true" |
|
300 + consumeoutsideclicks="true" |
|
301 + onpopupshown="if (event.target == this) |
|
302 + gIdentityHandler.onPopupShown(event);" |
|
303 + orient="vertical" |
|
304 + level="top"> |
|
305 + <hbox id="identity-popup-container" align="top"> |
|
306 + <image id="identity-popup-icon"/> |
|
307 + <vbox id="identity-popup-content-box"> |
|
308 + <label id="identity-popup-brandName" |
|
309 + class="identity-popup-label" |
|
310 + value="&brandFullName;"/> |
|
311 + <label id="identity-popup-chromeLabel" |
|
312 + class="identity-popup-label"/> |
|
313 + <label id="identity-popup-connectedToLabel" |
|
314 + class="identity-popup-label" |
|
315 + value="&identity.connectedTo;"/> |
|
316 + <label id="identity-popup-connectedToLabel2" |
|
317 + class="identity-popup-label" |
|
318 + value="&identity.unverifiedsite2;"/> |
|
319 + <description id="identity-popup-content-host" |
|
320 + class="identity-popup-description"/> |
|
321 + <label id="identity-popup-runByLabel" |
|
322 + class="identity-popup-label" |
|
323 + value="&identity.runBy;"/> |
|
324 + <description id="identity-popup-content-owner" |
|
325 + class="identity-popup-description"/> |
|
326 + <description id="identity-popup-content-supplemental" |
|
327 + class="identity-popup-description"/> |
|
328 + <description id="identity-popup-content-verifier" |
|
329 + class="identity-popup-description"/> |
|
330 + <hbox id="identity-popup-encryption" flex="1"> |
|
331 + <vbox> |
|
332 + <image id="identity-popup-encryption-icon"/> |
|
333 + </vbox> |
|
334 + <description id="identity-popup-encryption-label" flex="1" |
|
335 + class="identity-popup-description"/> |
|
336 + </hbox> |
|
337 + <vbox id="identity-popup-permissions"> |
|
338 + <separator class="thin"/> |
|
339 + <label class="identity-popup-label header" |
|
340 + value="&identity.permissions;"/> |
|
341 + <vbox id="identity-popup-permission-list" class="indent"/> |
|
342 + </vbox> |
|
343 + </vbox> |
|
344 + </hbox> |
|
345 + <!-- Footer button to open security page info --> |
|
346 + <hbox id="identity-popup-button-container" pack="end"> |
|
347 + <button id="identity-popup-more-info-button" |
|
348 + label="&identity.moreInfoLinkText;" |
|
349 + oncommand="gIdentityHandler.handleMoreInfoClick(event);"/> |
|
350 + </hbox> |
|
351 + </panel> |
295 + |
352 + |
296 + <panel id="ctrlTab-panel" class="KUI-panel" hidden="true" norestorefocus="true" level="top"> |
353 + <panel id="ctrlTab-panel" class="KUI-panel" hidden="true" norestorefocus="true" level="top"> |
297 + <hbox> |
354 + <hbox> |
298 + <button class="ctrlTab-preview" flex="1"/> |
355 + <button class="ctrlTab-preview" flex="1"/> |
299 + <button class="ctrlTab-preview" flex="1"/> |
356 + <button class="ctrlTab-preview" flex="1"/> |
972 + flex="1" contenttooltip="aHTMLTooltip" |
1029 + flex="1" contenttooltip="aHTMLTooltip" |
973 + tabcontainer="tabbrowser-tabs" |
1030 + tabcontainer="tabbrowser-tabs" |
974 + contentcontextmenu="contentAreaContextMenu" |
1031 + contentcontextmenu="contentAreaContextMenu" |
975 + autocompletepopup="PopupAutoComplete"/> |
1032 + autocompletepopup="PopupAutoComplete"/> |
976 + <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/> |
1033 + <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/> |
977 + <statuspanel id="statusbar-display" inactive="true"/> |
|
978 + </vbox> |
1034 + </vbox> |
979 + <splitter id="social-sidebar-splitter" |
1035 + <splitter id="social-sidebar-splitter" |
980 + class="chromeclass-extrachrome sidebar-splitter" |
1036 + class="chromeclass-extrachrome sidebar-splitter" |
981 + observes="socialSidebarBroadcaster"/> |
1037 + observes="socialSidebarBroadcaster"/> |
982 + <vbox id="social-sidebar-box" |
1038 + <vbox id="social-sidebar-box" |
997 + |
1053 + |
998 + <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
1054 + <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
999 + <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> |
1055 + <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> |
1000 + <vbox id="full-screen-warning-message" align="center"> |
1056 + <vbox id="full-screen-warning-message" align="center"> |
1001 + <description id="full-screen-domain-text"/> |
1057 + <description id="full-screen-domain-text"/> |
1002 + <description class="full-screen-description" value="&fullscreenExitHint.value;"/> |
1058 + <description class="full-screen-description" value="&fullscreenExitHint2.value;"/> |
1003 + <vbox id="full-screen-approval-pane" align="center"> |
1059 + <vbox id="full-screen-approval-pane" align="center"> |
1004 + <description class="full-screen-description" value="&fullscreenApproval.value;"/> |
|
1005 + <hbox> |
1060 + <hbox> |
|
1061 +#ifndef XP_UNIX |
|
1062 + <button label="&fullscreenExitButton.label;" |
|
1063 + oncommand="FullScreen.setFullscreenAllowed(false);" |
|
1064 + class="full-screen-approval-button"/> |
|
1065 + <button label="&fullscreenAllowButton.label;" |
|
1066 + oncommand="FullScreen.setFullscreenAllowed(true);" |
|
1067 + class="full-screen-approval-button"/> |
|
1068 +#else |
1006 + <button label="&fullscreenAllowButton.label;" |
1069 + <button label="&fullscreenAllowButton.label;" |
1007 + oncommand="FullScreen.setFullscreenAllowed(true);" |
1070 + oncommand="FullScreen.setFullscreenAllowed(true);" |
1008 + class="full-screen-approval-button"/> |
1071 + class="full-screen-approval-button"/> |
1009 + <button label="&fullscreenExitButton.label;" |
1072 + <button label="&fullscreenExitButton.label;" |
1010 + oncommand="FullScreen.setFullscreenAllowed(false);" |
1073 + oncommand="FullScreen.setFullscreenAllowed(false);" |
1011 + class="full-screen-approval-button"/> |
1074 + class="full-screen-approval-button"/> |
|
1075 +#endif |
1012 + </hbox> |
1076 + </hbox> |
1013 + <checkbox id="full-screen-remember-decision"/> |
1077 + <checkbox id="full-screen-remember-decision"/> |
1014 + </vbox> |
1078 + </vbox> |
1015 + </vbox> |
1079 + </vbox> |
1016 + </hbox> |
1080 + </hbox> |
1101 + |
1165 + |
1102 +</window> |
1166 +</window> |
1103 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1167 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1104 --- a/browser/base/jar.mn |
1168 --- a/browser/base/jar.mn |
1105 +++ b/browser/base/jar.mn |
1169 +++ b/browser/base/jar.mn |
1106 @@ -53,16 +53,18 @@ browser.jar: |
1170 @@ -52,16 +52,18 @@ browser.jar: |
1107 content/browser/abouthealthreport/abouthealth.css (content/abouthealthreport/abouthealth.css) |
1171 content/browser/abouthealthreport/abouthealth.css (content/abouthealthreport/abouthealth.css) |
1108 #endif |
1172 #endif |
1109 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1173 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1110 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1174 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1111 content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
1175 content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
1206 // In Windows 8 we launch the control panel since it's the only |
1270 // In Windows 8 we launch the control panel since it's the only |
1207 // way to get all file type association prefs. So we don't know |
1271 // way to get all file type association prefs. So we don't know |
1208 // when the user will select the default. We refresh here periodically |
1272 // when the user will select the default. We refresh here periodically |
1209 // in case the default changes. On other Windows OS's defaults can also |
1273 // in case the default changes. On other Windows OS's defaults can also |
1210 // be set while the prefs are open. |
1274 // be set while the prefs are open. |
1211 @@ -857,14 +863,25 @@ var gAdvancedPane = { |
1275 @@ -860,14 +866,25 @@ var gAdvancedPane = { |
1212 * Set browser as the operating system default browser. |
1276 * Set browser as the operating system default browser. |
1213 */ |
1277 */ |
1214 setDefaultBrowser: function() |
1278 setDefaultBrowser: function() |
1215 { |
1279 { |
1216 let shellSvc = getShellService(); |
1280 let shellSvc = getShellService(); |
1235 #endif |
1299 #endif |
1236 }; |
1300 }; |
1237 diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in |
1301 diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in |
1238 --- a/browser/components/shell/src/Makefile.in |
1302 --- a/browser/components/shell/src/Makefile.in |
1239 +++ b/browser/components/shell/src/Makefile.in |
1303 +++ b/browser/components/shell/src/Makefile.in |
1240 @@ -17,10 +17,12 @@ DISABLED_EXTRA_COMPONENTS = nsSetDefault |
1304 @@ -16,10 +16,12 @@ USE_STATIC_LIBS = 1 |
1241 |
1305 |
1242 include $(topsrcdir)/config/rules.mk |
1306 include $(topsrcdir)/config/rules.mk |
1243 |
1307 |
1244 DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\" \ |
1308 DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\" \ |
1245 -DMOZ_APP_VERSION=\"$(MOZ_APP_VERSION)\" |
1309 -DMOZ_APP_VERSION=\"$(MOZ_APP_VERSION)\" |
1684 + |
1748 + |
1685 +#endif // nsunixshellservice_h____ |
1749 +#endif // nsunixshellservice_h____ |
1686 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1750 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1687 --- a/browser/installer/package-manifest.in |
1751 --- a/browser/installer/package-manifest.in |
1688 +++ b/browser/installer/package-manifest.in |
1752 +++ b/browser/installer/package-manifest.in |
1689 @@ -601,19 +601,21 @@ |
1753 @@ -606,19 +606,21 @@ |
1690 @BINPATH@/defaults/autoconfig/prefcalls.js |
1754 @BINPATH@/defaults/autoconfig/prefcalls.js |
1691 @BINPATH@/browser/defaults/profile/prefs.js |
1755 @BINPATH@/browser/defaults/profile/prefs.js |
1692 |
1756 |
1693 #ifndef LIBXUL_SDK |
1757 #ifndef LIBXUL_SDK |
1694 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1758 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |