Fix user scripts not getting initialized.

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/file_util.h"
 #include "base/gfx/png_encoder.h"
@@ skipping 341 matching lines @@
       // The kill-bit only applies to External extensions so this check fails
       // for internal locations that have the kill-bit set. In other words,
       // the kill-bit cannot be set unless the extension is external.
       Extension::Location ext_location =
           static_cast<Extension::Location>(location);
       DCHECK(state != Extension::KILLBIT ||
              Extension::IsExternalLocation(ext_location));
     }
   }
 
-  // If extensions aren't enabled, we still want to add themes. However, themes
-  // should not trigger EXTENSIONS_LOADED.
-  // TODO(aa): This can be re-enabled when BUG 13128 is fixed.
-  bool has_extension = false;
   for (ExtensionList::iterator iter = new_extensions->begin();
        iter != new_extensions->end(); ++iter) {
-    if (extensions_enabled() || (*iter)->IsTheme()) {
+    if (extensions_enabled() || (*iter)->IsTheme())
       extensions_.push_back(*iter);
-      if (!(*iter)->IsTheme())
-        has_extension = true;
-    }
   }
 
-  if (has_extension) {
-    NotificationService::current()->Notify(
-        NotificationType::EXTENSIONS_LOADED,
-        NotificationService::AllSources(),
-        Details<ExtensionList>(new_extensions));
-  }
+  NotificationService::current()->Notify(
+      NotificationType::EXTENSIONS_LOADED,
+      NotificationService::AllSources(),
+      Details<ExtensionList>(new_extensions));
+
   delete new_extensions;
 }
 
 void ExtensionsService::OnExtensionInstalled(Extension* extension,
                                              bool update) {
   UpdateExtensionPref(ASCIIToWide(extension->id()), kState,
                       Value::CreateIntegerValue(Extension::ENABLED), false);
   UpdateExtensionPref(ASCIIToWide(extension->id()), kLocation,
                       Value::CreateIntegerValue(Extension::INTERNAL), true);
 
@@ skipping 880 matching lines @@
 
 bool ExtensionsServiceBackend::ShouldInstall(const std::string& id,
                                              const std::string& version) {
   FilePath dir(install_directory_.AppendASCII(id.c_str()));
   std::string current_version;
   if (ReadCurrentVersion(dir, &current_version)) {
     return CheckCurrentVersion(version, current_version, dir);
   }
   return true;
 }