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

chrome/browser/profiles/profile_impl.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/profiles/profile_impl.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/file_path.h"
@@ skipping 264 matching lines @@
   pref_change_registrar_.Add(prefs::kEnableAutoSpellCorrect, this);
   pref_change_registrar_.Add(prefs::kClearSiteDataOnExit, this);
 
   // It would be nice to use PathService for fetching this directory, but
   // the cache directory depends on the profile directory, which isn't available
   // to PathService.
   chrome::GetUserCacheDirectory(path_, &base_cache_path_);
   file_util::CreateDirectory(base_cache_path_);
 
   // Listen for theme installations from our original profile.
-  registrar_.Add(this, NotificationType::THEME_INSTALLED,
+  registrar_.Add(this, NotificationType::EXTENSION_INSTALLED,
                  Source<Profile>(GetOriginalProfile()));
+  registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
+                 Source<Profile>(GetOriginalProfile()));
+
+  // Once the extensions system is ready, we want to listen to EXTENSION_LOADED
+  // events (they get sent for enabled extensions during startup).
+  registrar_.Add(this, NotificationType::EXTENSIONS_READY,
+                 Source<Profile>(GetOriginalProfile()));
+
 
 #if !defined(OS_CHROMEOS)
   // Listen for bookmark model load, to bootstrap the sync service.
   // On CrOS sync service will be initialized after sign in.
   registrar_.Add(this, NotificationType::BOOKMARK_MODEL_LOADED,
                  Source<Profile>(this));
 #endif
 
   ssl_config_service_manager_.reset(
       SSLConfigServiceManager::CreateDefaultManager(this));
@@ skipping 975 matching lines @@
           prefs->GetBoolean(prefs::kClearSiteDataOnExit);
       if (webkit_context_) {
         webkit_context_->set_clear_local_state_on_exit(
             clear_local_state_on_exit_);
       }
       if (appcache_service_) {
         appcache_service_->SetClearLocalStateOnExit(
             clear_local_state_on_exit_);
       }
     }
-  } else if (NotificationType::THEME_INSTALLED == type) {
+  } else if (NotificationType::EXTENSIONS_READY == type) {
+    registrar_.Add(this, NotificationType::EXTENSION_LOADED,
+                   Source<Profile>(GetOriginalProfile()));
+  } else if (NotificationType::EXTENSION_INSTALLED == type) {
     DCHECK_EQ(Source<Profile>(source).ptr(), GetOriginalProfile());
     const Extension* extension = Details<const Extension>(details).ptr();
-    SetTheme(extension);
+    if (extension->is_theme())
+      SetTheme(extension);
+  } else if (NotificationType::EXTENSION_LOADED == type) {
+    DCHECK_EQ(Source<Profile>(source).ptr(), GetOriginalProfile());
+    const Extension* extension = Details<const Extension>(details).ptr();
+    if (extension->is_theme() &&
+        extension->id() != GetThemeProvider()->GetThemeID())
+      SetTheme(extension);
+  } else if (NotificationType::EXTENSION_UNLOADED == type) {
+    DCHECK_EQ(Source<Profile>(source).ptr(), GetOriginalProfile());
+    UnloadedExtensionInfo* info = Details<UnloadedExtensionInfo>(details).ptr();
+    const Extension* extension = info->extension;
+    if (extension->id() == GetThemeProvider()->GetThemeID() &&
+        info->reason != UnloadedExtensionInfo::UPDATE)
+      ClearTheme();
   } else if (NotificationType::BOOKMARK_MODEL_LOADED == type) {
     GetProfileSyncService();  // Causes lazy-load if sync is enabled.
     registrar_.Remove(this, NotificationType::BOOKMARK_MODEL_LOADED,
                       Source<Profile>(this));
   }
 }
 
 void ProfileImpl::StopCreateSessionServiceTimer() {
   create_session_service_timer_.Stop();
 }
@@ skipping 208 matching lines @@
   return pref_proxy_config_tracker_;
 }
 
 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() {
   if (!prerender::PrerenderManager::IsPrerenderingEnabled())
     return NULL;
   if (!prerender_manager_)
     prerender_manager_ = new prerender::PrerenderManager(this);
   return prerender_manager_;
 }