diff --git a/dom/mobilemessage/interfaces/nsIDOMMobileMessageManager.idl b/dom/mobilemessage/interfaces/nsIDOMMobileMessageManager.idl index 740ac6f9ed14..aab8ac0b1afa 100644 --- a/dom/mobilemessage/interfaces/nsIDOMMobileMessageManager.idl +++ b/dom/mobilemessage/interfaces/nsIDOMMobileMessageManager.idl @@ -5,7 +5,6 @@ #include "nsIDOMEventTarget.idl" interface nsIDOMEventListener; -interface nsIDOMMozSmsRequest; interface nsIDOMMozSmsFilter; interface nsIDOMMozSmsSegmentInfo; interface nsIDOMDOMCursor; @@ -20,15 +19,15 @@ dictionary MmsParameters jsval attachments; // MmsAttachment[] }; -[scriptable, builtinclass, uuid(370da692-b79a-45d3-a07a-f9284e8c392b)] +[scriptable, builtinclass, uuid(a7984cb3-27c8-4e3d-82a4-01553e93c078)] interface nsIDOMMozMobileMessageManager : nsIDOMEventTarget { nsIDOMMozSmsSegmentInfo getSegmentInfoForText(in DOMString text); // The first parameter can be either a DOMString (only one number) or an array // of DOMStrings. - // The method returns a SmsRequest object if one number has been passed. - // An array of SmsRequest objects otherwise. + // The method returns a DOMRequest object if one number has been passed. + // An array of DOMRequest objects otherwise. jsval send(in jsval number, in DOMString message); nsIDOMDOMRequest sendMMS(in jsval parameters /* MmsParameters */); diff --git a/dom/mobilemessage/interfaces/nsIDOMSmsManager.idl b/dom/mobilemessage/interfaces/nsIDOMSmsManager.idl index a466ee70311b..31307b2f7aed 100644 --- a/dom/mobilemessage/interfaces/nsIDOMSmsManager.idl +++ b/dom/mobilemessage/interfaces/nsIDOMSmsManager.idl @@ -5,32 +5,32 @@ #include "nsIDOMEventTarget.idl" interface nsIDOMDOMCursor; +interface nsIDOMDOMRequest; interface nsIDOMEventListener; -interface nsIDOMMozSmsRequest; interface nsIDOMMozSmsFilter; interface nsIDOMMozSmsSegmentInfo; -[scriptable, builtinclass, uuid(7371acd3-136b-4081-b368-8f5c69a22103)] +[scriptable, builtinclass, uuid(8ce00d77-71b4-43f6-92a1-2eae7c9581b9)] interface nsIDOMMozSmsManager : nsIDOMEventTarget { nsIDOMMozSmsSegmentInfo getSegmentInfoForText(in DOMString text); // The first parameter can be either a DOMString (only one number) or an array // of DOMStrings. - // The method returns a SmsRequest object if one number has been passed. - // An array of SmsRequest objects otherwise. + // The method returns a DOMRequest object if one number has been passed. + // An array of DOMRequest objects otherwise. jsval send(in jsval number, in DOMString message); [binaryname(GetMessageMoz)] - nsIDOMMozSmsRequest getMessage(in long id); + nsIDOMDOMRequest getMessage(in long id); // The parameter can be either a message id or a SmsMessage. - nsIDOMMozSmsRequest delete(in jsval param); + nsIDOMDOMRequest delete(in jsval param); // Iterates through nsIDOMMozSmsMessage. nsIDOMDOMCursor getMessages(in nsIDOMMozSmsFilter filter, in boolean reverse); - nsIDOMMozSmsRequest markMessageRead(in long id, in boolean aValue); + nsIDOMDOMRequest markMessageRead(in long id, in boolean aValue); // Iterates through nsIDOMMozMobileMessageThread. nsIDOMDOMCursor getThreads(); diff --git a/dom/mobilemessage/interfaces/nsIDOMSmsRequest.idl b/dom/mobilemessage/interfaces/nsIDOMSmsRequest.idl deleted file mode 100644 index 4caffd74f6ca..000000000000 --- a/dom/mobilemessage/interfaces/nsIDOMSmsRequest.idl +++ /dev/null @@ -1,10 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "nsIDOMDOMRequest.idl" - -[scriptable, builtinclass, uuid(d77cafb5-7a91-4631-9597-5e4dcc9d90a5)] -interface nsIDOMMozSmsRequest : nsIDOMDOMRequest -{ -}; diff --git a/dom/mobilemessage/interfaces/nsIMobileMessageCallback.idl b/dom/mobilemessage/interfaces/nsIMobileMessageCallback.idl index 0696276aa79c..aafc4a387c35 100644 --- a/dom/mobilemessage/interfaces/nsIMobileMessageCallback.idl +++ b/dom/mobilemessage/interfaces/nsIMobileMessageCallback.idl @@ -17,7 +17,7 @@ dictionary SmsThreadListItem interface nsIMobileMessageCallback : nsISupports { /** - * All SMS related errors that could apply to SmsRequest objects. + * All SMS related errors. * Make sure to keep this list in sync with the list in: * mobile/android/GeckoSmsManager.java */