Skip to content

Commit 3fd091d

Browse files
airpinguairpingu
committed
Bug 844429 - B2G SMS & MMS: move SMS codes into dom/mobilemessage to make it generic for MMS. r=vicamo
--HG-- rename : dom/sms/interfaces/nsIDOMMozSmsEvent.idl => dom/mobilemessage/interfaces/nsIDOMMozSmsEvent.idl rename : dom/sms/interfaces/nsIDOMMozSmsMessage.idl => dom/mobilemessage/interfaces/nsIDOMMozSmsMessage.idl rename : dom/sms/interfaces/nsIDOMNavigatorSms.idl => dom/mobilemessage/interfaces/nsIDOMNavigatorSms.idl rename : dom/sms/interfaces/nsIDOMSmsCursor.idl => dom/mobilemessage/interfaces/nsIDOMSmsCursor.idl rename : dom/sms/interfaces/nsIDOMSmsFilter.idl => dom/mobilemessage/interfaces/nsIDOMSmsFilter.idl rename : dom/sms/interfaces/nsIDOMSmsManager.idl => dom/mobilemessage/interfaces/nsIDOMSmsManager.idl rename : dom/sms/interfaces/nsIDOMSmsRequest.idl => dom/mobilemessage/interfaces/nsIDOMSmsRequest.idl rename : dom/sms/interfaces/nsIDOMSmsSegmentInfo.idl => dom/mobilemessage/interfaces/nsIDOMSmsSegmentInfo.idl rename : dom/sms/interfaces/nsISmsRequest.idl => dom/mobilemessage/interfaces/nsISmsRequest.idl rename : dom/sms/interfaces/nsISmsService.idl => dom/mobilemessage/interfaces/nsISmsService.idl rename : dom/sms/src/Constants.cpp => dom/mobilemessage/src/Constants.cpp rename : dom/sms/src/Constants.h => dom/mobilemessage/src/Constants.h rename : dom/sms/src/SmsCursor.cpp => dom/mobilemessage/src/SmsCursor.cpp rename : dom/sms/src/SmsCursor.h => dom/mobilemessage/src/SmsCursor.h rename : dom/sms/src/SmsFilter.cpp => dom/mobilemessage/src/SmsFilter.cpp rename : dom/sms/src/SmsFilter.h => dom/mobilemessage/src/SmsFilter.h rename : dom/sms/src/SmsManager.cpp => dom/mobilemessage/src/SmsManager.cpp rename : dom/sms/src/SmsManager.h => dom/mobilemessage/src/SmsManager.h rename : dom/sms/src/SmsMessage.cpp => dom/mobilemessage/src/SmsMessage.cpp rename : dom/sms/src/SmsMessage.h => dom/mobilemessage/src/SmsMessage.h rename : dom/sms/src/SmsRequest.cpp => dom/mobilemessage/src/SmsRequest.cpp rename : dom/sms/src/SmsRequest.h => dom/mobilemessage/src/SmsRequest.h rename : dom/sms/src/SmsSegmentInfo.cpp => dom/mobilemessage/src/SmsSegmentInfo.cpp rename : dom/sms/src/SmsSegmentInfo.h => dom/mobilemessage/src/SmsSegmentInfo.h rename : dom/sms/src/SmsServicesFactory.cpp => dom/mobilemessage/src/SmsServicesFactory.cpp rename : dom/sms/src/SmsServicesFactory.h => dom/mobilemessage/src/SmsServicesFactory.h rename : dom/sms/src/Types.h => dom/mobilemessage/src/Types.h rename : dom/sms/src/android/SmsService.cpp => dom/mobilemessage/src/android/SmsService.cpp rename : dom/sms/src/android/SmsService.h => dom/mobilemessage/src/android/SmsService.h rename : dom/sms/src/fallback/SmsService.cpp => dom/mobilemessage/src/fallback/SmsService.cpp rename : dom/sms/src/fallback/SmsService.h => dom/mobilemessage/src/fallback/SmsService.h rename : dom/sms/src/ipc/PSms.ipdl => dom/mobilemessage/src/ipc/PSms.ipdl rename : dom/sms/src/ipc/PSmsRequest.ipdl => dom/mobilemessage/src/ipc/PSmsRequest.ipdl rename : dom/sms/src/ipc/SmsChild.cpp => dom/mobilemessage/src/ipc/SmsChild.cpp rename : dom/sms/src/ipc/SmsChild.h => dom/mobilemessage/src/ipc/SmsChild.h rename : dom/sms/src/ipc/SmsIPCService.cpp => dom/mobilemessage/src/ipc/SmsIPCService.cpp rename : dom/sms/src/ipc/SmsIPCService.h => dom/mobilemessage/src/ipc/SmsIPCService.h rename : dom/sms/src/ipc/SmsParent.cpp => dom/mobilemessage/src/ipc/SmsParent.cpp rename : dom/sms/src/ipc/SmsParent.h => dom/mobilemessage/src/ipc/SmsParent.h rename : dom/sms/src/ipc/SmsTypes.ipdlh => dom/mobilemessage/src/ipc/SmsTypes.ipdlh rename : dom/sms/src/ipc/ipdl.mk => dom/mobilemessage/src/ipc/ipdl.mk rename : dom/sms/src/ril/SmsService.cpp => dom/mobilemessage/src/ril/SmsService.cpp rename : dom/sms/src/ril/SmsService.h => dom/mobilemessage/src/ril/SmsService.h rename : dom/sms/tests/Makefile.in => dom/mobilemessage/tests/Makefile.in rename : dom/sms/tests/marionette/manifest.ini => dom/mobilemessage/tests/marionette/manifest.ini rename : dom/sms/tests/marionette/test_between_emulators.py => dom/mobilemessage/tests/marionette/test_between_emulators.py rename : dom/sms/tests/marionette/test_bug814761.js => dom/mobilemessage/tests/marionette/test_bug814761.js rename : dom/sms/tests/marionette/test_emulator_loopback.js => dom/mobilemessage/tests/marionette/test_emulator_loopback.js rename : dom/sms/tests/marionette/test_filter_date.js => dom/mobilemessage/tests/marionette/test_filter_date.js rename : dom/sms/tests/marionette/test_filter_date_notfound.js => dom/mobilemessage/tests/marionette/test_filter_date_notfound.js rename : dom/sms/tests/marionette/test_filter_mixed.js => dom/mobilemessage/tests/marionette/test_filter_mixed.js rename : dom/sms/tests/marionette/test_filter_number_multiple.js => dom/mobilemessage/tests/marionette/test_filter_number_multiple.js rename : dom/sms/tests/marionette/test_filter_number_single.js => dom/mobilemessage/tests/marionette/test_filter_number_single.js rename : dom/sms/tests/marionette/test_filter_read.js => dom/mobilemessage/tests/marionette/test_filter_read.js rename : dom/sms/tests/marionette/test_filter_received.js => dom/mobilemessage/tests/marionette/test_filter_received.js rename : dom/sms/tests/marionette/test_filter_sent.js => dom/mobilemessage/tests/marionette/test_filter_sent.js rename : dom/sms/tests/marionette/test_filter_unread.js => dom/mobilemessage/tests/marionette/test_filter_unread.js rename : dom/sms/tests/marionette/test_getmessage.js => dom/mobilemessage/tests/marionette/test_getmessage.js rename : dom/sms/tests/marionette/test_getmessage_notfound.js => dom/mobilemessage/tests/marionette/test_getmessage_notfound.js rename : dom/sms/tests/marionette/test_getmessages.js => dom/mobilemessage/tests/marionette/test_getmessages.js rename : dom/sms/tests/marionette/test_incoming.js => dom/mobilemessage/tests/marionette/test_incoming.js rename : dom/sms/tests/marionette/test_incoming_delete.js => dom/mobilemessage/tests/marionette/test_incoming_delete.js rename : dom/sms/tests/marionette/test_incoming_max_segments.js => dom/mobilemessage/tests/marionette/test_incoming_max_segments.js rename : dom/sms/tests/marionette/test_incoming_multipart.js => dom/mobilemessage/tests/marionette/test_incoming_multipart.js rename : dom/sms/tests/marionette/test_mark_msg_read.js => dom/mobilemessage/tests/marionette/test_mark_msg_read.js rename : dom/sms/tests/marionette/test_mark_msg_read_error.js => dom/mobilemessage/tests/marionette/test_mark_msg_read_error.js rename : dom/sms/tests/marionette/test_message_classes.js => dom/mobilemessage/tests/marionette/test_message_classes.js rename : dom/sms/tests/marionette/test_outgoing.js => dom/mobilemessage/tests/marionette/test_outgoing.js rename : dom/sms/tests/marionette/test_outgoing_delete.js => dom/mobilemessage/tests/marionette/test_outgoing_delete.js rename : dom/sms/tests/marionette/test_outgoing_max_segments.js => dom/mobilemessage/tests/marionette/test_outgoing_max_segments.js rename : dom/sms/tests/marionette/test_segment_info.js => dom/mobilemessage/tests/marionette/test_segment_info.js rename : dom/sms/tests/marionette/test_strict_7bit_encoding.js => dom/mobilemessage/tests/marionette/test_strict_7bit_encoding.js rename : dom/sms/tests/moz.build => dom/mobilemessage/tests/moz.build rename : dom/sms/tests/test_sms_basics.html => dom/mobilemessage/tests/test_sms_basics.html rename : dom/sms/tests/test_smsdatabaseservice.xul => dom/mobilemessage/tests/test_smsdatabaseservice.xul rename : dom/sms/tests/test_smsfilter.html => dom/mobilemessage/tests/test_smsfilter.html rename : dom/sms/tests/test_smsservice_createsmsmessage.js => dom/mobilemessage/tests/test_smsservice_createsmsmessage.js rename : dom/sms/tests/xpcshell.ini => dom/mobilemessage/tests/xpcshell.ini
1 parent 89a745b commit 3fd091d

