diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-02-25 19:45:39 -0500 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 12:56:02 +0200 |
| commit | d20ca24a070d547be3bce4d513ef151b6be5f955 (patch) | |
| tree | b0b56d41c3f41db217e8f894c0545a0217dbba4f /toolkit/components/alerts | |
| parent | b2ca17a29814f6aaf043240cd1ec2f86ca989419 (diff) | |
| download | UXP-d20ca24a070d547be3bce4d513ef151b6be5f955.tar UXP-d20ca24a070d547be3bce4d513ef151b6be5f955.tar.gz UXP-d20ca24a070d547be3bce4d513ef151b6be5f955.tar.lz UXP-d20ca24a070d547be3bce4d513ef151b6be5f955.tar.xz UXP-d20ca24a070d547be3bce4d513ef151b6be5f955.zip | |
Issue #1053 - Remove android support from toolkit
Note: Does not remove support completely from toolkit/mozapps/installer or from telemetry or AppConstants.jsm
Diffstat (limited to 'toolkit/components/alerts')
| -rw-r--r-- | toolkit/components/alerts/nsAlertsService.cpp | 8 | ||||
| -rw-r--r-- | toolkit/components/alerts/nsXULAlerts.cpp | 3 |
2 files changed, 0 insertions, 11 deletions
diff --git a/toolkit/components/alerts/nsAlertsService.cpp b/toolkit/components/alerts/nsAlertsService.cpp index 73dbb265c..4f248c861 100644 --- a/toolkit/components/alerts/nsAlertsService.cpp +++ b/toolkit/components/alerts/nsAlertsService.cpp @@ -273,26 +273,18 @@ NS_IMETHODIMP nsAlertsService::CloseAlert(const nsAString& aAlertName, // nsIAlertsDoNotDisturb NS_IMETHODIMP nsAlertsService::GetManualDoNotDisturb(bool* aRetVal) { -#ifdef MOZ_WIDGET_ANDROID - return NS_ERROR_NOT_IMPLEMENTED; -#else nsCOMPtr<nsIAlertsDoNotDisturb> alertsDND(GetDNDBackend()); NS_ENSURE_TRUE(alertsDND, NS_ERROR_NOT_IMPLEMENTED); return alertsDND->GetManualDoNotDisturb(aRetVal); -#endif } NS_IMETHODIMP nsAlertsService::SetManualDoNotDisturb(bool aDoNotDisturb) { -#ifdef MOZ_WIDGET_ANDROID - return NS_ERROR_NOT_IMPLEMENTED; -#else nsCOMPtr<nsIAlertsDoNotDisturb> alertsDND(GetDNDBackend()); NS_ENSURE_TRUE(alertsDND, NS_ERROR_NOT_IMPLEMENTED); nsresult rv = alertsDND->SetManualDoNotDisturb(aDoNotDisturb); return rv; -#endif } already_AddRefed<nsIAlertsDoNotDisturb> diff --git a/toolkit/components/alerts/nsXULAlerts.cpp b/toolkit/components/alerts/nsXULAlerts.cpp index d353d8714..47e72a27f 100644 --- a/toolkit/components/alerts/nsXULAlerts.cpp +++ b/toolkit/components/alerts/nsXULAlerts.cpp @@ -66,13 +66,10 @@ NS_IMPL_ISUPPORTS(nsXULAlerts, nsIAlertsService, nsIAlertsDoNotDisturb, nsIAlert /* static */ already_AddRefed<nsXULAlerts> nsXULAlerts::GetInstance() { - // Gecko on Android does not fully support XUL windows. -#ifndef MOZ_WIDGET_ANDROID if (!gXULAlerts) { gXULAlerts = new nsXULAlerts(); ClearOnShutdown(&gXULAlerts); } -#endif // MOZ_WIDGET_ANDROID RefPtr<nsXULAlerts> instance = gXULAlerts.get(); return instance.forget(); } |