Permalink
Browse files

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
  • Loading branch information...
1 parent 4eda81b commit 29a0f083008f3a6e17fe0acf4a1f118e94159bfa @airpingu airpingu committed Mar 1, 2013
Showing with 254 additions and 405 deletions.
  1. +0 −1 b2g/installer/package-manifest.in
  2. +1 −0 b2g/installer/removed-files.in
  3. +0 −1 browser/installer/package-manifest.in
  4. +1 −0 browser/installer/removed-files.in
  5. +1 −2 dom/base/Navigator.cpp
  6. +1 −3 dom/base/Navigator.h
  7. +2 −2 dom/base/nsDOMClassInfo.cpp
  8. +0 −1 dom/dom-config.mk
  9. +2 −2 dom/ipc/ContentChild.cpp
  10. +1 −1 dom/ipc/ContentParent.cpp
  11. +1 −1 dom/ipc/Makefile.in
  12. +4 −0 dom/mobilemessage/Makefile.in
  13. +10 −0 dom/mobilemessage/interfaces/Makefile.in
  14. 0 dom/{sms → mobilemessage}/interfaces/nsIDOMMozSmsEvent.idl
  15. 0 dom/{sms → mobilemessage}/interfaces/nsIDOMMozSmsMessage.idl
  16. 0 dom/{sms → mobilemessage}/interfaces/nsIDOMNavigatorSms.idl
  17. 0 dom/{sms → mobilemessage}/interfaces/nsIDOMSmsCursor.idl
  18. 0 dom/{sms → mobilemessage}/interfaces/nsIDOMSmsFilter.idl
  19. 0 dom/{sms → mobilemessage}/interfaces/nsIDOMSmsManager.idl
  20. 0 dom/{sms → mobilemessage}/interfaces/nsIDOMSmsRequest.idl
  21. 0 dom/{sms → mobilemessage}/interfaces/nsIDOMSmsSegmentInfo.idl
  22. 0 dom/{sms → mobilemessage}/interfaces/nsISmsRequest.idl
  23. 0 dom/{sms → mobilemessage}/interfaces/nsISmsService.idl
  24. +1 −1 dom/mobilemessage/moz.build
  25. +2 −2 dom/{sms → mobilemessage}/src/Constants.cpp
  26. +5 −5 dom/{sms → mobilemessage}/src/Constants.h
  27. +29 −2 dom/mobilemessage/src/Makefile.in
  28. +1 −3 dom/{sms → mobilemessage}/src/SmsCursor.cpp
  29. +3 −5 dom/{sms → mobilemessage}/src/SmsCursor.h
  30. +3 −3 dom/{sms → mobilemessage}/src/SmsFilter.cpp
  31. +8 −10 dom/{sms → mobilemessage}/src/SmsFilter.h
  32. +3 −3 dom/{sms → mobilemessage}/src/SmsManager.cpp
  33. +3 −5 dom/{sms → mobilemessage}/src/SmsManager.h
  34. +3 −3 dom/{sms → mobilemessage}/src/SmsMessage.cpp
  35. +11 −13 dom/{sms → mobilemessage}/src/SmsMessage.h
  36. +3 −3 dom/{sms → mobilemessage}/src/SmsRequest.cpp
  37. +15 −15 dom/{sms → mobilemessage}/src/SmsRequest.h
  38. +3 −3 dom/{sms → mobilemessage}/src/SmsSegmentInfo.cpp
  39. +6 −8 dom/{sms → mobilemessage}/src/SmsSegmentInfo.h
  40. +2 −6 dom/{sms → mobilemessage}/src/SmsServicesFactory.cpp
  41. +5 −5 dom/{sms → mobilemessage}/src/SmsServicesFactory.h
  42. +21 −21 dom/{sms → mobilemessage}/src/Types.h
  43. +0 −2 dom/mobilemessage/src/android/MobileMessageDatabaseService.cpp
  44. +3 −3 dom/{sms → mobilemessage}/src/android/SmsService.cpp
  45. +5 −5 dom/{sms → mobilemessage}/src/android/SmsService.h
  46. +3 −3 dom/{sms → mobilemessage}/src/fallback/SmsService.cpp
  47. +5 −5 dom/{sms → mobilemessage}/src/fallback/SmsService.h
  48. +2 −2 dom/{sms → mobilemessage}/src/ipc/PSms.ipdl
  49. +3 −3 dom/{sms → mobilemessage}/src/ipc/PSmsRequest.ipdl
  50. +4 −3 dom/{sms → mobilemessage}/src/ipc/SmsChild.cpp
  51. +8 −8 dom/{sms → mobilemessage}/src/ipc/SmsChild.h
  52. +4 −4 dom/{sms → mobilemessage}/src/ipc/SmsIPCService.cpp
  53. +5 −5 dom/{sms → mobilemessage}/src/ipc/SmsIPCService.h
  54. +2 −2 dom/{sms → mobilemessage}/src/ipc/SmsParent.cpp
  55. +8 −14 dom/{sms → mobilemessage}/src/ipc/SmsParent.h
  56. +2 −2 dom/{sms → mobilemessage}/src/ipc/SmsTypes.ipdlh
  57. 0 dom/{sms → mobilemessage}/src/ipc/ipdl.mk
  58. +3 −3 dom/{sms → mobilemessage}/src/ril/SmsService.cpp
  59. +5 −5 dom/{sms → mobilemessage}/src/ril/SmsService.h
  60. 0 dom/{sms → mobilemessage}/tests/Makefile.in
  61. 0 dom/{sms → mobilemessage}/tests/marionette/manifest.ini
  62. 0 dom/{sms → mobilemessage}/tests/marionette/test_between_emulators.py
  63. 0 dom/{sms → mobilemessage}/tests/marionette/test_bug814761.js
  64. 0 dom/{sms → mobilemessage}/tests/marionette/test_emulator_loopback.js
  65. 0 dom/{sms → mobilemessage}/tests/marionette/test_filter_date.js
  66. 0 dom/{sms → mobilemessage}/tests/marionette/test_filter_date_notfound.js
  67. 0 dom/{sms → mobilemessage}/tests/marionette/test_filter_mixed.js
  68. 0 dom/{sms → mobilemessage}/tests/marionette/test_filter_number_multiple.js
  69. 0 dom/{sms → mobilemessage}/tests/marionette/test_filter_number_single.js
  70. 0 dom/{sms → mobilemessage}/tests/marionette/test_filter_read.js
  71. 0 dom/{sms → mobilemessage}/tests/marionette/test_filter_received.js
  72. 0 dom/{sms → mobilemessage}/tests/marionette/test_filter_sent.js
  73. 0 dom/{sms → mobilemessage}/tests/marionette/test_filter_unread.js
  74. 0 dom/{sms → mobilemessage}/tests/marionette/test_getmessage.js
  75. 0 dom/{sms → mobilemessage}/tests/marionette/test_getmessage_notfound.js
  76. 0 dom/{sms → mobilemessage}/tests/marionette/test_getmessages.js
  77. 0 dom/{sms → mobilemessage}/tests/marionette/test_incoming.js
  78. 0 dom/{sms → mobilemessage}/tests/marionette/test_incoming_delete.js
  79. 0 dom/{sms → mobilemessage}/tests/marionette/test_incoming_max_segments.js
  80. 0 dom/{sms → mobilemessage}/tests/marionette/test_incoming_multipart.js
  81. 0 dom/{sms → mobilemessage}/tests/marionette/test_mark_msg_read.js
  82. 0 dom/{sms → mobilemessage}/tests/marionette/test_mark_msg_read_error.js
  83. 0 dom/{sms → mobilemessage}/tests/marionette/test_message_classes.js
  84. 0 dom/{sms → mobilemessage}/tests/marionette/test_outgoing.js
  85. 0 dom/{sms → mobilemessage}/tests/marionette/test_outgoing_delete.js
  86. 0 dom/{sms → mobilemessage}/tests/marionette/test_outgoing_max_segments.js
  87. 0 dom/{sms → mobilemessage}/tests/marionette/test_segment_info.js
  88. 0 dom/{sms → mobilemessage}/tests/marionette/test_strict_7bit_encoding.js
  89. 0 dom/{sms/interfaces → mobilemessage/tests}/moz.build
  90. 0 dom/{sms → mobilemessage}/tests/test_sms_basics.html
  91. 0 dom/{sms → mobilemessage}/tests/test_smsdatabaseservice.xul
  92. 0 dom/{sms → mobilemessage}/tests/test_smsfilter.html
  93. 0 dom/{sms → mobilemessage}/tests/test_smsservice_createsmsmessage.js
  94. 0 dom/{sms → mobilemessage}/tests/xpcshell.ini
  95. +0 −1 dom/moz.build
  96. +0 −18 dom/sms/Makefile.in
  97. +0 −35 dom/sms/interfaces/Makefile.in
  98. +0 −7 dom/sms/moz.build
  99. +0 −94 dom/sms/src/Makefile.in
  100. +0 −5 dom/sms/src/moz.build
  101. +0 −5 dom/sms/tests/moz.build
  102. +9 −9 dom/system/gonk/RadioInterfaceLayer.js
  103. +4 −4 embedding/android/GeckoSmsManager.java
  104. +1 −1 ipc/ipdl/Makefile.in
  105. +0 −1 layout/build/Makefile.in
  106. +2 −2 layout/build/nsLayoutModule.cpp
  107. +4 −4 mobile/android/base/GeckoSmsManager.java
  108. +0 −1 mobile/android/installer/package-manifest.in
  109. +1 −0 mobile/android/installer/removed-files.in
  110. +0 −1 mobile/xul/installer/package-manifest.in
  111. +1 −0 mobile/xul/installer/removed-files.in
  112. +1 −1 testing/marionette/client/marionette/tests/unit-tests.ini
  113. +1 −1 testing/mochitest/android.json
  114. +1 −1 testing/mochitest/b2g.json
  115. +1 −1 testing/xpcshell/xpcshell.ini
  116. +1 −1 testing/xpcshell/xpcshell_b2g.ini
  117. +3 −3 widget/android/AndroidBridge.cpp
  118. +4 −4 widget/android/AndroidBridge.h
  119. +7 −6 widget/android/AndroidJNI.cpp
