Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 735017: Clean up namespaces and naming for gonk dom objects in gonk specific code - Patch 2: Change mozilla::dom::telephony to mozilla::dom::gonk for dom/system/gonk objects; r=bent

Browse Source
This commit is contained in:
Kyle Machulis 2012-03-14 15:43:26 -07:00
parent 5a8150c5e0
commit b604262aa4
7 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/sms/src/ril/SmsService.cpp
View File

@ -41,7 +41,7 @@
#include "jsapi.h" #include "jsapi.h"
#include "nsIInterfaceRequestorUtils.h" #include "nsIInterfaceRequestorUtils.h"
using mozilla::dom::telephony::SystemWorkerManager; using mozilla::dom::gonk::SystemWorkerManager;
namespace mozilla { namespace mozilla {
namespace dom { namespace dom {

2
dom/system/gonk/AudioManager.cpp
View File

@ -38,7 +38,7 @@
#include "AudioManager.h" #include "AudioManager.h"
#include <media/AudioSystem.h> #include <media/AudioSystem.h>
using namespace mozilla::dom::telephony; using namespace mozilla::dom::gonk;
using namespace android; using namespace android;
NS_IMPL_ISUPPORTS1(AudioManager, nsIAudioManager) NS_IMPL_ISUPPORTS1(AudioManager, nsIAudioManager)

2
dom/system/gonk/AudioManager.h
View File

@ -48,7 +48,7 @@
namespace mozilla { namespace mozilla {
namespace dom { namespace dom {
namespace telephony { namespace gonk {
class AudioManager : public nsIAudioManager class AudioManager : public nsIAudioManager
{ {

3
dom/system/gonk/SystemWorkerManager.cpp
View File

@ -55,8 +55,9 @@
#include "nsRadioInterfaceLayer.h" #include "nsRadioInterfaceLayer.h"
#include "nsWifiWorker.h" #include "nsWifiWorker.h"
USING_TELEPHONY_NAMESPACE
USING_WORKERS_NAMESPACE USING_WORKERS_NAMESPACE
using namespace mozilla::dom::gonk;
using namespace mozilla::ipc; using namespace mozilla::ipc;
namespace { namespace {

16
dom/system/gonk/SystemWorkerManager.h
View File

@ -40,14 +40,20 @@
#ifndef mozilla_dom_system_b2g_systemworkermanager_h__ #ifndef mozilla_dom_system_b2g_systemworkermanager_h__
#define mozilla_dom_system_b2g_systemworkermanager_h__ #define mozilla_dom_system_b2g_systemworkermanager_h__
#include "TelephonyCommon.h"
#include "nsIInterfaceRequestor.h" #include "nsIInterfaceRequestor.h"
#include "nsIObserver.h" #include "nsIObserver.h"
#include "nsAutoPtr.h"
#include "nsCOMPtr.h"
#include "nsDebug.h"
#include "nsDOMEventTargetHelper.h"
#include "nsStringGlue.h"
#include "nsTArray.h"
class nsIWorkerHolder; class nsIWorkerHolder;
BEGIN_TELEPHONY_NAMESPACE namespace mozilla {
namespace dom {
namespace gonk {
class SystemWorkerManager : public nsIObserver, class SystemWorkerManager : public nsIObserver,
public nsIInterfaceRequestor public nsIInterfaceRequestor
@ -79,6 +85,8 @@ private:
bool mShutdown; bool mShutdown;
}; };
END_TELEPHONY_NAMESPACE }
}
}
#endif // mozilla_dom_system_b2g_systemworkermanager_h__ #endif // mozilla_dom_system_b2g_systemworkermanager_h__

1
dom/telephony/Telephony.cpp
View File

@ -58,6 +58,7 @@
#include "TelephonyCall.h" #include "TelephonyCall.h"
USING_TELEPHONY_NAMESPACE USING_TELEPHONY_NAMESPACE
using namespace mozilla::dom::gonk;
using mozilla::Preferences; using mozilla::Preferences;
#define DOM_TELEPHONY_APP_PHONE_URL_PREF "dom.telephony.app.phone.url" #define DOM_TELEPHONY_APP_PHONE_URL_PREF "dom.telephony.app.phone.url"

4
layout/build/nsLayoutModule.cpp
View File

@ -129,7 +129,7 @@ using mozilla::dom::DOMRequestService;
#ifdef MOZ_B2G_RIL #ifdef MOZ_B2G_RIL
#include "SystemWorkerManager.h" #include "SystemWorkerManager.h"
using mozilla::dom::telephony::SystemWorkerManager; using mozilla::dom::gonk::SystemWorkerManager;
#define SYSTEMWORKERMANAGER_CID \ #define SYSTEMWORKERMANAGER_CID \
{0xd53b6524, 0x6ac3, 0x42b0, {0xae, 0xca, 0x62, 0xb3, 0xc4, 0xe5, 0x2b, 0x04}} {0xd53b6524, 0x6ac3, 0x42b0, {0xae, 0xca, 0x62, 0xb3, 0xc4, 0xe5, 0x2b, 0x04}}
#define SYSTEMWORKERMANAGER_CONTRACTID \ #define SYSTEMWORKERMANAGER_CONTRACTID \
@ -138,7 +138,7 @@ using mozilla::dom::telephony::SystemWorkerManager;
#ifdef MOZ_WIDGET_GONK #ifdef MOZ_WIDGET_GONK
#include "AudioManager.h" #include "AudioManager.h"
using mozilla::dom::telephony::AudioManager; using mozilla::dom::gonk::AudioManager;
#endif #endif
// Editor stuff // Editor stuff