From 540d2396c4eee7f01e4799eef9387cca32b3e78c Mon Sep 17 00:00:00 2001
From: "rob_strong%exchangecode.com" <rob_strong%exchangecode.com>
Date: Tue, 2 May 2006 18:12:41 +0000
Subject: [PATCH] Bug 335916 - Locale packs <em:type>8</em:type> don't register
 chrome. r=bsmedberg

---
 .../extensions/src/nsExtensionManager.js.in        | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/toolkit/mozapps/extensions/src/nsExtensionManager.js.in b/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
index f1190642f5c..2134136c76e 100644
--- a/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
+++ b/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
@@ -2915,10 +2915,10 @@ ExtensionManager.prototype = {
                                   InstallLocations.get(KEY_APP_GLOBAL),
                                   installData.type);
     installer._installExtensionFiles(file);
-    if (installData.type == nsIUpdateItem.TYPE_EXTENSION)
-      installer.upgradeExtensionChrome();
-    else
+    if (installData.type == nsIUpdateItem.TYPE_THEME)
       installer.upgradeThemeChrome();
+    else
+      installer.upgradeExtensionChrome();
   },
 
   /**
@@ -3342,7 +3342,9 @@ ExtensionManager.prototype = {
     // If we have extensions that were installed before the new flat chrome
     // manifests, and are still valid, we need to manually create the flat
     // manifest files.
-    var extensions = this._getActiveItems(nsIUpdateItem.TYPE_EXTENSION);
+    var extensions = this._getActiveItems(nsIUpdateItem.TYPE_EXTENSION +
+                                          nsIUpdateItem.TYPE_LOCALE +
+                                          nsIUpdateItem.TYPE_PLUGIN);
     for (var i = 0; i < extensions.length; ++i) {
       var e = extensions[i];
       var itemLocation = e.location.getItemLocation(e.id);
@@ -3934,7 +3936,9 @@ ExtensionManager.prototype = {
     //
     // To do this we obtain a list of active extensions and themes and write 
     // these to the extensions.ini file in the profile directory.
-    var validExtensions = this._getActiveItems(nsIUpdateItem.TYPE_EXTENSION);
+    var validExtensions = this._getActiveItems(nsIUpdateItem.TYPE_EXTENSION +
+                                               nsIUpdateItem.TYPE_LOCALE +
+                                               nsIUpdateItem.TYPE_PLUGIN);
     var validThemes     = this._getActiveItems(nsIUpdateItem.TYPE_THEME);
 
     var extensionsLocationsFile = getFile(KEY_PROFILEDIR, [FILE_EXTENSION_MANIFEST]);