diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-19 12:15:47 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-19 12:15:47 +0100 |
| commit | 2b01522cf3cda6343fab8a6e3482636d0fb6c4bd (patch) | |
| tree | b1117df6517012bf0b98fda6c80295f1405584e9 /toolkit/xre/nsXREDirProvider.cpp | |
| parent | e52c019ec8377859b6df5e50ca40a40ea20702b9 (diff) | |
| download | UXP-2b01522cf3cda6343fab8a6e3482636d0fb6c4bd.tar UXP-2b01522cf3cda6343fab8a6e3482636d0fb6c4bd.tar.gz UXP-2b01522cf3cda6343fab8a6e3482636d0fb6c4bd.tar.lz UXP-2b01522cf3cda6343fab8a6e3482636d0fb6c4bd.tar.xz UXP-2b01522cf3cda6343fab8a6e3482636d0fb6c4bd.zip | |
Remove redundant Vista checks in toolkit/xre
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; } |