Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 1249738 - make sNetworkObservers a function static r=dhylands

Browse Source
This commit is contained in:
Trevor Saunders 2016-02-19 11:28:00 -05:00
parent 34ed828351
commit e7220223eb
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hal/Hal.cpp
View File

@ -316,7 +316,13 @@ protected:
}
};
static NetworkObserversManager sNetworkObservers;
static NetworkObserversManager&
NetworkObservers()
{
static NetworkObserversManager sNetworkObservers;
AssertMainThread();
return sNetworkObservers;
}
class WakeLockObserversManager : public ObserversManager<WakeLockInformation>
{
@ -602,28 +608,28 @@ void
RegisterNetworkObserver(NetworkObserver* aObserver)
{
AssertMainThread();
sNetworkObservers.AddObserver(aObserver);
NetworkObservers().AddObserver(aObserver);
}
void
UnregisterNetworkObserver(NetworkObserver* aObserver)
{
AssertMainThread();
sNetworkObservers.RemoveObserver(aObserver);
NetworkObservers().RemoveObserver(aObserver);
}
void
GetCurrentNetworkInformation(NetworkInformation* aInfo)
{
AssertMainThread();
*aInfo = sNetworkObservers.GetCurrentInformation();
*aInfo = NetworkObservers().GetCurrentInformation();
}
void
NotifyNetworkChange(const NetworkInformation& aInfo)
{
sNetworkObservers.CacheInformation(aInfo);
sNetworkObservers.BroadcastCachedInformation();
NetworkObservers().CacheInformation(aInfo);
NetworkObservers().BroadcastCachedInformation();
}
void Reboot()