|
39 | 39 | #include "mozilla/dom/ScriptSettings.h"
|
40 | 40 |
|
41 | 41 | #include "mozilla/AutoRestore.h"
|
| 42 | +#ifdef MOZ_BACKGROUNDTASKS |
| 43 | +# include "mozilla/BackgroundTasks.h" |
| 44 | +#endif |
42 | 45 | #include "mozilla/Components.h"
|
43 | 46 | #include "mozilla/Services.h"
|
44 | 47 | #include "mozilla/Omnijar.h"
|
@@ -966,13 +969,21 @@ nsXREDirProvider::DoStartup() {
|
966 | 969 | mozilla::SandboxBroker::GeckoDependentInitialize();
|
967 | 970 | #endif
|
968 | 971 |
|
969 |
| - // Init the Extension Manager |
970 |
| - nsCOMPtr<nsIObserver> em = |
971 |
| - do_GetService("@mozilla.org/addons/integration;1"); |
972 |
| - if (em) { |
973 |
| - em->Observe(nullptr, "addons-startup", nullptr); |
974 |
| - } else { |
975 |
| - NS_WARNING("Failed to create Addons Manager."); |
| 972 | + bool initExtensionManager = |
| 973 | +#ifdef MOZ_BACKGROUNDTASKS |
| 974 | + !mozilla::BackgroundTasks::IsBackgroundTaskMode(); |
| 975 | +#else |
| 976 | + true; |
| 977 | +#endif |
| 978 | + if (initExtensionManager) { |
| 979 | + // Init the Extension Manager |
| 980 | + nsCOMPtr<nsIObserver> em = |
| 981 | + do_GetService("@mozilla.org/addons/integration;1"); |
| 982 | + if (em) { |
| 983 | + em->Observe(nullptr, "addons-startup", nullptr); |
| 984 | + } else { |
| 985 | + NS_WARNING("Failed to create Addons Manager."); |
| 986 | + } |
976 | 987 | }
|
977 | 988 |
|
978 | 989 | obsSvc->NotifyObservers(nullptr, "profile-after-change", kStartup);
|
|
0 commit comments