Various minor extension fixes

chrome/browser/extensions/extensions_service.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extensions_service.h"
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/crypto/signature_verifier.h"
 #include "base/file_util.h"
@@ skipping 388 matching lines @@
 void ExtensionsService::OnExtensionsLoaded(ExtensionList* new_extensions) {
   scoped_ptr<ExtensionList> cleanup(new_extensions);
 
   // Filter out any extensions that shouldn't be loaded. Themes are always
   // loaded, but other extensions are only loaded if the extensions system is
   // enabled.
   ExtensionList enabled_extensions;
   for (ExtensionList::iterator iter = new_extensions->begin();
        iter != new_extensions->end(); ++iter) {
     if (extensions_enabled() || (*iter)->IsTheme() ||
+        (*iter)->location() == Extension::LOAD ||
         (*iter)->location() == Extension::EXTERNAL_REGISTRY) {
       Extension* old = GetExtensionById((*iter)->id());
       if (old) {
         if ((*iter)->version()->CompareTo(*(old->version())) > 0) {
           // To upgrade an extension in place, unload the old one and
           // then load the new one.
           // TODO(erikkay) issue 12399
           UnloadExtension(old->id());
         } else {
           // We already have the extension of the same or older version.
@@ skipping 961 matching lines @@
   Extension::InstallType install_type =
       CompareToInstalledVersion(id, version->GetString(), &current_version);
 
   if (install_type == Extension::DOWNGRADE)
     return false;
 
   return (install_type == Extension::UPGRADE ||
           install_type == Extension::NEW_INSTALL ||
           NeedsReinstall(id, current_version));
 }