The extensions service wasn't getting inited despite being used by themes (th...

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 308 matching lines @@
   delete extension;
 }
 
 void ExtensionsService::LoadExtension(const FilePath& extension_path) {
   backend_loop_->PostTask(FROM_HERE, NewRunnableMethod(backend_.get(),
       &ExtensionsServiceBackend::LoadSingleExtension,
       extension_path, scoped_refptr<ExtensionsService>(this)));
 }
 
 void ExtensionsService::OnExtensionsLoaded(ExtensionList* new_extensions) {
-  extensions_.insert(extensions_.end(), new_extensions->begin(),
-                     new_extensions->end());
-  NotificationService::current()->Notify(
-      NotificationType::EXTENSIONS_LOADED,
-      NotificationService::AllSources(),
-      Details<ExtensionList>(new_extensions));
+  // If extensions aren't enabled, we still want to add themes. However, themes
+  // should not trigger EXTENSIONS_LOADED.
+  bool has_extension = false;
+  for (ExtensionList::iterator iter = new_extensions->begin();
+       iter != new_extensions->end(); ++iter) {
+    if (extensions_enabled() || (*iter)->IsTheme()) {
+      extensions_.push_back(*iter);
+      if (!(*iter)->IsTheme())
+        has_extension = true;
+    }
+  }
+
+  if (has_extension) {

[Aaron Boodman, 2009/06/01 23:44:36]

Can you add:

TODO(aa): This can be re-enabled when BUG XXX is fixed.

+    NotificationService::current()->Notify(
+        NotificationType::EXTENSIONS_LOADED,
+        NotificationService::AllSources(),
+        Details<ExtensionList>(new_extensions));
+  }
   delete new_extensions;
 }
 
 void ExtensionsService::OnExtensionInstalled(Extension* extension,
                                              bool update) {
-  NotificationService::current()->Notify(
-      NotificationType::EXTENSION_INSTALLED,
-      NotificationService::AllSources(),
-      Details<Extension>(extension));
-
   // If the extension is a theme, tell the profile (and therefore ThemeProvider)
   // to apply it.
   if (extension->IsTheme()) {
     NotificationService::current()->Notify(
         NotificationType::THEME_INSTALLED,
         NotificationService::AllSources(),
         Details<Extension>(extension));
+  } else {
+    NotificationService::current()->Notify(
+        NotificationType::EXTENSION_INSTALLED,
+        NotificationService::AllSources(),
+        Details<Extension>(extension));
   }
 }
 
 void ExtensionsService::OnExtensionVersionReinstalled(const std::string& id) {
   Extension* extension = GetExtensionByID(id);
   if (extension && extension->IsTheme()) {
     NotificationService::current()->Notify(
         NotificationType::THEME_INSTALLED,
         NotificationService::AllSources(),
         Details<Extension>(extension));
@@ skipping 633 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;
 }