1300 + |
1300 + |
1301 +</window> |
1301 +</window> |
1302 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1302 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1303 --- a/browser/base/jar.mn |
1303 --- a/browser/base/jar.mn |
1304 +++ b/browser/base/jar.mn |
1304 +++ b/browser/base/jar.mn |
1305 @@ -44,16 +44,18 @@ browser.jar: |
1305 @@ -24,16 +24,18 @@ browser.jar: |
1306 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1306 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1307 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1307 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1308 content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) |
1308 content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) |
1309 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1309 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1310 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1310 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1312 content/browser/browser.js (content/browser.js) |
1312 content/browser/browser.js (content/browser.js) |
1313 * content/browser/browser.xul (content/browser.xul) |
1313 * content/browser/browser.xul (content/browser.xul) |
1314 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1314 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1315 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1315 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1316 content/browser/browser-addons.js (content/browser-addons.js) |
1316 content/browser/browser-addons.js (content/browser-addons.js) |
|
1317 content/browser/browser-allTabsMenu.js (content/browser-allTabsMenu.js) |
1317 content/browser/browser-captivePortal.js (content/browser-captivePortal.js) |
1318 content/browser/browser-captivePortal.js (content/browser-captivePortal.js) |
1318 content/browser/browser-ctrlTab.js (content/browser-ctrlTab.js) |
1319 content/browser/browser-ctrlTab.js (content/browser-ctrlTab.js) |
1319 content/browser/browser-customization.js (content/browser-customization.js) |
1320 content/browser/browser-customization.js (content/browser-customization.js) |
1320 content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js) |
1321 content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js) |
1321 content/browser/browser-compacttheme.js (content/browser-compacttheme.js) |
1322 content/browser/browser-compacttheme.js (content/browser-compacttheme.js) |
1322 #ifndef MOZILLA_OFFICIAL |
1323 #ifndef MOZILLA_OFFICIAL |
1323 content/browser/browser-development-helpers.js (content/browser-development-helpers.js) |
|
1324 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1324 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1325 --- a/browser/components/build/nsModule.cpp |
1325 --- a/browser/components/build/nsModule.cpp |
1326 +++ b/browser/components/build/nsModule.cpp |
1326 +++ b/browser/components/build/nsModule.cpp |
1327 @@ -8,17 +8,17 @@ |
1327 @@ -8,17 +8,17 @@ |
1328 #include "nsBrowserCompsCID.h" |
1328 #include "nsBrowserCompsCID.h" |
1339 |
1339 |
1340 #if defined(XP_WIN) |
1340 #if defined(XP_WIN) |
1341 #include "nsIEHistoryEnumerator.h" |
1341 #include "nsIEHistoryEnumerator.h" |
1342 #endif |
1342 #endif |
1343 |
1343 |
1344 #include "rdf.h" |
|
1345 #include "nsFeedSniffer.h" |
1344 #include "nsFeedSniffer.h" |
1346 @@ -31,18 +31,16 @@ using namespace mozilla::browser; |
1345 #include "AboutRedirector.h" |
|
1346 @@ -30,18 +30,16 @@ using namespace mozilla::browser; |
1347 |
1347 |
1348 ///////////////////////////////////////////////////////////////////////////// |
1348 ///////////////////////////////////////////////////////////////////////////// |
1349 |
1349 |
1350 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
1350 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
1351 #if defined(XP_WIN) |
1351 #if defined(XP_WIN) |
1360 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator) |
1360 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator) |
1361 #endif |
1361 #endif |
1362 |
1362 |
1363 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer) |
1363 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer) |
1364 |
1364 |
1365 @@ -60,17 +58,17 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUME |
1365 @@ -59,17 +57,17 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUME |
1366 NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID); |
1366 NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID); |
1367 #endif |
1367 #endif |
1368 |
1368 |
1369 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1369 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1370 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, nullptr, DirectoryProviderConstructor }, |
1370 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, nullptr, DirectoryProviderConstructor }, |
1382 { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, |
1382 { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, |
1383 #endif |
1383 #endif |
1384 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js |
1384 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js |
1385 --- a/browser/components/preferences/in-content/main.js |
1385 --- a/browser/components/preferences/in-content/main.js |
1386 +++ b/browser/components/preferences/in-content/main.js |
1386 +++ b/browser/components/preferences/in-content/main.js |
1387 @@ -327,16 +327,23 @@ var gMainPane = { |
1387 @@ -321,16 +321,23 @@ var gMainPane = { |
1388 this._backoffIndex++ : backoffTimes.length - 1]); |
1388 this._backoffIndex++ : backoffTimes.length - 1]); |
1389 }; |
1389 }; |
1390 |
1390 |
1391 window.setTimeout(() => { |
1391 window.setTimeout(() => { |
1392 window.requestIdleCallback(pollForDefaultBrowser); |
1392 window.requestIdleCallback(pollForDefaultBrowser); |
1406 let performanceSettingsLink = document.getElementById("performanceSettingsLearnMore"); |
1406 let performanceSettingsLink = document.getElementById("performanceSettingsLearnMore"); |
1407 let performanceSettingsUrl = Services.urlFormatter.formatURLPref("app.support.baseURL") + "performance"; |
1407 let performanceSettingsUrl = Services.urlFormatter.formatURLPref("app.support.baseURL") + "performance"; |
1408 performanceSettingsLink.setAttribute("href", performanceSettingsUrl); |
1408 performanceSettingsLink.setAttribute("href", performanceSettingsUrl); |
1409 |
1409 |
1410 this.updateDefaultPerformanceSettingsPref(); |
1410 this.updateDefaultPerformanceSettingsPref(); |
1411 @@ -868,16 +875,27 @@ var gMainPane = { |
1411 @@ -861,16 +868,27 @@ var gMainPane = { |
1412 // Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser. |
1412 // Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser. |
1413 this._backoffIndex = 0; |
1413 this._backoffIndex = 0; |
1414 |
1414 |
1415 let shellSvc = getShellService(); |
1415 let shellSvc = getShellService(); |
1416 if (!shellSvc) |
1416 if (!shellSvc) |
1750 + |
1750 + |
1751 +#endif // nsunixshellservice_h____ |
1751 +#endif // nsunixshellservice_h____ |
1752 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1752 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1753 --- a/browser/installer/package-manifest.in |
1753 --- a/browser/installer/package-manifest.in |
1754 +++ b/browser/installer/package-manifest.in |
1754 +++ b/browser/installer/package-manifest.in |
1755 @@ -452,16 +452,18 @@ |
1755 @@ -455,16 +455,18 @@ |
1756 @RESPATH@/browser/defaults/blocklists |
1756 @RESPATH@/browser/defaults/settings/pinning |
1757 @RESPATH@/browser/defaults/pinning |
1757 @RESPATH@/browser/defaults/settings/main |
1758 |
1758 |
1759 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1759 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1760 ; Technically this is an app pref file, but we are keeping it in the original |
1760 ; Technically this is an app pref file, but we are keeping it in the original |
1761 ; gre location for now. |
1761 ; gre location for now. |
1762 @RESPATH@/defaults/pref/channel-prefs.js |
1762 @RESPATH@/defaults/pref/channel-prefs.js |