diff --git a/toolkit/components/places/Helpers.cpp b/toolkit/components/places/Helpers.cpp index 4572c3086daa..29aa466ed61f 100644 --- a/toolkit/components/places/Helpers.cpp +++ b/toolkit/components/places/Helpers.cpp @@ -377,14 +377,6 @@ GetHiddenState(bool aIsRedirect, PlacesEvent::PlacesEvent(const char* aTopic) : mTopic(aTopic) -, mDoubleEnqueue(false) -{ -} - -PlacesEvent::PlacesEvent(const char* aTopic, - bool aDoubleEnqueue) -: mTopic(aTopic) -, mDoubleEnqueue(aDoubleEnqueue) { } @@ -405,16 +397,10 @@ PlacesEvent::Complete() void PlacesEvent::Notify() { - if (mDoubleEnqueue) { - mDoubleEnqueue = false; - (void)NS_DispatchToMainThread(this); - } - else { - NS_ASSERTION(NS_IsMainThread(), "Must only be used on the main thread!"); - nsCOMPtr obs = mozilla::services::GetObserverService(); - if (obs) { - (void)obs->NotifyObservers(nsnull, mTopic, nsnull); - } + NS_ASSERTION(NS_IsMainThread(), "Must only be used on the main thread!"); + nsCOMPtr obs = mozilla::services::GetObserverService(); + if (obs) { + (void)obs->NotifyObservers(nsnull, mTopic, nsnull); } } diff --git a/toolkit/components/places/Helpers.h b/toolkit/components/places/Helpers.h index ff692e429ec4..6f8de97fd935 100644 --- a/toolkit/components/places/Helpers.h +++ b/toolkit/components/places/Helpers.h @@ -298,12 +298,10 @@ public: NS_DECL_MOZISTORAGECOMPLETIONCALLBACK PlacesEvent(const char* aTopic); - PlacesEvent(const char* aTopic, bool aDoubleEnqueue); protected: void Notify(); const char* const mTopic; - bool mDoubleEnqueue; }; } // namespace places