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

chrome/browser/themes/browser_theme_provider.cc

 // Copyright (c) 2011 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/themes/browser_theme_provider.h"
 
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 298 matching lines @@
 }
 
 void BrowserThemeProvider::RemoveUnusedThemes() {
   if (!profile_)
     return;
   ExtensionService* service = profile_->GetExtensionService();
   if (!service)
     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());
     }
   }
   for (size_t i = 0; i < remove_list.size(); ++i)
     service->UninstallExtension(remove_list[i], false);
 }
 
 void BrowserThemeProvider::UseDefaultTheme() {
   ClearAllThemeData();
@@ skipping 248 matching lines @@
           DLOG(ERROR) << "Theme is mysteriously gone.";
           ClearAllThemeData();
           UserMetrics::RecordAction(UserMetricsAction("Themes.Gone"), profile_);
         }
       }
     }
   }
 }
 
 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();
   service->Notify(NotificationType::BROWSER_THEME_CHANGED,
                   Source<BrowserThemeProvider>(this),
                   Details<const Extension>(extension));
 #if defined(OS_MACOSX)
   NotifyPlatformThemeChanged();
 #endif  // OS_MACOSX
 }
@@ skipping 35 matching lines @@
 void BrowserThemeProvider::OnInfobarDisplayed() {
   number_of_infobars_++;
 }
 
 void BrowserThemeProvider::OnInfobarDestroyed() {
   number_of_infobars_--;
 
   if (number_of_infobars_ == 0)
     RemoveUnusedThemes();
 }