From 536562284f1ffe459f432f5810d59dcb6eadb8cc Mon Sep 17 00:00:00 2001 From: trav90 Date: Sat, 12 May 2018 08:19:07 -0500 Subject: Make safebrowsing optional at build time - Part 3: toolkit/ --- toolkit/modules/AppConstants.jsm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'toolkit/modules') diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm index c500b21e8..c2abc939c 100644 --- a/toolkit/modules/AppConstants.jsm +++ b/toolkit/modules/AppConstants.jsm @@ -81,6 +81,13 @@ this.AppConstants = Object.freeze({ false, #endif +MOZ_SAFE_BROWSING: +#ifdef MOZ_SAFE_BROWSING + true, +#else + false, +#endif + MOZ_TELEMETRY_REPORTING: #ifdef MOZ_TELEMETRY_REPORTING true, -- cgit v1.2.3 From ac25827a87d86f1cf9e48aab6605f77a2c89041a Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Thu, 24 May 2018 14:06:04 +0200 Subject: Remove SPS profiler. - Conditionals and code blocks. (MOZ_ENABLE_PROFILER_SPS) - Stub out several profiler-only functions. --- toolkit/modules/AppConstants.jsm | 7 ------- toolkit/modules/Services.jsm | 3 --- 2 files changed, 10 deletions(-) (limited to 'toolkit/modules') diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm index d22625d14..7c8a046e9 100644 --- a/toolkit/modules/AppConstants.jsm +++ b/toolkit/modules/AppConstants.jsm @@ -257,13 +257,6 @@ MOZ_SAFE_BROWSING: false, #endif - MOZ_ENABLE_PROFILER_SPS: -#ifdef MOZ_ENABLE_PROFILER_SPS - true, -#else - false, -#endif - MOZ_ANDROID_ACTIVITY_STREAM: #ifdef MOZ_ANDROID_ACTIVITY_STREAM true, diff --git a/toolkit/modules/Services.jsm b/toolkit/modules/Services.jsm index 58d87ffb1..1796acd4c 100644 --- a/toolkit/modules/Services.jsm +++ b/toolkit/modules/Services.jsm @@ -72,9 +72,6 @@ var initTable = [ ["obs", "@mozilla.org/observer-service;1", "nsIObserverService"], ["perms", "@mozilla.org/permissionmanager;1", "nsIPermissionManager"], ["prompt", "@mozilla.org/embedcomp/prompt-service;1", "nsIPromptService"], -#ifdef MOZ_ENABLE_PROFILER_SPS - ["profiler", "@mozilla.org/tools/profiler;1", "nsIProfiler"], -#endif ["scriptloader", "@mozilla.org/moz/jssubscript-loader;1", "mozIJSSubScriptLoader"], ["scriptSecurityManager", "@mozilla.org/scriptsecuritymanager;1", "nsIScriptSecurityManager"], #ifdef MOZ_TOOLKIT_SEARCH -- cgit v1.2.3 From 3a9d1b5351f275ae49a93ea36934c4a8a65ad93b Mon Sep 17 00:00:00 2001 From: Ascrod <32915892+Ascrod@users.noreply.github.com> Date: Thu, 24 May 2018 16:29:56 -0400 Subject: Remove the Social API --- toolkit/modules/Troubleshoot.jsm | 1 - 1 file changed, 1 deletion(-) (limited to 'toolkit/modules') diff --git a/toolkit/modules/Troubleshoot.jsm b/toolkit/modules/Troubleshoot.jsm index e11d47774..42f3fb809 100644 --- a/toolkit/modules/Troubleshoot.jsm +++ b/toolkit/modules/Troubleshoot.jsm @@ -83,7 +83,6 @@ const PREFS_WHITELIST = [ "services.sync.lastSync", "services.sync.numClients", "services.sync.engine.", - "social.enabled", "storage.vacuum.last.", "svg.", "toolkit.startup.recent_crashes", -- cgit v1.2.3 From 72bab89cf6c77c9ee95a977c306e6ce317b84835 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Fri, 25 May 2018 20:45:48 +0000 Subject: Revert "Remove the Social API" --- toolkit/modules/Troubleshoot.jsm | 1 + 1 file changed, 1 insertion(+) (limited to 'toolkit/modules') diff --git a/toolkit/modules/Troubleshoot.jsm b/toolkit/modules/Troubleshoot.jsm index 42f3fb809..e11d47774 100644 --- a/toolkit/modules/Troubleshoot.jsm +++ b/toolkit/modules/Troubleshoot.jsm @@ -83,6 +83,7 @@ const PREFS_WHITELIST = [ "services.sync.lastSync", "services.sync.numClients", "services.sync.engine.", + "social.enabled", "storage.vacuum.last.", "svg.", "toolkit.startup.recent_crashes", -- cgit v1.2.3 From 5f89c3da66862d82fa27092986c4065aba3574ff Mon Sep 17 00:00:00 2001 From: Ascrod <32915892+Ascrod@users.noreply.github.com> Date: Wed, 30 May 2018 17:45:05 -0400 Subject: Remove Social API. --- toolkit/modules/Troubleshoot.jsm | 1 - 1 file changed, 1 deletion(-) (limited to 'toolkit/modules') diff --git a/toolkit/modules/Troubleshoot.jsm b/toolkit/modules/Troubleshoot.jsm index e11d47774..42f3fb809 100644 --- a/toolkit/modules/Troubleshoot.jsm +++ b/toolkit/modules/Troubleshoot.jsm @@ -83,7 +83,6 @@ const PREFS_WHITELIST = [ "services.sync.lastSync", "services.sync.numClients", "services.sync.engine.", - "social.enabled", "storage.vacuum.last.", "svg.", "toolkit.startup.recent_crashes", -- cgit v1.2.3