diff options
author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
commit | 39dac57259cff8b61db0b22cb2ad0a8adb02692e (patch) | |
tree | 52a026cc8c22793eb17fd0f5e22adce1ae08a1dd /xpcom/base/nsSystemInfo.h | |
parent | a1cce3b2b00bbd9f4983013ddd8934a7bccb9e99 (diff) | |
parent | c2d9ab62f3d097c9e0e00184cab1f546554f5eaa (diff) | |
download | UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.gz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.lz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.xz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.zip |
Merge branch 'redwood' into 28.9-platform
Diffstat (limited to 'xpcom/base/nsSystemInfo.h')
-rw-r--r-- | xpcom/base/nsSystemInfo.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/xpcom/base/nsSystemInfo.h b/xpcom/base/nsSystemInfo.h index 5a7ef4424..8e9263d3a 100644 --- a/xpcom/base/nsSystemInfo.h +++ b/xpcom/base/nsSystemInfo.h @@ -12,10 +12,6 @@ #include "nsIObserver.h" #endif // defined(XP_WIN) -#ifdef MOZ_WIDGET_ANDROID -#include "mozilla/dom/PContent.h" -#endif // MOZ_WIDGET_ANDROID - class nsSystemInfo final : public nsHashPropertyBag #if defined(XP_WIN) @@ -36,12 +32,6 @@ public: // See comments above the variable definition and in NS_InitXPCOM2. static uint32_t gUserUmask; -#ifdef MOZ_WIDGET_ANDROID - static void GetAndroidSystemInfo(mozilla::dom::AndroidSystemInfo* aInfo); - protected: - void SetupAndroidInfo(const mozilla::dom::AndroidSystemInfo&); -#endif - protected: void SetInt32Property(const nsAString& aPropertyName, const int32_t aValue); |