1328 +</window> |
1328 +</window> |
1329 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1329 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1330 --- a/browser/base/jar.mn |
1330 --- a/browser/base/jar.mn |
1331 +++ b/browser/base/jar.mn |
1331 +++ b/browser/base/jar.mn |
1332 @@ -58,16 +58,18 @@ browser.jar: |
1332 @@ -58,16 +58,18 @@ browser.jar: |
1333 content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
1333 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1334 content/browser/aboutProviderDirectory.xhtml (content/aboutProviderDirectory.xhtml) |
1334 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1335 content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) |
1335 content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) |
1336 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1336 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1337 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1337 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1338 * content/browser/browser.css (content/browser.css) |
1338 * content/browser/browser.css (content/browser.css) |
1339 content/browser/browser.js (content/browser.js) |
1339 content/browser/browser.js (content/browser.js) |
1344 content/browser/browser-captivePortal.js (content/browser-captivePortal.js) |
1344 content/browser/browser-captivePortal.js (content/browser-captivePortal.js) |
1345 content/browser/browser-ctrlTab.js (content/browser-ctrlTab.js) |
1345 content/browser/browser-ctrlTab.js (content/browser-ctrlTab.js) |
1346 content/browser/browser-customization.js (content/browser-customization.js) |
1346 content/browser/browser-customization.js (content/browser-customization.js) |
1347 content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js) |
1347 content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js) |
1348 content/browser/browser-compacttheme.js (content/browser-compacttheme.js) |
1348 content/browser/browser-compacttheme.js (content/browser-compacttheme.js) |
1349 content/browser/browser-feeds.js (content/browser-feeds.js) |
1349 #ifndef MOZILLA_OFFICIAL |
1350 content/browser/browser-fullScreenAndPointerLock.js (content/browser-fullScreenAndPointerLock.js) |
1350 content/browser/browser-development-helpers.js (content/browser-development-helpers.js) |
1351 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1351 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1352 --- a/browser/components/build/nsModule.cpp |
1352 --- a/browser/components/build/nsModule.cpp |
1353 +++ b/browser/components/build/nsModule.cpp |
1353 +++ b/browser/components/build/nsModule.cpp |
1354 @@ -8,17 +8,17 @@ |
1354 @@ -8,17 +8,17 @@ |
1355 #include "nsBrowserCompsCID.h" |
1355 #include "nsBrowserCompsCID.h" |
1387 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator) |
1387 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator) |
1388 #endif |
1388 #endif |
1389 |
1389 |
1390 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer) |
1390 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer) |
1391 |
1391 |
1392 @@ -60,17 +58,17 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUME |
1392 @@ -64,17 +62,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID) |
1393 NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID); |
1393 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSessionStoreUtils) |
1394 #endif |
1394 NS_DEFINE_NAMED_CID(NS_SESSIONSTOREUTILS_CID); |
1395 |
1395 |
1396 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1396 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1397 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, nullptr, DirectoryProviderConstructor }, |
1397 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, nullptr, DirectoryProviderConstructor }, |
1398 #if defined(XP_WIN) |
1398 #if defined(XP_WIN) |
1399 { &kNS_SHELLSERVICE_CID, false, nullptr, nsWindowsShellServiceConstructor }, |
1399 { &kNS_SHELLSERVICE_CID, false, nullptr, nsWindowsShellServiceConstructor }, |
1409 { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, |
1409 { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, |
1410 #endif |
1410 #endif |
1411 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js |
1411 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js |
1412 --- a/browser/components/preferences/in-content/main.js |
1412 --- a/browser/components/preferences/in-content/main.js |
1413 +++ b/browser/components/preferences/in-content/main.js |
1413 +++ b/browser/components/preferences/in-content/main.js |
1414 @@ -41,16 +41,23 @@ var gMainPane = { |
1414 @@ -203,16 +203,23 @@ var gMainPane = { |
1415 // way to get all file type association prefs. So we don't know |
1415 this._backoffIndex++ : backoffTimes.length - 1]); |
1416 // when the user will select the default. We refresh here periodically |
1416 }; |
1417 // in case the default changes. On other Windows OS's defaults can also |
1417 |
1418 // be set while the prefs are open. |
1418 window.setTimeout(() => { |
1419 window.setInterval(this.updateSetDefaultBrowser.bind(this), 1000); |
1419 window.requestIdleCallback(pollForDefaultBrowser); |
1420 } |
1420 }, backoffTimes[this._backoffIndex]); |
1421 } |
1421 } |
1422 |
1422 |
1423 + var env = Components.classes["@mozilla.org/process/environment;1"] |
1423 + var env = Components.classes["@mozilla.org/process/environment;1"] |
1424 + .getService(Components.interfaces.nsIEnvironment); |
1424 + .getService(Components.interfaces.nsIEnvironment); |
1425 + var kde_session = 0; |
1425 + var kde_session = 0; |
1426 + if (env.get('KDE_FULL_SESSION') == "true") { |
1426 + if (env.get('KDE_FULL_SESSION') == "true") { |
1427 + kde_session = 1; |
1427 + kde_session = 1; |
1428 + } |
1428 + } |
1429 + |
1429 + |
|
1430 this.initBrowserContainers(); |
1430 this.buildContentProcessCountMenuList(); |
1431 this.buildContentProcessCountMenuList(); |
|
1432 |
|
1433 let performanceSettingsLink = document.getElementById("performanceSettingsLearnMore"); |
|
1434 let performanceSettingsUrl = Services.urlFormatter.formatURLPref("app.support.baseURL") + "performance"; |
|
1435 performanceSettingsLink.setAttribute("href", performanceSettingsUrl); |
|
1436 |
1431 this.updateDefaultPerformanceSettingsPref(); |
1437 this.updateDefaultPerformanceSettingsPref(); |
1432 |
1438 @@ -952,16 +959,27 @@ var gMainPane = { |
1433 let defaultPerformancePref = |
1439 // Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser. |
1434 document.getElementById("browser.preferences.defaultPerformanceSettings.enabled"); |
1440 this._backoffIndex = 0; |
1435 defaultPerformancePref.addEventListener("change", () => { |
|
1436 this.updatePerformanceSettingsBox({duringChangeEvent: true}); |
|
1437 }); |
|
1438 @@ -875,16 +882,27 @@ var gMainPane = { |
|
1439 let alwaysCheckPref = document.getElementById("browser.shell.checkDefaultBrowser"); |
|
1440 alwaysCheckPref.value = true; |
|
1441 |
1441 |
1442 let shellSvc = getShellService(); |
1442 let shellSvc = getShellService(); |
1443 if (!shellSvc) |
1443 if (!shellSvc) |
1444 return; |
1444 return; |
1445 try { |
1445 try { |
1464 document.getElementById("setDefaultPane").selectedIndex = selectedIndex; |
1464 document.getElementById("setDefaultPane").selectedIndex = selectedIndex; |
1465 } |
1465 } |
1466 diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build |
1466 diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build |
1467 --- a/browser/components/shell/moz.build |
1467 --- a/browser/components/shell/moz.build |
1468 +++ b/browser/components/shell/moz.build |
1468 +++ b/browser/components/shell/moz.build |
1469 @@ -38,16 +38,18 @@ if CONFIG['OS_ARCH'] == 'WINNT': |
1469 @@ -39,16 +39,18 @@ if CONFIG['OS_ARCH'] == 'WINNT': |
1470 ] |
1470 ] |
1471 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': |
1471 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': |
1472 SOURCES += [ |
1472 SOURCES += [ |
1473 'nsMacShellService.cpp', |
1473 'nsMacShellService.cpp', |
1474 ] |
1474 ] |
1776 + |
1776 + |
1777 +#endif // nsunixshellservice_h____ |
1777 +#endif // nsunixshellservice_h____ |
1778 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1778 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1779 --- a/browser/installer/package-manifest.in |
1779 --- a/browser/installer/package-manifest.in |
1780 +++ b/browser/installer/package-manifest.in |
1780 +++ b/browser/installer/package-manifest.in |
1781 @@ -664,16 +664,18 @@ |
1781 @@ -666,16 +666,18 @@ |
1782 @RESPATH@/browser/defaults/blocklists |
1782 @RESPATH@/browser/defaults/blocklists |
1783 @RESPATH@/browser/defaults/pinning |
1783 @RESPATH@/browser/defaults/pinning |
1784 |
1784 |
1785 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1785 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1786 ; Technically this is an app pref file, but we are keeping it in the original |
1786 ; Technically this is an app pref file, but we are keeping it in the original |