Backed out changeset 8f6cc2d22ba7 (bug 1264815)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 31 May 2016 07:05:04 +0200
changeset 338539 66d97d875f04fcbdf123e72492e1f232efafdb19
parent 338538 f7aead3c999ab2db8fcc11565bf4050aefbd7019
child 338540 11bba688023eb241c9b1c8c460a53d3679ae41f0
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1264815
milestone49.0a1
backs out8f6cc2d22ba7c308e789c84404a4086084cd49f3
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 8f6cc2d22ba7 (bug 1264815)
toolkit/components/alerts/nsAlertsService.cpp
toolkit/components/alerts/nsIAlertsService.idl
toolkit/components/alerts/nsXULAlerts.cpp
toolkit/system/gnome/nsSystemAlertsService.cpp
widget/cocoa/OSXNotificationCenter.mm
--- a/toolkit/components/alerts/nsAlertsService.cpp
+++ b/toolkit/components/alerts/nsAlertsService.cpp
@@ -203,23 +203,16 @@ NS_IMETHODIMP nsAlertsService::ShowAlert
   NS_ENSURE_SUCCESS(rv, rv);
   return ShowAlert(alert, aAlertListener);
 }
 
 
 NS_IMETHODIMP nsAlertsService::ShowAlert(nsIAlertNotification * aAlert,
                                          nsIObserver * aAlertListener)
 {
-  return ShowPersistentNotification(EmptyString(), aAlert, aAlertListener);
-}
-
-NS_IMETHODIMP nsAlertsService::ShowPersistentNotification(const nsAString & aPersistentData,
-                                                          nsIAlertNotification * aAlert,
-                                                          nsIObserver * aAlertListener)
-{
   NS_ENSURE_ARG(aAlert);
 
   nsAutoString cookie;
   nsresult rv = aAlert->GetCookie(cookie);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (XRE_IsContentProcess()) {
     ContentChild* cpc = ContentChild::GetSingleton();
--- a/toolkit/components/alerts/nsIAlertsService.idl
+++ b/toolkit/components/alerts/nsIAlertsService.idl
@@ -110,20 +110,16 @@ interface nsIAlertNotification : nsISupp
    * is not actionable.
    */
   readonly attribute AString source;
 };
 
 [scriptable, uuid(f7a36392-d98b-4141-a7d7-4e46642684e3)]
 interface nsIAlertsService : nsISupports
 {
-  void showPersistentNotification(in AString persistentData,
-                                  in nsIAlertNotification alert,
-                                  [optional] in nsIObserver alertListener);
-
   void showAlert(in nsIAlertNotification alert,
                  [optional] in nsIObserver alertListener);
   /**
    * Initializes and shows an |nsIAlertNotification| with the given parameters.
    *
    * @param alertListener  Used for callbacks. May be null if the caller
    *                       doesn't care about callbacks.
    * @see nsIAlertNotification for descriptions of all other parameters.
--- a/toolkit/components/alerts/nsXULAlerts.cpp
+++ b/toolkit/components/alerts/nsXULAlerts.cpp
@@ -86,24 +86,16 @@ nsXULAlerts::ShowAlertNotification(const
                             aAlertText, aAlertTextClickable,
                             aAlertCookie, aBidi, aLang, aData,
                             aPrincipal, aInPrivateBrowsing);
   NS_ENSURE_SUCCESS(rv, rv);
   return ShowAlert(alert, aAlertListener);
 }
 
 NS_IMETHODIMP
-nsXULAlerts::ShowPersistentNotification(const nsAString& aPersistentData,
-                                        nsIAlertNotification* aAlert,
-                                        nsIObserver* aAlertListener)
-{
-  return ShowAlert(aAlert, aAlertListener);
-}
-
-NS_IMETHODIMP
 nsXULAlerts::ShowAlert(nsIAlertNotification* aAlert,
                        nsIObserver* aAlertListener)
 {
   return ShowAlertWithIconURI(aAlert, aAlertListener, nullptr);
 }
 
 NS_IMETHODIMP
 nsXULAlerts::ShowAlertWithIconURI(nsIAlertNotification* aAlert,
--- a/toolkit/system/gnome/nsSystemAlertsService.cpp
+++ b/toolkit/system/gnome/nsSystemAlertsService.cpp
@@ -47,23 +47,16 @@ NS_IMETHODIMP nsSystemAlertsService::Sho
   nsresult rv = alert->Init(aAlertName, aImageUrl, aAlertTitle,
                             aAlertText, aAlertTextClickable,
                             aAlertCookie, aBidi, aLang, aData,
                             aPrincipal, aInPrivateBrowsing);
   NS_ENSURE_SUCCESS(rv, rv);
   return ShowAlert(alert, aAlertListener);
 }
 
-NS_IMETHODIMP nsSystemAlertsService::ShowPersistentNotification(const nsAString& aPersistentData,
-                                                                nsIAlertNotification* aAlert,
-                                                                nsIObserver* aAlertListener)
-{
-  return ShowAlert(aAlert, aAlertListener);
-}
-
 NS_IMETHODIMP nsSystemAlertsService::ShowAlert(nsIAlertNotification* aAlert,
                                                nsIObserver* aAlertListener)
 {
   NS_ENSURE_ARG(aAlert);
 
   nsAutoString alertName;
   nsresult rv = aAlert->GetName(alertName);
   NS_ENSURE_SUCCESS(rv, rv);
--- a/widget/cocoa/OSXNotificationCenter.mm
+++ b/widget/cocoa/OSXNotificationCenter.mm
@@ -249,24 +249,16 @@ OSXNotificationCenter::ShowAlertNotifica
                             aAlertText, aAlertTextClickable,
                             aAlertCookie, aBidi, aLang, aData,
                             aPrincipal, aInPrivateBrowsing);
   NS_ENSURE_SUCCESS(rv, rv);
   return ShowAlert(alert, aAlertListener);
 }
 
 NS_IMETHODIMP
-OSXNotificationCenter::ShowPersistentNotification(const nsAString& aPersistentData,
-                                                  nsIAlertNotification* aAlert,
-                                                  nsIObserver* aAlertListener)
-{
-  return ShowAlert(aAlert, aAlertListener);
-}
-
-NS_IMETHODIMP
 OSXNotificationCenter::ShowAlert(nsIAlertNotification* aAlert,
                                  nsIObserver* aAlertListener)
 {
   return ShowAlertWithIconData(aAlert, aAlertListener, 0, nullptr);
 }
 
 NS_IMETHODIMP
 OSXNotificationCenter::ShowAlertWithIconData(nsIAlertNotification* aAlert,