diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-31 09:45:25 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-31 09:45:25 +0200 |
| commit | 2d4ff8df91414b42974c72b2870f5c6e9ad397a8 (patch) | |
| tree | 15b23dc6494a147e723cfdb3765be1568cf6c113 /toolkit/modules | |
| parent | f4b8be889cb7ee31a62af5660f36aaa192599009 (diff) | |
| parent | 14eb8dc7bee8670e39d1199591d335579601f2ad (diff) | |
| download | UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar.gz UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar.lz UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar.xz UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.zip | |
Merge branch 'master' into Basilisk-release
Diffstat (limited to 'toolkit/modules')
| -rw-r--r-- | toolkit/modules/AppConstants.jsm | 14 | ||||
| -rw-r--r-- | toolkit/modules/Services.jsm | 3 | ||||
| -rw-r--r-- | toolkit/modules/Troubleshoot.jsm | 1 |
3 files changed, 7 insertions, 11 deletions
diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm index a0ca00935..7c8a046e9 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, @@ -250,13 +257,6 @@ this.AppConstants = Object.freeze({ 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 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", |