Backed out changeset d1ad5d5bc00f (Bug 1041085) for red

This commit is contained in:
Michael Wu
2014-09-30 13:43:22 -04:00
parent 336ce69d93
commit 40ea765f8d
7 changed files with 0 additions and 281 deletions

View File

@@ -1004,15 +1004,12 @@ ProcessPriorityToString(ProcessPriority aPriority,
}
static StaticAutoPtr<ObserverList<FMRadioOperationInformation> > sFMRadioObservers;
static StaticAutoPtr<ObserverList<FMRadioRDSGroup> > sFMRadioRDSObservers;
static void
InitializeFMRadioObserver()
{
if (!sFMRadioObservers) {
sFMRadioObservers = new ObserverList<FMRadioOperationInformation>;
sFMRadioRDSObservers = new ObserverList<FMRadioRDSGroup>;
ClearOnShutdown(&sFMRadioRDSObservers);
ClearOnShutdown(&sFMRadioObservers);
}
}
@@ -1037,27 +1034,6 @@ NotifyFMRadioStatus(const FMRadioOperationInformation& aFMRadioState) {
sFMRadioObservers->Broadcast(aFMRadioState);
}
void
RegisterFMRadioRDSObserver(FMRadioRDSObserver* aFMRadioRDSObserver) {
AssertMainThread();
InitializeFMRadioObserver();
sFMRadioRDSObservers->AddObserver(aFMRadioRDSObserver);
}
void
UnregisterFMRadioRDSObserver(FMRadioRDSObserver* aFMRadioRDSObserver) {
AssertMainThread();
InitializeFMRadioObserver();
sFMRadioRDSObservers->RemoveObserver(aFMRadioRDSObserver);
}
void
NotifyFMRadioRDSGroup(const FMRadioRDSGroup& aRDSGroup) {
InitializeFMRadioObserver();
sFMRadioRDSObservers->Broadcast(aRDSGroup);
}
void
EnableFMRadio(const FMRadioSettings& aInfo) {
AssertMainThread();
@@ -1112,18 +1088,6 @@ CancelFMRadioSeek() {
PROXY_IF_SANDBOXED(CancelFMRadioSeek());
}
void
EnableRDS(uint32_t aMask) {
AssertMainThread();
PROXY_IF_SANDBOXED(EnableRDS(aMask));
}
void
DisableRDS() {
AssertMainThread();
PROXY_IF_SANDBOXED(DisableRDS());
}
FMRadioSettings
GetFMBandSettings(FMRadioCountry aCountry) {
FMRadioSettings settings;