diff --git a/src/browser/app/profile/features.inc b/src/browser/app/profile/features.inc index 218598ee9..49d79fab7 100644 --- a/src/browser/app/profile/features.inc +++ b/src/browser/app/profile/features.inc @@ -3,9 +3,9 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/. #ifdef MOZILLA_OFFICIAL -pref('zen.welcome-screen.seen', false, sticky); + pref('zen.welcome-screen.seen', false, sticky); #else -pref('zen.welcome-screen.seen', true, sticky); + pref('zen.welcome-screen.seen', true, sticky); #endif pref('zen.tabs.vertical', true); @@ -32,9 +32,9 @@ pref('zen.haptic-feedback.enabled', true); // Section: Watermark #ifdef MOZILLA_OFFICIAL -pref('zen.watermark.enabled', true, sticky); + pref('zen.watermark.enabled', true, sticky); #else -pref('zen.watermark.enabled', false, sticky); + pref('zen.watermark.enabled', false, sticky); #endif // Startup flags diff --git a/src/browser/app/profile/features/mods.inc b/src/browser/app/profile/features/mods.inc index aa6ffa49c..862ac5fb4 100644 --- a/src/browser/app/profile/features/mods.inc +++ b/src/browser/app/profile/features/mods.inc @@ -5,14 +5,15 @@ pref('zen.mods.updated-value-observer', false); pref('zen.mods.auto-update-days', 20); // In days + #ifdef MOZILLA_OFFICIAL -pref('zen.mods.auto-update', true); -pref('zen.rice.api.url', 'https://share.zen-browser.app', locked); -pref('zen.injections.match-urls', 'https://zen-browser.app/*,https://share.zen-browser.app/*', locked); + pref('zen.mods.auto-update', true); + pref('zen.rice.api.url', 'https://share.zen-browser.app', locked); + pref('zen.injections.match-urls', 'https://zen-browser.app/*,https://share.zen-browser.app/*', locked); #else -pref('zen.mods.auto-update', false); -pref('zen.rice.api.url', "http://localhost", locked); -pref('zen.injections.match-urls', 'http://localhost/*', locked); + pref('zen.mods.auto-update', false); + pref('zen.rice.api.url', "http://localhost", locked); + pref('zen.injections.match-urls', 'http://localhost/*', locked); #endif pref('zen.rice.share.notice.accepted', false); diff --git a/src/browser/app/profile/features/theme.inc b/src/browser/app/profile/features/theme.inc index 7813f2491..b03c3c405 100644 --- a/src/browser/app/profile/features/theme.inc +++ b/src/browser/app/profile/features/theme.inc @@ -9,14 +9,14 @@ pref('zen.theme.gradient.show-custom-colors', false); pref('zen.theme.essentials-favicon-bg', true); #ifdef XP_MACOSX -pref('zen.theme.border-radius', 10); // In pixels + pref('zen.theme.border-radius', 10); // In pixels #else -pref('zen.theme.border-radius', 8); // In pixels + pref('zen.theme.border-radius', 8); // In pixels #endif #ifdef XP_MACOSX -pref('zen.theme.acrylic-elements', false); + pref('zen.theme.acrylic-elements', false); #else -pref('zen.theme.acrylic-elements', false); + pref('zen.theme.acrylic-elements', false); #endif diff --git a/src/browser/app/profile/features/view.inc b/src/browser/app/profile/features/view.inc index bb382b92e..6dba14829 100644 --- a/src/browser/app/profile/features/view.inc +++ b/src/browser/app/profile/features/view.inc @@ -6,18 +6,19 @@ pref('zen.view.sidebar-height-throttle', 200); // in ms pref('zen.view.sidebar-expanded.max-width', 500); #ifdef XP_MACOSX -pref('zen.view.mac.show-three-dot-menu', false); -pref('zen.widget.mac.mono-window-controls', true); + pref('zen.view.mac.show-three-dot-menu', false); + pref('zen.widget.mac.mono-window-controls', true); #endif + pref('zen.view.use-single-toolbar', true); pref('zen.view.sidebar-expanded', true); pref('zen.view.sidebar-collapsed.hide-mute-button', true); pref('zen.view.experimental-force-window-controls-left', false); #ifdef XP_MACOSX -pref('zen.view.grey-out-inactive-windows', false); + pref('zen.view.grey-out-inactive-windows', false); #else -pref('zen.view.grey-out-inactive-windows', true); + pref('zen.view.grey-out-inactive-windows', true); #endif pref('zen.view.hide-window-controls', true); diff --git a/src/browser/app/profile/features/workspaces.inc b/src/browser/app/profile/features/workspaces.inc index 5758d3666..117158f86 100644 --- a/src/browser/app/profile/features/workspaces.inc +++ b/src/browser/app/profile/features/workspaces.inc @@ -14,9 +14,9 @@ pref('services.sync.engine.workspaces', false); pref('zen.workspaces.container-specific-essentials-enabled', false); #ifdef MOZILLA_OFFICIAL -pref('zen.workspaces.debug', false); + pref('zen.workspaces.debug', false); #else -pref('zen.workspaces.debug', true); + pref('zen.workspaces.debug', true); #endif // Section: Pinned tabs management diff --git a/src/browser/app/profile/performance.inc b/src/browser/app/profile/performance.inc index 7bf471843..0c78fa396 100644 --- a/src/browser/app/profile/performance.inc +++ b/src/browser/app/profile/performance.inc @@ -3,16 +3,16 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/. #ifdef XP_MACOSX -// Pref to control the reponse taken on macOS when the OS is under memory -// pressure. Changes to the pref take effect immediately. Browser restart not -// required. The pref value is a bitmask: -// 0x0: No response (other than recording for telemetry, crash reporting) -// 0x1: Use the tab unloading feature to reduce memory use. Requires that -// the above "browser.tabs.unloadOnLowMemory" pref be set to true for tab -// unloading to occur. -// 0x2: Issue the internal "memory-pressure" notification to reduce memory use -// 0x3: Both 0x1 and 0x2. -pref("browser.lowMemoryResponseMask", 3); + // Pref to control the reponse taken on macOS when the OS is under memory + // pressure. Changes to the pref take effect immediately. Browser restart not + // required. The pref value is a bitmask: + // 0x0: No response (other than recording for telemetry, crash reporting) + // 0x1: Use the tab unloading feature to reduce memory use. Requires that + // the above "browser.tabs.unloadOnLowMemory" pref be set to true for tab + // unloading to occur. + // 0x2: Issue the internal "memory-pressure" notification to reduce memory use + // 0x3: Both 0x1 and 0x2. + pref("browser.lowMemoryResponseMask", 3); #endif pref("network.predictor.enable-hover-on-ssl", true); diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js index b63dae74d..523f1ced6 100644 --- a/src/browser/app/profile/zen-browser.js +++ b/src/browser/app/profile/zen-browser.js @@ -15,15 +15,15 @@ pref("intl.multilingual.downloadEnabled", false); pref('toolkit.legacyUserProfileCustomizations.stylesheets', true); #ifdef XP_WIN -#include windows.inc + #include windows.inc #endif #ifdef UNIX_BUT_NOT_MAC -#include linux.inc + #include linux.inc #endif #ifdef XP_MACOSX -#include macos.inc + #include macos.inc #endif #include urlbar.inc @@ -37,7 +37,7 @@ pref('toolkit.legacyUserProfileCustomizations.stylesheets', true); #include features.inc #ifndef XP_MACOSX -#include smoothscroll.inc + #include smoothscroll.inc #endif #include performance.inc