Clean up how we handle themes in the extensions system and management API....

chrome/browser/extensions/extension_management_api.cc

 // Copyright (c) 2010 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/extension_management_api.h"
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 19 matching lines @@
 namespace events = extension_event_names;
 
 namespace {
 
 const char kAppLaunchUrlKey[] = "appLaunchUrl";
 const char kDescriptionKey[] = "description";
 const char kEnabledKey[] = "enabled";
 const char kIconsKey[] = "icons";
 const char kIdKey[] = "id";
 const char kIsAppKey[] = "isApp";
+const char kIsThemeKey[] = "isTheme";
 const char kNameKey[] = "name";
 const char kOptionsUrlKey[] = "optionsUrl";
 const char kPermissionsKey[] = "permissions";
 const char kSizeKey[] = "size";
 const char kUrlKey[] = "url";
 const char kVersionKey[] = "version";
 
 const char kNoExtensionError[] = "No extension with id *";
 const char kNotAnAppError[] = "Extension * is not an App";
 }
 
 ExtensionService* ExtensionManagementFunction::service() {
   return profile()->GetExtensionService();
 }
 
 static DictionaryValue* CreateExtensionInfo(const Extension& extension,
                                             bool enabled) {
   DictionaryValue* info = new DictionaryValue();
   info->SetString(kIdKey, extension.id());
   info->SetBoolean(kIsAppKey, extension.is_app());
+  info->SetBoolean(kIsThemeKey, extension.is_theme());
   info->SetString(kNameKey, extension.name());
   info->SetBoolean(kEnabledKey, enabled);
   info->SetString(kVersionKey, extension.VersionString());
   info->SetString(kDescriptionKey, extension.description());
   info->SetString(kOptionsUrlKey,
                     extension.options_url().possibly_invalid_spec());
   if (extension.is_app())
     info->SetString(kAppLaunchUrlKey,
                     extension.GetFullLaunchURL().possibly_invalid_spec());
 
@@ skipping 143 matching lines @@
   if (!service()->GetExtensionById(extension_id, true)) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(
         kNoExtensionError, extension_id);
     return false;
   }
 
   service()->UninstallExtension(extension_id, false /* external_uninstall */);
   return true;
 }
 
-// static
-ExtensionManagementEventRouter* ExtensionManagementEventRouter::GetInstance() {
-  return Singleton<ExtensionManagementEventRouter>::get();
-}
-
 ExtensionManagementEventRouter::ExtensionManagementEventRouter() {}
 
 ExtensionManagementEventRouter::~ExtensionManagementEventRouter() {}
 
 void ExtensionManagementEventRouter::Init() {
   NotificationType::Type types[] = {
     NotificationType::EXTENSION_INSTALLED,
     NotificationType::EXTENSION_UNINSTALLED,
     NotificationType::EXTENSION_LOADED,
     NotificationType::EXTENSION_UNLOADED
@@ skipping 33 matching lines @@
   CHECK(profile);
 
   ListValue args;
   if (event_name == events::kOnExtensionUninstalled) {
     const std::string& extension_id =
         Details<UninstalledExtensionInfo>(details).ptr()->extension_id;
     args.Append(Value::CreateStringValue(extension_id));
   } else {
     const Extension* extension = NULL;
     if (event_name == events::kOnExtensionDisabled) {
-      extension = Details<UnloadedExtensionInfo>(details)->extension;
+      UnloadedExtensionInfo* info =
+          Details<UnloadedExtensionInfo>(details).ptr();
+      // If the extension was already disabled, we don't want to send another
+      // notification about it.
+      if (info->already_disabled)
+        return;
+
+      extension = info->extension;
     } else {
       extension = Details<const Extension>(details).ptr();
     }
     CHECK(extension);
     ExtensionService* service = profile->GetExtensionService();
     bool enabled = service->GetExtensionById(extension->id(), false) != NULL;
     args.Append(CreateExtensionInfo(*extension, enabled));
   }
 
   std::string args_json;
   base::JSONWriter::Write(&args, false /* pretty_print */, &args_json);
 
   profile->GetExtensionEventRouter()->DispatchEventToRenderers(
       event_name, args_json, NULL, GURL());
 }