Remove deprecated extension notification from themeservice.

chrome/browser/themes/theme_service.cc

 // Copyright (c) 2012 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/theme_service.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
@@ skipping 68 matching lines @@
 }
 
 }  // namespace
 
 ThemeService::ThemeService()
     : ready_(false),
       rb_(ResourceBundle::GetSharedInstance()),
       profile_(NULL),
       installed_pending_load_id_(kDefaultThemeID),
       number_of_infobars_(0),
+      extension_registry_(NULL),
       weak_ptr_factory_(this) {
 }
 
 ThemeService::~ThemeService() {
   FreePlatformCaches();
 }
 
 void ThemeService::Init(Profile* profile) {
   DCHECK(CalledOnValidThread());
   profile_ = profile;
 
   LoadThemePrefs();
 
+  extension_registry_ = extensions::ExtensionRegistry::Get(profile_);
+
   registrar_.Add(this,
                  extensions::NOTIFICATION_EXTENSIONS_READY_DEPRECATED,
                  content::Source<Profile>(profile_));
 
   theme_syncable_service_.reset(new ThemeSyncableService(profile_, this));
 }
 
 gfx::Image ThemeService::GetImageNamed(int id) const {
   DCHECK(CalledOnValidThread());
 
@@ skipping 133 matching lines @@
                            const content::NotificationSource& source,
                            const content::NotificationDetails& details) {
   using content::Details;
   switch (type) {
     case extensions::NOTIFICATION_EXTENSIONS_READY_DEPRECATED:
       registrar_.Remove(this,
                         extensions::NOTIFICATION_EXTENSIONS_READY_DEPRECATED,
                         content::Source<Profile>(profile_));
       OnExtensionServiceReady();
       break;
-    case extensions::NOTIFICATION_EXTENSION_WILL_BE_INSTALLED_DEPRECATED: {
-      // The theme may be initially disabled. Wait till it is loaded (if ever).
-      Details<const extensions::InstalledExtensionInfo> installed_details(
-          details);
-      if (installed_details->extension->is_theme())
-        installed_pending_load_id_ = installed_details->extension->id();
-      break;
-    }
-    case extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED: {
-      const Extension* extension = Details<const Extension>(details).ptr();
-      if (extension->is_theme() &&
-          installed_pending_load_id_ != kDefaultThemeID &&
-          installed_pending_load_id_ == extension->id()) {
-        SetTheme(extension);
-      }
-      installed_pending_load_id_ = kDefaultThemeID;
-      break;
-    }
     case extensions::NOTIFICATION_EXTENSION_ENABLED: {
       const Extension* extension = Details<const Extension>(details).ptr();
       if (extension->is_theme())
         SetTheme(extension);
       break;
     }
-    case extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED: {
-      Details<const UnloadedExtensionInfo> unloaded_details(details);
-      if (unloaded_details->reason != UnloadedExtensionInfo::REASON_UPDATE &&
-          unloaded_details->extension->is_theme() &&
-          unloaded_details->extension->id() == GetThemeID()) {
-        UseDefaultTheme();
-      }
-      break;
-    }
   }
 }
 
+void ThemeService::OnExtensionLoaded(content::BrowserContext* browser_context,
+                                     const extensions::Extension* extension) {
+  if (extension->is_theme() &&
+      installed_pending_load_id_ != kDefaultThemeID &&
+      installed_pending_load_id_ == extension->id()) {
+    SetTheme(extension);
+  }
+  installed_pending_load_id_ = kDefaultThemeID;
+}
+
+void ThemeService::OnExtensionUnloaded(
+    content::BrowserContext* browser_context,
+    const extensions::Extension* extension,
+    extensions::UnloadedExtensionInfo::Reason reason) {
+  if (reason != UnloadedExtensionInfo::REASON_UPDATE && extension->is_theme() &&

[Bernhard Bauer, 2014/10/15 13:21:04]

Also here please, and below. The original code in Observe() had this pretty much
right; you can use that as a guide.

[Jitu( very slow this week), 2014/10/15 14:19:06]

In original code in Observe(), it is casting the details.
And checking like 
unloaded_details->reason != UnloadedExtensionInfo::REASON_UPDATE

So same way we did it here, in the param of OnExtensionUnloaded()
we are getting reason (extensions::UnloadedExtensionInfo::Reason) and checking
like

reason != UnloadedExtensionInfo::REASON_UPDATE.

Please let me know weather this is your comment or i misunderstood.

[Bernhard Bauer, 2014/10/15 14:23:27]

I was referring to the formatting. The original code has each condition on a
separate line, like I pointed out for OnExtensionLoaded. The formatting should
be kept for OnExtensionUnloaded() and OnExtensionWillBeInstalled() as well.

+      extension->id() == GetThemeID()) {
+    UseDefaultTheme();
+  }
+}
+
+void ThemeService::OnExtensionWillBeInstalled(
+    content::BrowserContext* browser_context,
+    const extensions::Extension* extension,
+    bool is_update,
+    bool from_ephemeral,
+    const std::string& old_name) {
+  // The theme may be initially disabled. Wait till it is loaded (if ever).
+  if (extension->is_theme())
+    installed_pending_load_id_ = extension->id();
+}
+
+void ThemeService::Shutdown() {
+  if (extension_registry_) {

[Jitu( very slow this week), 2014/10/15 14:19:06]

Removed the check

+    extension_registry_->RemoveObserver(this);
+    extension_registry_ = NULL;
+  }
+}
+
 void ThemeService::SetTheme(const Extension* extension) {
   DCHECK(extension->is_theme());
   ExtensionService* service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   if (!service->IsExtensionEnabled(extension->id())) {
     // |extension| is disabled when reverting to the previous theme via an
     // infobar.
     service->EnableExtension(extension->id());
     // Enabling the extension will call back to SetTheme().
     return;
@@ skipping 197 matching lines @@
     // If the ThemeService is not ready yet, the custom theme data pack needs to
     // be recreated from the extension.
     MigrateTheme();
     set_ready();
 
     // Send notification in case anyone requested data and cached it when the
     // theme service was not ready yet.
     NotifyThemeChanged();
   }
 
-  registrar_.Add(
-      this,
-      extensions::NOTIFICATION_EXTENSION_WILL_BE_INSTALLED_DEPRECATED,
-      content::Source<Profile>(profile_));
-  registrar_.Add(this,
-                 extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
-                 content::Source<Profile>(profile_));
+  extension_registry_->AddObserver(this);
   registrar_.Add(this,
                  extensions::NOTIFICATION_EXTENSION_ENABLED,
                  content::Source<Profile>(profile_));
-  registrar_.Add(this,
-                 extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
-                 content::Source<Profile>(profile_));
 
   base::MessageLoop::current()->PostDelayedTask(FROM_HERE,
       base::Bind(&ThemeService::RemoveUnusedThemes,
                  weak_ptr_factory_.GetWeakPtr(),
                  false),
       base::TimeDelta::FromSeconds(kRemoveUnusedThemesStartupDelay));
 }
 
 void ThemeService::MigrateTheme() {
   // TODO(erg): We need to pop up a dialog informing the user that their
@@ skipping 72 matching lines @@
 void ThemeService::OnInfobarDestroyed() {
   number_of_infobars_--;
 
   if (number_of_infobars_ == 0)
     RemoveUnusedThemes(false);
 }
 
 ThemeSyncableService* ThemeService::GetThemeSyncableService() const {
   return theme_syncable_service_.get();
 }