File tree

119 files changed

+254
-405
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+254
-405
lines changed

‎b2g/installer/package-manifest.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@
203203
@BINPATH@/components/dom_permissionsettings.xpt
204204
@BINPATH@/components/dom_sidebar.xpt
205205
@BINPATH@/components/dom_mobilemessage.xpt
206-
@BINPATH@/components/dom_sms.xpt
207206
@BINPATH@/components/dom_storage.xpt
208207
@BINPATH@/components/dom_stylesheets.xpt
209208
@BINPATH@/components/dom_threads.xpt

‎b2g/installer/removed-files.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ run-mozilla.sh
1010
#endif
1111
defaults/preferences/services-sync.js
1212
defaults/preferences/healthreport-prefs.js
13+
components/dom_sms.xpt

‎browser/installer/package-manifest.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@
204204
@BINPATH@/components/dom_permissionsettings.xpt
205205
@BINPATH@/components/dom_sidebar.xpt
206206
@BINPATH@/components/dom_mobilemessage.xpt
207-
@BINPATH@/components/dom_sms.xpt
208207
@BINPATH@/components/dom_storage.xpt
209208
@BINPATH@/components/dom_stylesheets.xpt
210209
@BINPATH@/components/dom_traversal.xpt

‎browser/installer/removed-files.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ components/dom_telephony.xpt
7979
components/dom_wifi.xpt
8080
components/dom_system_b2g.xpt
8181
#endif
82+
components/dom_sms.xpt
8283
components/uconvd.dll
8384
components/WeaveCrypto.js
8485
components/WeaveCrypto.manifest

