diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-03 01:24:31 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-03 01:24:31 +0200 |
| commit | 4613b91ecac2745252c40be64e73de5ff920b02b (patch) | |
| tree | 26b0aa50bb4d580b156ab2eb9825707a17f51e99 /xpcom/build | |
| parent | e1490c07e29f5e4715f73088b7ca7aab4ada90a6 (diff) | |
| download | UXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar UXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar.gz UXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar.lz UXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar.xz UXP-4613b91ecac2745252c40be64e73de5ff920b02b.zip | |
Remove sandbox ductwork conditional code.
Diffstat (limited to 'xpcom/build')
| -rw-r--r-- | xpcom/build/XREChildData.h | 19 | ||||
| -rw-r--r-- | xpcom/build/XREShellData.h | 12 | ||||
| -rw-r--r-- | xpcom/build/nsXREAppData.h | 13 |
3 files changed, 0 insertions, 44 deletions
diff --git a/xpcom/build/XREChildData.h b/xpcom/build/XREChildData.h index 487fede94..96b297d3c 100644 --- a/xpcom/build/XREChildData.h +++ b/xpcom/build/XREChildData.h @@ -9,14 +9,6 @@ #include "mozilla/UniquePtr.h" -#if defined(XP_WIN) && defined(MOZ_SANDBOX) -#include "mozilla/sandboxing/loggingTypes.h" - -namespace sandbox { -class TargetServices; -} -#endif - namespace mozilla { namespace gmp { class GMPLoader; @@ -35,17 +27,6 @@ struct XREChildData mozilla::UniquePtr<mozilla::gmp::GMPLoader> gmpLoader; #endif -#if defined(XP_WIN) && defined(MOZ_SANDBOX) - /** - * Chromium sandbox TargetServices. - */ - sandbox::TargetServices* sandboxTargetServices = nullptr; - - /** - * Function to provide a logging function to the chromium sandbox code. - */ - mozilla::sandboxing::ProvideLogFunctionCb ProvideLogFunction = nullptr; -#endif }; #endif // XREChildData_h diff --git a/xpcom/build/XREShellData.h b/xpcom/build/XREShellData.h index 11bc162d9..f734b1d74 100644 --- a/xpcom/build/XREShellData.h +++ b/xpcom/build/XREShellData.h @@ -7,23 +7,11 @@ #ifndef XREShellData_h #define XREShellData_h -#if defined(XP_WIN) && defined(MOZ_SANDBOX) -namespace sandbox { -class BrokerServices; -} -#endif - /** * Data needed by XRE_XPCShellMain. */ struct XREShellData { -#if defined(XP_WIN) && defined(MOZ_SANDBOX) - /** - * Chromium sandbox BrokerServices. - */ - sandbox::BrokerServices* sandboxBrokerServices; -#endif }; #endif // XREShellData_h diff --git a/xpcom/build/nsXREAppData.h b/xpcom/build/nsXREAppData.h index fbc7adb8f..129336ac9 100644 --- a/xpcom/build/nsXREAppData.h +++ b/xpcom/build/nsXREAppData.h @@ -12,12 +12,6 @@ class nsIFile; -#if defined(XP_WIN) && defined(MOZ_SANDBOX) -namespace sandbox { -class BrokerServices; -} -#endif - /** * Application-specific data needed to start the apprunner. * @@ -134,13 +128,6 @@ struct nsXREAppData * The application name to use in the User Agent string. */ const char* UAName; - -#if defined(XP_WIN) && defined(MOZ_SANDBOX) - /** - * Chromium sandbox BrokerServices. - */ - sandbox::BrokerServices* sandboxBrokerServices; -#endif }; /** |