1247 default="true" |
1247 default="true" |
1248 oncommand="StarUI.panel.hidePopup();"/> |
1248 oncommand="StarUI.panel.hidePopup();"/> |
1249 <button id="editBookmarkPanelDeleteButton" |
1249 <button id="editBookmarkPanelDeleteButton" |
1250 class="editBookmarkPanelBottomButton" |
1250 class="editBookmarkPanelBottomButton" |
1251 label="&editBookmark.cancel.label;" |
1251 label="&editBookmark.cancel.label;" |
1252 @@ -1150,17 +1150,17 @@ |
1252 @@ -1153,17 +1153,17 @@ |
1253 |
1253 |
1254 <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
1254 <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
1255 <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> |
1255 <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> |
1256 <vbox id="full-screen-warning-message" align="center"> |
1256 <vbox id="full-screen-warning-message" align="center"> |
1257 <description id="full-screen-domain-text"/> |
1257 <description id="full-screen-domain-text"/> |
1269 #else |
1269 #else |
1270 <button label="&fullscreenAllowButton.label;" |
1270 <button label="&fullscreenAllowButton.label;" |
1271 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1271 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1272 --- a/browser/base/jar.mn |
1272 --- a/browser/base/jar.mn |
1273 +++ b/browser/base/jar.mn |
1273 +++ b/browser/base/jar.mn |
1274 @@ -70,16 +70,18 @@ browser.jar: |
1274 @@ -69,16 +69,18 @@ browser.jar: |
1275 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
|
1276 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1275 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1277 content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
1276 content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
|
1277 content/browser/aboutProviderDirectory.xhtml (content/aboutProviderDirectory.xhtml) |
1278 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1278 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1279 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1279 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1280 * content/browser/browser.css (content/browser.css) |
1280 * content/browser/browser.css (content/browser.css) |
1281 * content/browser/browser.js (content/browser.js) |
1281 * content/browser/browser.js (content/browser.js) |
1282 * content/browser/browser.xul (content/browser.xul) |
1282 * content/browser/browser.xul (content/browser.xul) |
1374 // In Windows 8 we launch the control panel since it's the only |
1374 // In Windows 8 we launch the control panel since it's the only |
1375 // way to get all file type association prefs. So we don't know |
1375 // way to get all file type association prefs. So we don't know |
1376 // when the user will select the default. We refresh here periodically |
1376 // when the user will select the default. We refresh here periodically |
1377 // in case the default changes. On other Windows OS's defaults can also |
1377 // in case the default changes. On other Windows OS's defaults can also |
1378 // be set while the prefs are open. |
1378 // be set while the prefs are open. |
1379 @@ -497,16 +503,27 @@ var gMainPane = { |
1379 @@ -572,16 +578,27 @@ var gMainPane = { |
1380 */ |
1380 */ |
1381 setDefaultBrowser: function() |
1381 setDefaultBrowser: function() |
1382 { |
1382 { |
1383 let shellSvc = getShellService(); |
1383 let shellSvc = getShellService(); |
1384 if (!shellSvc) |
1384 if (!shellSvc) |
1842 + |
1842 + |
1843 +#endif // nsunixshellservice_h____ |
1843 +#endif // nsunixshellservice_h____ |
1844 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1844 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1845 --- a/browser/installer/package-manifest.in |
1845 --- a/browser/installer/package-manifest.in |
1846 +++ b/browser/installer/package-manifest.in |
1846 +++ b/browser/installer/package-manifest.in |
1847 @@ -685,19 +685,21 @@ |
1847 @@ -697,19 +697,21 @@ |
1848 @BINPATH@/defaults/autoconfig/prefcalls.js |
1848 @BINPATH@/defaults/autoconfig/prefcalls.js |
1849 @BINPATH@/browser/defaults/profile/prefs.js |
1849 @BINPATH@/browser/defaults/profile/prefs.js |
1850 |
1850 |
1851 #ifndef LIBXUL_SDK |
1851 #ifndef LIBXUL_SDK |
1852 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1852 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |