diff options
| author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-03-30 09:44:21 +0200 |
|---|---|---|
| committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-03-30 09:44:21 +0200 |
| commit | a1a007a4856fa50d6d811c2268f881e3666f4c67 (patch) | |
| tree | 24b082c1bfb5777f1770c82a534bf765160bc1b8 /toolkit/xre/nsXREDirProvider.cpp | |
| parent | eddd0de2ae80e176011f41a5400e81522d53f4f3 (diff) | |
| parent | 59bf4204a84f7638d3f89a29bc7c04e5dc401369 (diff) | |
| download | UXP-a1a007a4856fa50d6d811c2268f881e3666f4c67.tar UXP-a1a007a4856fa50d6d811c2268f881e3666f4c67.tar.gz UXP-a1a007a4856fa50d6d811c2268f881e3666f4c67.tar.lz UXP-a1a007a4856fa50d6d811c2268f881e3666f4c67.tar.xz UXP-a1a007a4856fa50d6d811c2268f881e3666f4c67.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into html_input_datetime_1
Diffstat (limited to 'toolkit/xre/nsXREDirProvider.cpp')
| -rw-r--r-- | toolkit/xre/nsXREDirProvider.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp index 2fbd324b7..09168319f 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp @@ -48,7 +48,6 @@ #ifdef XP_WIN #include <windows.h> #include <shlobj.h> -#include "mozilla/WindowsVersion.h" #endif #ifdef XP_MACOSX #include "nsILocalFileMac.h" @@ -762,15 +761,12 @@ nsXREDirProvider::LoadContentProcessTempDir() static bool IsContentSandboxDisabled() { + bool isSandboxDisabled = false; if (!BrowserTabsRemoteAutostart()) { return false; } -#if defined(XP_WIN) - const bool isSandboxDisabled = !mozilla::IsVistaOrLater() || - (Preferences::GetInt("security.sandbox.content.level") < 1); -#elif defined(XP_MACOSX) - const bool isSandboxDisabled = - Preferences::GetInt("security.sandbox.content.level") < 1; +#if defined(XP_WIN) || defined(XP_MACOSX) + isSandboxDisabled = Preferences::GetInt("security.sandbox.content.level") < 1; #endif return isSandboxDisabled; } |