‎dom/base/Navigator.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "PowerManager.h"
3030
#include "nsIDOMWakeLock.h"
3131
#include "nsIPowerManagerService.h"
32-
#include "SmsManager.h"
32+
#include "mozilla/dom/SmsManager.h"
3333
#include "nsISmsService.h"
3434
#include "mozilla/Hal.h"
3535
#include "nsIWebNavigation.h"
@@ -69,7 +69,6 @@
6969
#include "nsIDOMGlobalPropertyInitializer.h"
7070

7171
using namespace mozilla::dom::power;
72-
using namespace mozilla::dom::sms;
7372

7473
// This should not be in the namespace.
7574
DOMCI_DATA(Navigator, mozilla::dom::Navigator)

‎dom/base/Navigator.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ namespace battery {
6565
class BatteryManager;
6666
} // namespace battery
6767

68-
namespace sms {
6968
class SmsManager;
70-
} // namespace sms
7169

7270
namespace network {
7371
class Connection;
@@ -197,7 +195,7 @@ class Navigator : public nsIDOMNavigator
197195
nsRefPtr<nsDesktopNotificationCenter> mNotification;
198196
nsRefPtr<battery::BatteryManager> mBatteryManager;
199197
nsRefPtr<power::PowerManager> mPowerManager;
200-
nsRefPtr<sms::SmsManager> mSmsManager;
198+
nsRefPtr<SmsManager> mSmsManager;
201199
#ifdef MOZ_B2G_RIL
202200
nsCOMPtr<nsIDOMTelephony> mTelephony;
203201
nsCOMPtr<nsIDOMMozVoicemail> mVoicemail;

‎dom/base/nsDOMClassInfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "mozilla/Util.h"
88
// On top because they include basictypes.h:
9-
#include "SmsFilter.h"
9+
#include "mozilla/dom/SmsFilter.h"
1010

1111
#ifdef XP_WIN
1212
#undef GetClassName
@@ -1245,7 +1245,7 @@ static const nsConstructorFuncMapData kConstructorFuncMap[] =
12451245
NS_DEFINE_EVENT_CONSTRUCTOR_FUNC_DATA(_event_interface)
12461246
#include "GeneratedEvents.h"
12471247
#undef MOZ_GENERATED_EVENT_LIST
1248-
NS_DEFINE_CONSTRUCTOR_FUNC_DATA(MozSmsFilter, sms::SmsFilter::NewSmsFilter)
1248+
NS_DEFINE_CONSTRUCTOR_FUNC_DATA(MozSmsFilter, SmsFilter::NewSmsFilter)
12491249
NS_DEFINE_CONSTRUCTOR_FUNC_DATA(FileReader, FileReaderCtor)
12501250
NS_DEFINE_CONSTRUCTOR_FUNC_DATA(ArchiveReader, ArchiveReaderCtor)
12511251
NS_DEFINE_CONSTRUCTOR_FUNC_DATA(XSLTProcessor, XSLTProcessorCtor)

‎dom/dom-config.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ DOM_SRCDIRS = \
1313
dom/network/src \
1414
dom/settings \
1515
dom/phonenumberutils \
16-
dom/sms/src \
1716
dom/contacts \
1817
dom/permission \
1918
dom/alarm \

‎dom/ipc/ContentChild.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
#endif
8989

9090
#include "mozilla/dom/indexedDB/PIndexedDBChild.h"
91-
#include "mozilla/dom/sms/SmsChild.h"
91+
#include "mozilla/dom/mobilemessage/SmsChild.h"
9292
#include "mozilla/dom/devicestorage/DeviceStorageRequestChild.h"
9393
#include "mozilla/dom/bluetooth/PBluetoothChild.h"
9494
#include "mozilla/ipc/InputStreamUtils.h"
@@ -111,7 +111,7 @@ using namespace mozilla::docshell;
111111
using namespace mozilla::dom::bluetooth;
112112
using namespace mozilla::dom::devicestorage;
113113
using namespace mozilla::dom::ipc;
114-
using namespace mozilla::dom::sms;
114+
using namespace mozilla::dom::mobilemessage;
115115
using namespace mozilla::dom::indexedDB;
116116
using namespace mozilla::hal_sandbox;
117117
using namespace mozilla::ipc;

‎dom/ipc/ContentParent.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ using namespace mozilla::dom::bluetooth;
125125
using namespace mozilla::dom::devicestorage;
126126
using namespace mozilla::dom::indexedDB;
127127
using namespace mozilla::dom::power;
128-
using namespace mozilla::dom::sms;
128+
using namespace mozilla::dom::mobilemessage;
129129
using namespace mozilla::hal;
130130
using namespace mozilla::idl;
131131
using namespace mozilla::ipc;

‎dom/ipc/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ LOCAL_INCLUDES += \
9191
-I$(topsrcdir)/dom/base \
9292
-I$(topsrcdir)/toolkit/xre \
9393
-I$(topsrcdir)/hal/sandbox \
94-
-I$(topsrcdir)/dom/sms/src/ipc \
94+
-I$(topsrcdir)/dom/mobilemessage/src/ipc \
9595
-I$(topsrcdir)/dom/devicestorage \
9696
-I$(topsrcdir)/widget/xpwidgets \
9797
-I$(topsrcdir)/dom/bluetooth \

‎dom/mobilemessage/Makefile.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,8 @@ relativesrcdir = @relativesrcdir@
1111

1212
include $(DEPTH)/config/autoconf.mk
1313

14+
ifdef ENABLE_TESTS
15+
XPCSHELL_TESTS = tests
16+
endif
17+
1418
include $(topsrcdir)/config/rules.mk

‎dom/mobilemessage/interfaces/Makefile.in

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,16 @@ include $(topsrcdir)/dom/dom-config.mk
1515

1616
XPIDLSRCS = \
1717
nsIMobileMessageDatabaseService.idl \
18+
nsIDOMNavigatorSms.idl \
19+
nsIDOMSmsManager.idl \
20+
nsIDOMMozSmsMessage.idl \
21+
nsIDOMMozSmsEvent.idl \
22+
nsIDOMSmsRequest.idl \
23+
nsIDOMSmsFilter.idl \
24+
nsIDOMSmsCursor.idl \
25+
nsIDOMSmsSegmentInfo.idl \
26+
nsISmsRequest.idl \
27+
nsISmsService.idl \
1828
$(NULL)
1929

2030
ifdef MOZ_B2G_RIL

‎dom/sms/interfaces/nsIDOMMozSmsEvent.idl renamed to ‎dom/mobilemessage/interfaces/nsIDOMMozSmsEvent.idl

File renamed without changes.

‎dom/sms/interfaces/nsIDOMMozSmsMessage.idl renamed to ‎dom/mobilemessage/interfaces/nsIDOMMozSmsMessage.idl

File renamed without changes.

‎dom/sms/interfaces/nsIDOMNavigatorSms.idl renamed to ‎dom/mobilemessage/interfaces/nsIDOMNavigatorSms.idl

File renamed without changes.

‎dom/sms/interfaces/nsIDOMSmsCursor.idl renamed to ‎dom/mobilemessage/interfaces/nsIDOMSmsCursor.idl

File renamed without changes.

‎dom/sms/interfaces/nsIDOMSmsFilter.idl renamed to ‎dom/mobilemessage/interfaces/nsIDOMSmsFilter.idl

File renamed without changes.

‎dom/sms/interfaces/nsIDOMSmsManager.idl renamed to ‎dom/mobilemessage/interfaces/nsIDOMSmsManager.idl

File renamed without changes.

‎dom/sms/interfaces/nsIDOMSmsRequest.idl renamed to ‎dom/mobilemessage/interfaces/nsIDOMSmsRequest.idl

File renamed without changes.

‎dom/sms/interfaces/nsIDOMSmsSegmentInfo.idl renamed to ‎dom/mobilemessage/interfaces/nsIDOMSmsSegmentInfo.idl

File renamed without changes.

‎dom/sms/interfaces/nsISmsRequest.idl renamed to ‎dom/mobilemessage/interfaces/nsISmsRequest.idl

File renamed without changes.

‎dom/sms/interfaces/nsISmsService.idl renamed to ‎dom/mobilemessage/interfaces/nsISmsService.idl

File renamed without changes.

‎dom/mobilemessage/moz.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
55

66
DIRS += ['interfaces', 'src']
7-
7+
TEST_DIRS += ['tests']

‎dom/sms/src/Constants.cpp renamed to ‎dom/mobilemessage/src/Constants.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace mozilla {
77
namespace dom {
8-
namespace sms {
8+
namespace mobilemessage {
99

1010
const char* kSmsReceivedObserverTopic = "sms-received";
1111
const char* kSmsSendingObserverTopic = "sms-sending";
@@ -14,6 +14,6 @@ const char* kSmsFailedObserverTopic = "sms-failed";
1414
const char* kSmsDeliverySuccessObserverTopic = "sms-delivery-success";
1515
const char* kSmsDeliveryErrorObserverTopic = "sms-delivery-error";
1616

17-
} // namespace sms
17+
} // namespace mobilemessage
1818
} // namespace dom
1919
} // namespace mozilla

‎dom/sms/src/Constants.h renamed to ‎dom/mobilemessage/src/Constants.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
55

6-
#ifndef mozilla_dom_sms_Constants_h
7-
#define mozilla_dom_sms_Constants_h
6+
#ifndef mozilla_dom_mobilemessage_Constants_h
7+
#define mozilla_dom_mobilemessage_Constants_h
88

99
namespace mozilla {
1010
namespace dom {
11-
namespace sms {
11+
namespace mobilemessage {
1212

1313
// Defined in the .cpp.
1414
extern const char* kSmsReceivedObserverTopic;
@@ -34,8 +34,8 @@ extern const char* kSmsDeliveryErrorObserverTopic;
3434
#define MESSAGE_CLASS_CLASS_2 NS_LITERAL_STRING("class-2")
3535
#define MESSAGE_CLASS_CLASS_3 NS_LITERAL_STRING("class-3")
3636

37-
} // namespace sms
37+
} // namespace mobilemessage
3838
} // namespace dom
3939
} // namespace mozilla
4040

41-
#endif // mozilla_dom_sms_Constants_h
41+
#endif // mozilla_dom_mobilemessage_Constants_h

‎dom/mobilemessage/src/Makefile.in

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,45 @@ endif # !_MSC_VER
2929

3030
include $(topsrcdir)/dom/dom-config.mk
3131

32-
EXPORTS_NAMESPACES = mozilla/dom/mobilemessage
32+
EXPORTS_NAMESPACES = \
33+
mozilla/dom \
34+
mozilla/dom/mobilemessage \
35+
$(NULL)
36+
37+
EXPORTS_mozilla/dom = \
38+
SmsManager.h \
39+
SmsMessage.h \
40+
SmsRequest.h \
41+
SmsSegmentInfo.h \
42+
SmsFilter.h \
43+
$(NULL)
3344

3445
EXPORTS_mozilla/dom/mobilemessage = \
46+
SmsChild.h \
47+
SmsParent.h \
48+
SmsServicesFactory.h \
49+
Constants.h \
50+
Types.h \
3551
$(NULL)
3652

3753
CPPSRCS = \
54+
SmsManager.cpp \
55+
SmsService.cpp \
56+
SmsIPCService.cpp \
57+
SmsServicesFactory.cpp \
58+
SmsParent.cpp \
59+
SmsMessage.cpp \
60+
Constants.cpp \
61+
SmsChild.cpp \
62+
SmsRequest.cpp \
63+
SmsFilter.cpp \
64+
SmsSegmentInfo.cpp \
65+
SmsCursor.cpp \
3866
$(NULL)
3967

4068
LOCAL_INCLUDES = \
4169
-I$(topsrcdir)/content/events/src \
4270
-I$(topsrcdir)/dom/base \
43-
-I$(topsrcdir)/dom/sms/src \
4471
$(NULL)
4572

4673
# Add VPATH to LOCAL_INCLUDES so we are going to include the correct backend

‎dom/sms/src/SmsCursor.cpp renamed to ‎dom/mobilemessage/src/SmsCursor.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@
1010
#include "SmsRequest.h"
1111
#include "nsIMobileMessageDatabaseService.h"
1212

13-
DOMCI_DATA(MozSmsCursor, mozilla::dom::sms::SmsCursor)
13+
DOMCI_DATA(MozSmsCursor, mozilla::dom::SmsCursor)
1414

1515
namespace mozilla {
1616
namespace dom {
17-
namespace sms {
1817

1918
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(SmsCursor)
2019
NS_INTERFACE_MAP_ENTRY(nsIDOMMozSmsCursor)
@@ -96,7 +95,6 @@ SmsCursor::Continue()
9695
return NS_OK;
9796
}
9897

99-
} // namespace sms
10098
} // namespace dom
10199
} // namespace mozilla
102100