@@ -203,7 +203,6 @@
@BINPATH@/components/dom_permissionsettings.xpt
@BINPATH@/components/dom_sidebar.xpt
@BINPATH@/components/dom_mobilemessage.xpt
-@BINPATH@/components/dom_sms.xpt
@BINPATH@/components/dom_storage.xpt
@BINPATH@/components/dom_stylesheets.xpt
@BINPATH@/components/dom_threads.xpt
@@ -10,3 +10,4 @@ run-mozilla.sh
#endif
defaults/preferences/services-sync.js
defaults/preferences/healthreport-prefs.js
+components/dom_sms.xpt
@@ -204,7 +204,6 @@
@BINPATH@/components/dom_permissionsettings.xpt
@BINPATH@/components/dom_sidebar.xpt
@BINPATH@/components/dom_mobilemessage.xpt
-@BINPATH@/components/dom_sms.xpt
@BINPATH@/components/dom_storage.xpt
@BINPATH@/components/dom_stylesheets.xpt
@BINPATH@/components/dom_traversal.xpt
@@ -79,6 +79,7 @@ components/dom_telephony.xpt
components/dom_wifi.xpt
components/dom_system_b2g.xpt
#endif
+components/dom_sms.xpt
components/uconvd.dll
components/WeaveCrypto.js
components/WeaveCrypto.manifest
View
@@ -29,7 +29,7 @@
#include "PowerManager.h"
#include "nsIDOMWakeLock.h"
#include "nsIPowerManagerService.h"
-#include "SmsManager.h"
+#include "mozilla/dom/SmsManager.h"
#include "nsISmsService.h"
#include "mozilla/Hal.h"
#include "nsIWebNavigation.h"
@@ -69,7 +69,6 @@
#include "nsIDOMGlobalPropertyInitializer.h"
using namespace mozilla::dom::power;
-using namespace mozilla::dom::sms;
// This should not be in the namespace.
DOMCI_DATA(Navigator, mozilla::dom::Navigator)
View
@@ -65,9 +65,7 @@ namespace battery {
class BatteryManager;
} // namespace battery
-namespace sms {
class SmsManager;
-} // namespace sms
namespace network {
class Connection;
@@ -197,7 +195,7 @@ class Navigator : public nsIDOMNavigator
nsRefPtr<nsDesktopNotificationCenter> mNotification;
nsRefPtr<battery::BatteryManager> mBatteryManager;
nsRefPtr<power::PowerManager> mPowerManager;
- nsRefPtr<sms::SmsManager> mSmsManager;
+ nsRefPtr<SmsManager> mSmsManager;
#ifdef MOZ_B2G_RIL
nsCOMPtr<nsIDOMTelephony> mTelephony;
nsCOMPtr<nsIDOMMozVoicemail> mVoicemail;
@@ -6,7 +6,7 @@
#include "mozilla/Util.h"
// On top because they include basictypes.h:
-#include "SmsFilter.h"
+#include "mozilla/dom/SmsFilter.h"
#ifdef XP_WIN
#undef GetClassName
@@ -1245,7 +1245,7 @@ static const nsConstructorFuncMapData kConstructorFuncMap[] =
NS_DEFINE_EVENT_CONSTRUCTOR_FUNC_DATA(_event_interface)
#include "GeneratedEvents.h"
#undef MOZ_GENERATED_EVENT_LIST
- NS_DEFINE_CONSTRUCTOR_FUNC_DATA(MozSmsFilter, sms::SmsFilter::NewSmsFilter)
+ NS_DEFINE_CONSTRUCTOR_FUNC_DATA(MozSmsFilter, SmsFilter::NewSmsFilter)
NS_DEFINE_CONSTRUCTOR_FUNC_DATA(FileReader, FileReaderCtor)
NS_DEFINE_CONSTRUCTOR_FUNC_DATA(ArchiveReader, ArchiveReaderCtor)
NS_DEFINE_CONSTRUCTOR_FUNC_DATA(XSLTProcessor, XSLTProcessorCtor)
View
@@ -13,7 +13,6 @@ DOM_SRCDIRS = \
dom/network/src \
dom/settings \
dom/phonenumberutils \
- dom/sms/src \
dom/contacts \
dom/permission \
dom/alarm \
View
@@ -88,7 +88,7 @@
#endif
#include "mozilla/dom/indexedDB/PIndexedDBChild.h"
-#include "mozilla/dom/sms/SmsChild.h"
+#include "mozilla/dom/mobilemessage/SmsChild.h"
#include "mozilla/dom/devicestorage/DeviceStorageRequestChild.h"
#include "mozilla/dom/bluetooth/PBluetoothChild.h"
#include "mozilla/ipc/InputStreamUtils.h"
@@ -111,7 +111,7 @@ using namespace mozilla::docshell;
using namespace mozilla::dom::bluetooth;
using namespace mozilla::dom::devicestorage;
using namespace mozilla::dom::ipc;
-using namespace mozilla::dom::sms;
+using namespace mozilla::dom::mobilemessage;
using namespace mozilla::dom::indexedDB;
using namespace mozilla::hal_sandbox;
using namespace mozilla::ipc;
@@ -125,7 +125,7 @@ using namespace mozilla::dom::bluetooth;
using namespace mozilla::dom::devicestorage;
using namespace mozilla::dom::indexedDB;
using namespace mozilla::dom::power;
-using namespace mozilla::dom::sms;
+using namespace mozilla::dom::mobilemessage;
using namespace mozilla::hal;
using namespace mozilla::idl;
using namespace mozilla::ipc;
View
@@ -91,7 +91,7 @@ LOCAL_INCLUDES += \
-I$(topsrcdir)/dom/base \
-I$(topsrcdir)/toolkit/xre \
-I$(topsrcdir)/hal/sandbox \
- -I$(topsrcdir)/dom/sms/src/ipc \
+ -I$(topsrcdir)/dom/mobilemessage/src/ipc \
-I$(topsrcdir)/dom/devicestorage \
-I$(topsrcdir)/widget/xpwidgets \
-I$(topsrcdir)/dom/bluetooth \
@@ -11,4 +11,8 @@ relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
+ifdef ENABLE_TESTS
+XPCSHELL_TESTS = tests
+endif
+
include $(topsrcdir)/config/rules.mk
@@ -15,6 +15,16 @@ include $(topsrcdir)/dom/dom-config.mk
XPIDLSRCS = \
nsIMobileMessageDatabaseService.idl \
+ nsIDOMNavigatorSms.idl \
+ nsIDOMSmsManager.idl \
+ nsIDOMMozSmsMessage.idl \
+ nsIDOMMozSmsEvent.idl \
+ nsIDOMSmsRequest.idl \
+ nsIDOMSmsFilter.idl \
+ nsIDOMSmsCursor.idl \
+ nsIDOMSmsSegmentInfo.idl \
+ nsISmsRequest.idl \
+ nsISmsService.idl \
$(NULL)
ifdef MOZ_B2G_RIL
@@ -4,4 +4,4 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIRS += ['interfaces', 'src']
-
+TEST_DIRS += ['tests']
@@ -5,7 +5,7 @@
namespace mozilla {
namespace dom {
-namespace sms {
+namespace mobilemessage {
const char* kSmsReceivedObserverTopic = "sms-received";
const char* kSmsSendingObserverTopic = "sms-sending";
@@ -14,6 +14,6 @@ const char* kSmsFailedObserverTopic = "sms-failed";
const char* kSmsDeliverySuccessObserverTopic = "sms-delivery-success";
const char* kSmsDeliveryErrorObserverTopic = "sms-delivery-error";
-} // namespace sms
+} // namespace mobilemessage
} // namespace dom
} // namespace mozilla
@@ -3,12 +3,12 @@
* 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/. */
-#ifndef mozilla_dom_sms_Constants_h
-#define mozilla_dom_sms_Constants_h
+#ifndef mozilla_dom_mobilemessage_Constants_h
+#define mozilla_dom_mobilemessage_Constants_h
namespace mozilla {
namespace dom {
-namespace sms {
+namespace mobilemessage {
// Defined in the .cpp.
extern const char* kSmsReceivedObserverTopic;
@@ -34,8 +34,8 @@ extern const char* kSmsDeliveryErrorObserverTopic;
#define MESSAGE_CLASS_CLASS_2 NS_LITERAL_STRING("class-2")
#define MESSAGE_CLASS_CLASS_3 NS_LITERAL_STRING("class-3")
-} // namespace sms
+} // namespace mobilemessage
} // namespace dom
} // namespace mozilla
-#endif // mozilla_dom_sms_Constants_h
+#endif // mozilla_dom_mobilemessage_Constants_h
@@ -29,18 +29,45 @@ endif # !_MSC_VER
include $(topsrcdir)/dom/dom-config.mk
-EXPORTS_NAMESPACES = mozilla/dom/mobilemessage
+EXPORTS_NAMESPACES = \
+ mozilla/dom \
+ mozilla/dom/mobilemessage \
+ $(NULL)
+
+EXPORTS_mozilla/dom = \
+ SmsManager.h \
+ SmsMessage.h \
+ SmsRequest.h \
+ SmsSegmentInfo.h \
+ SmsFilter.h \
+ $(NULL)
EXPORTS_mozilla/dom/mobilemessage = \
+ SmsChild.h \
+ SmsParent.h \
+ SmsServicesFactory.h \
+ Constants.h \
+ Types.h \
$(NULL)
CPPSRCS = \
+ SmsManager.cpp \
+ SmsService.cpp \
+ SmsIPCService.cpp \
+ SmsServicesFactory.cpp \
+ SmsParent.cpp \
+ SmsMessage.cpp \
+ Constants.cpp \
+ SmsChild.cpp \
+ SmsRequest.cpp \
+ SmsFilter.cpp \
+ SmsSegmentInfo.cpp \
+ SmsCursor.cpp \
$(NULL)
LOCAL_INCLUDES = \
-I$(topsrcdir)/content/events/src \
-I$(topsrcdir)/dom/base \
- -I$(topsrcdir)/dom/sms/src \
$(NULL)
# Add VPATH to LOCAL_INCLUDES so we are going to include the correct backend
@@ -10,11 +10,10 @@
#include "SmsRequest.h"
#include "nsIMobileMessageDatabaseService.h"
-DOMCI_DATA(MozSmsCursor, mozilla::dom::sms::SmsCursor)
+DOMCI_DATA(MozSmsCursor, mozilla::dom::SmsCursor)
namespace mozilla {
namespace dom {
-namespace sms {
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(SmsCursor)
NS_INTERFACE_MAP_ENTRY(nsIDOMMozSmsCursor)
@@ -96,7 +95,6 @@ SmsCursor::Continue()
return NS_OK;
}
-} // namespace sms
} // namespace dom
} // namespace mozilla
@@ -3,8 +3,8 @@
* 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/. */
-#ifndef mozilla_dom_sms_SmsCursor_h
-#define mozilla_dom_sms_SmsCursor_h
+#ifndef mozilla_dom_mobilemessage_SmsCursor_h
+#define mozilla_dom_mobilemessage_SmsCursor_h
#include "nsIDOMSmsCursor.h"
#include "nsCycleCollectionParticipant.h"
@@ -16,7 +16,6 @@ class nsISmsRequest;
namespace mozilla {
namespace dom {
-namespace sms {
class SmsCursor MOZ_FINAL : public nsIDOMMozSmsCursor
{
@@ -47,8 +46,7 @@ SmsCursor::SetMessage(nsIDOMMozSmsMessage* aMessage)
mMessage = aMessage;
}
-} // namespace sms
} // namespace dom
} // namespace mozilla
-#endif // mozilla_dom_sms_SmsCursor_h
+#endif // mozilla_dom_mobilemessage_SmsCursor_h
@@ -14,11 +14,12 @@
#include "nsJSUtils.h"
#include "nsDOMString.h"
-DOMCI_DATA(MozSmsFilter, mozilla::dom::sms::SmsFilter)
+using namespace mozilla::dom::mobilemessage;
+
+DOMCI_DATA(MozSmsFilter, mozilla::dom::SmsFilter)
namespace mozilla {
namespace dom {
-namespace sms {
NS_INTERFACE_MAP_BEGIN(SmsFilter)
NS_INTERFACE_MAP_ENTRY(nsIDOMMozSmsFilter)
@@ -257,6 +258,5 @@ SmsFilter::SetRead(JSContext* aCx, const jsval& aRead)
return NS_OK;
}
-} // namespace sms
} // namespace dom
} // namespace mozilla
@@ -3,17 +3,16 @@
* 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/. */
-#ifndef mozilla_dom_sms_SmsFilter_h
-#define mozilla_dom_sms_SmsFilter_h
+#ifndef mozilla_dom_mobilemessage_SmsFilter_h
+#define mozilla_dom_mobilemessage_SmsFilter_h
-#include "mozilla/dom/sms/PSms.h"
+#include "mozilla/dom/mobilemessage/PSms.h"
#include "nsIDOMSmsFilter.h"
#include "Types.h"
#include "mozilla/Attributes.h"
namespace mozilla {
namespace dom {
-namespace sms {
class SmsFilter MOZ_FINAL : public nsIDOMMozSmsFilter
{
@@ -22,23 +21,22 @@ class SmsFilter MOZ_FINAL : public nsIDOMMozSmsFilter
NS_DECL_NSIDOMMOZSMSFILTER
SmsFilter();
- SmsFilter(const SmsFilterData& aData);
+ SmsFilter(const mobilemessage::SmsFilterData& aData);
- const SmsFilterData& GetData() const;
+ const mobilemessage::SmsFilterData& GetData() const;
static nsresult NewSmsFilter(nsISupports** aSmsFilter);
private:
- SmsFilterData mData;
+ mobilemessage::SmsFilterData mData;
};
-inline const SmsFilterData&
+inline const mobilemessage::SmsFilterData&
SmsFilter::GetData() const {
return mData;
}
-} // namespace sms
} // namespace dom
} // namespace mozilla
-#endif // mozilla_dom_sms_SmsFilter_h
+#endif // mozilla_dom_mobilemessage_SmsFilter_h
@@ -28,11 +28,12 @@
#define DELIVERY_SUCCESS_EVENT_NAME NS_LITERAL_STRING("deliverysuccess")
#define DELIVERY_ERROR_EVENT_NAME NS_LITERAL_STRING("deliveryerror")
-DOMCI_DATA(MozSmsManager, mozilla::dom::sms::SmsManager)
+using namespace mozilla::dom::mobilemessage;
+
+DOMCI_DATA(MozSmsManager, mozilla::dom::SmsManager)
namespace mozilla {
namespace dom {
-namespace sms {
NS_INTERFACE_MAP_BEGIN(SmsManager)
NS_INTERFACE_MAP_ENTRY(nsIDOMMozSmsManager)
@@ -402,6 +403,5 @@ SmsManager::Observe(nsISupports* aSubject, const char* aTopic,
return NS_OK;
}
-} // namespace sms
} // namespace dom
} // namespace mozilla
Oops, something went wrong.

0 comments on commit 29a0f08

Please sign in to comment.