Bug 1365256: Don't register chrome for disabled, restartful add-ons. r=aswan a=RyanVM CLOSED TREE
authorKris Maglione <maglione.k@gmail.com>
Tue, 16 May 2017 09:10:11 -0700
changeset 358607 b8e9b674033bcd1f3a4c59b9d0ee7619c1a17cc5
parent 358606 b2b2746d51ea149bff83ea3e97efdff05bdd9a92
child 358608 985b3ee939338022ef44028b5251f77af19c3638
push id90353
push userryanvm@gmail.com
push dateWed, 17 May 2017 00:10:47 +0000
treeherdermozilla-inbound@41958333867b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaswan, RyanVM
bugs1365256
milestone55.0a1
first release with
nightly linux32
b8e9b674033b / 55.0a1 / 20170516192431 / files
nightly linux64
b8e9b674033b / 55.0a1 / 20170516192431 / files
nightly mac
b8e9b674033b / 55.0a1 / 20170516122050 / files
nightly win32
b8e9b674033b / 55.0a1 / 20170516122050 / files
nightly win64
b8e9b674033b / 55.0a1 / 20170516122050 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1365256: Don't register chrome for disabled, restartful add-ons. r=aswan a=RyanVM CLOSED TREE MozReview-Commit-ID: H6dfuBCTSAE
toolkit/mozapps/extensions/AddonManagerStartup.cpp
--- a/toolkit/mozapps/extensions/AddonManagerStartup.cpp
+++ b/toolkit/mozapps/extensions/AddonManagerStartup.cpp
@@ -561,17 +561,17 @@ AddonManagerStartup::InitializeExtension
 
   JS::RootedObject locs(cx, &locations.toObject());
   for (auto e1 : PropertyIter(cx, locs)) {
     InstallLocation loc(e1);
 
     for (auto e2 : loc.Addons()) {
       Addon addon(e2);
 
-      if (!addon.Bootstrapped()) {
+      if (addon.Enabled() && !addon.Bootstrapped()) {
         AddInstallLocation(addon);
 
         if (enableInterpositions && addon.ShimsEnabled()) {
           EnableShims(addon.Id());
         }
       }
     }
   }