‎dom/sms/src/SmsCursor.h renamed to ‎dom/mobilemessage/src/SmsCursor.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
55

6-
#ifndef mozilla_dom_sms_SmsCursor_h
7-
#define mozilla_dom_sms_SmsCursor_h
6+
#ifndef mozilla_dom_mobilemessage_SmsCursor_h
7+
#define mozilla_dom_mobilemessage_SmsCursor_h
88

99
#include "nsIDOMSmsCursor.h"
1010
#include "nsCycleCollectionParticipant.h"
@@ -16,7 +16,6 @@ class nsISmsRequest;
1616

1717
namespace mozilla {
1818
namespace dom {
19-
namespace sms {
2019

2120
class SmsCursor MOZ_FINAL : public nsIDOMMozSmsCursor
2221
{
@@ -47,8 +46,7 @@ SmsCursor::SetMessage(nsIDOMMozSmsMessage* aMessage)
4746
mMessage = aMessage;
4847
}
4948

50-
} // namespace sms
5149
} // namespace dom
5250
} // namespace mozilla
5351

54-
#endif // mozilla_dom_sms_SmsCursor_h
52+
#endif // mozilla_dom_mobilemessage_SmsCursor_h

‎dom/sms/src/SmsFilter.cpp renamed to ‎dom/mobilemessage/src/SmsFilter.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@
1414
#include "nsJSUtils.h"
1515
#include "nsDOMString.h"
1616

