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

chrome/browser/themes/browser_theme_provider.cc

Index: chrome/browser/themes/browser_theme_provider.cc
===================================================================
--- chrome/browser/themes/browser_theme_provider.cc	(revision 75613)
+++ chrome/browser/themes/browser_theme_provider.cc	(working copy)
@@ -316,9 +316,14 @@
     return;
   std::string current_theme = GetThemeID();
   std::vector<std::string> remove_list;
-  const ExtensionList* extensions = service->extensions();
-  for (ExtensionList::const_iterator it = extensions->begin();
-       it != extensions->end(); ++it) {
+  const ExtensionList* enabled = service->extensions();
+  const ExtensionList* disabled = service->disabled_extensions();
+  ExtensionList extensions;
+  extensions.insert(extensions.end(), enabled->begin(), enabled->end());
+  extensions.insert(extensions.end(), disabled->begin(), disabled->end());
+
+  for (ExtensionList::const_iterator it = extensions.begin();
+       it != extensions.end(); ++it) {
     if ((*it)->is_theme() && (*it)->id() != current_theme) {
       remove_list.push_back((*it)->id());
     }
@@ -587,6 +592,11 @@
 }
 
 void BrowserThemeProvider::NotifyThemeChanged(const Extension* extension) {
+  FilePath profile_basename = profile_->GetPath().BaseName();
+
+  LOG(INFO) << profile_basename.value() << " theme changed to: "
+            << (extension ? extension->id() : "null");
+
   VLOG(1) << "Sending BROWSER_THEME_CHANGED";
   // Redraw!
   NotificationService* service = NotificationService::current();