1143 + |
1143 + |
1144 +</window> |
1144 +</window> |
1145 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1145 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1146 --- a/browser/base/jar.mn |
1146 --- a/browser/base/jar.mn |
1147 +++ b/browser/base/jar.mn |
1147 +++ b/browser/base/jar.mn |
1148 @@ -60,16 +60,18 @@ browser.jar: |
1148 @@ -58,16 +58,18 @@ browser.jar: |
1149 content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
1149 content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
1150 content/browser/aboutProviderDirectory.xhtml (content/aboutProviderDirectory.xhtml) |
1150 content/browser/aboutProviderDirectory.xhtml (content/aboutProviderDirectory.xhtml) |
1151 content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) |
1151 content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) |
1152 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1152 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1153 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1153 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1225 { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, |
1225 { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, |
1226 #endif |
1226 #endif |
1227 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js |
1227 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js |
1228 --- a/browser/components/preferences/in-content/main.js |
1228 --- a/browser/components/preferences/in-content/main.js |
1229 +++ b/browser/components/preferences/in-content/main.js |
1229 +++ b/browser/components/preferences/in-content/main.js |
1230 @@ -32,16 +32,22 @@ var gMainPane = { |
1230 @@ -34,16 +34,22 @@ var gMainPane = { |
1231 // In Windows 8 we launch the control panel since it's the only |
1231 // In Windows 8 we launch the control panel since it's the only |
1232 // way to get all file type association prefs. So we don't know |
1232 // way to get all file type association prefs. So we don't know |
1233 // when the user will select the default. We refresh here periodically |
1233 // when the user will select the default. We refresh here periodically |
1234 // in case the default changes. On other Windows OS's defaults can also |
1234 // in case the default changes. On other Windows OS's defaults can also |
1235 // be set while the prefs are open. |
1235 // be set while the prefs are open. |
1248 window.addEventListener("focus", this._updateUseCurrentButton.bind(this)); |
1248 window.addEventListener("focus", this._updateUseCurrentButton.bind(this)); |
1249 |
1249 |
1250 this.updateBrowserStartupLastSession(); |
1250 this.updateBrowserStartupLastSession(); |
1251 |
1251 |
1252 if (AppConstants.platform == "win") { |
1252 if (AppConstants.platform == "win") { |
1253 @@ -680,16 +686,27 @@ var gMainPane = { |
1253 @@ -682,16 +688,27 @@ var gMainPane = { |
1254 let alwaysCheckPref = document.getElementById("browser.shell.checkDefaultBrowser"); |
1254 let alwaysCheckPref = document.getElementById("browser.shell.checkDefaultBrowser"); |
1255 alwaysCheckPref.value = true; |
1255 alwaysCheckPref.value = true; |
1256 |
1256 |
1257 let shellSvc = getShellService(); |
1257 let shellSvc = getShellService(); |
1258 if (!shellSvc) |
1258 if (!shellSvc) |
1279 document.getElementById("setDefaultPane").selectedIndex = selectedIndex; |
1279 document.getElementById("setDefaultPane").selectedIndex = selectedIndex; |
1280 } |
1280 } |
1281 diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build |
1281 diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build |
1282 --- a/browser/components/shell/moz.build |
1282 --- a/browser/components/shell/moz.build |
1283 +++ b/browser/components/shell/moz.build |
1283 +++ b/browser/components/shell/moz.build |
1284 @@ -34,16 +34,18 @@ if CONFIG['OS_ARCH'] == 'WINNT': |
1284 @@ -38,16 +38,18 @@ if CONFIG['OS_ARCH'] == 'WINNT': |
1285 ] |
1285 ] |
1286 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': |
1286 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': |
1287 SOURCES += [ |
1287 SOURCES += [ |
1288 'nsMacShellService.cpp', |
1288 'nsMacShellService.cpp', |
1289 ] |
1289 ] |
1591 + |
1591 + |
1592 +#endif // nsunixshellservice_h____ |
1592 +#endif // nsunixshellservice_h____ |
1593 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1593 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1594 --- a/browser/installer/package-manifest.in |
1594 --- a/browser/installer/package-manifest.in |
1595 +++ b/browser/installer/package-manifest.in |
1595 +++ b/browser/installer/package-manifest.in |
1596 @@ -638,16 +638,17 @@ |
1596 @@ -645,16 +645,17 @@ |
1597 @RESPATH@/greprefs.js |
|
1598 @RESPATH@/defaults/autoconfig/prefcalls.js |
1597 @RESPATH@/defaults/autoconfig/prefcalls.js |
1599 @RESPATH@/browser/defaults/permissions |
1598 @RESPATH@/browser/defaults/permissions |
|
1599 @RESPATH@/browser/defaults/blocklists |
1600 |
1600 |
1601 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1601 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1602 ; Technically this is an app pref file, but we are keeping it in the original |
1602 ; Technically this is an app pref file, but we are keeping it in the original |
1603 ; gre location for now. |
1603 ; gre location for now. |
1604 @RESPATH@/defaults/pref/channel-prefs.js |
1604 @RESPATH@/defaults/pref/channel-prefs.js |
1605 +@BINPATH@/defaults/pref/kde.js |
1605 +@BINPATH@/defaults/pref/kde.js |
1606 |
1606 |
|
1607 ; Remote control protocol prefs |
|
1608 ; defined in ../../testing/marionette/prefs/marionette.js |
|
1609 @RESPATH@/defaults/pref/marionette.js |
|
1610 |
1607 ; Services (gre) prefs |
1611 ; Services (gre) prefs |
1608 @RESPATH@/defaults/pref/services-sync.js |
1612 @RESPATH@/defaults/pref/services-sync.js |
1609 |
1613 |
1610 ; [Layout Engine Resources] |
|
1611 ; Style Sheets, Graphics and other Resources used by the layout engine. |
|
1612 @RESPATH@/res/EditorOverride.css |
|
1613 @RESPATH@/res/contenteditable.css |
|