17-
DOMCI_DATA(MozSmsFilter, mozilla::dom::sms::SmsFilter)
17+
using namespace mozilla::dom::mobilemessage;
18+
19+
DOMCI_DATA(MozSmsFilter, mozilla::dom::SmsFilter)
1820

1921
namespace mozilla {
2022
namespace dom {
21-
namespace sms {
2223

2324
NS_INTERFACE_MAP_BEGIN(SmsFilter)
2425
NS_INTERFACE_MAP_ENTRY(nsIDOMMozSmsFilter)
@@ -257,6 +258,5 @@ SmsFilter::SetRead(JSContext* aCx, const jsval& aRead)
257258
return NS_OK;
258259
}
259260

260-
} // namespace sms
261261
} // namespace dom
262262
} // namespace mozilla

‎dom/sms/src/SmsFilter.h renamed to ‎dom/mobilemessage/src/SmsFilter.h

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,16 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
55

6-
#ifndef mozilla_dom_sms_SmsFilter_h
7-
#define mozilla_dom_sms_SmsFilter_h
6+
#ifndef mozilla_dom_mobilemessage_SmsFilter_h
7+
#define mozilla_dom_mobilemessage_SmsFilter_h
88

9-
#include "mozilla/dom/sms/PSms.h"
9+
#include "mozilla/dom/mobilemessage/PSms.h"
1010
#include "nsIDOMSmsFilter.h"
1111
#include "Types.h"
1212
#include "mozilla/Attributes.h"
1313

1414
namespace mozilla {
1515
namespace dom {
16-
namespace sms {
1716

1817
class SmsFilter MOZ_FINAL : public nsIDOMMozSmsFilter
1918
{
@@ -22,23 +21,22 @@ class SmsFilter MOZ_FINAL : public nsIDOMMozSmsFilter
2221
NS_DECL_NSIDOMMOZSMSFILTER
2322

2423
SmsFilter();
25-
SmsFilter(const SmsFilterData& aData);
24+
SmsFilter(const mobilemessage::SmsFilterData& aData);
2625

27-
const SmsFilterData& GetData() const;
26+
const mobilemessage::SmsFilterData& GetData() const;
2827

2928
static nsresult NewSmsFilter(nsISupports** aSmsFilter);
3029

3130
private:
32-
SmsFilterData mData;
31+
mobilemessage::SmsFilterData mData;
3332
};
3433

35-
inline const SmsFilterData&
34+
inline const mobilemessage::SmsFilterData&
3635
SmsFilter::GetData() const {
3736
return mData;
3837
}
3938

40-
} // namespace sms
4139
} // namespace dom
4240
} // namespace mozilla
4341

44-
#endif // mozilla_dom_sms_SmsFilter_h
42+
#endif // mozilla_dom_mobilemessage_SmsFilter_h

‎dom/sms/src/SmsManager.cpp renamed to ‎dom/mobilemessage/src/SmsManager.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,12 @@
2828
#define DELIVERY_SUCCESS_EVENT_NAME NS_LITERAL_STRING("deliverysuccess")
2929
#define DELIVERY_ERROR_EVENT_NAME NS_LITERAL_STRING("deliveryerror")
3030

31-
DOMCI_DATA(MozSmsManager, mozilla::dom::sms::SmsManager)
31+
using namespace mozilla::dom::mobilemessage;
32+
33+
DOMCI_DATA(MozSmsManager, mozilla::dom::SmsManager)
3234

3335
namespace mozilla {
3436
namespace dom {
35-
namespace sms {
3637

3738
NS_INTERFACE_MAP_BEGIN(SmsManager)
3839
NS_INTERFACE_MAP_ENTRY(nsIDOMMozSmsManager)
@@ -402,6 +403,5 @@ SmsManager::Observe(nsISupports* aSubject, const char* aTopic,
402403
return NS_OK;
403404
}
404405

405-
} // namespace sms
406406
} // namespace dom
407407
} // namespace mozilla

0 commit comments

Comments
 (0)