Remove deprecated extension notification from theme_service

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 <algorithm>
 
 #include "base/bind.h"
 #include "base/memory/ref_counted_memory.h"
@@ skipping 17 matching lines @@
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/uninstall_reason.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "grit/theme_resources.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 
+#if defined(ENABLE_EXTENSIONS)
+#include "extensions/browser/extension_registry_observer.h"
+#endif
+
 #if defined(ENABLE_SUPERVISED_USERS)
 #include "chrome/browser/supervised_user/supervised_user_theme.h"
 #endif
 
 #if defined(OS_WIN)
 #include "ui/base/win/shell.h"
 #endif
 
 using base::UserMetricsAction;
 using content::BrowserThread;
@@ skipping 41 matching lines @@
   const int kChannelTolerance = 9;
   int r = SkColorGetR(color);
   int g = SkColorGetG(color);
   int b = SkColorGetB(color);
   int range = std::max(r, std::max(g, b)) - std::min(r, std::min(g, b));
   return range < kChannelTolerance;
 }
 
 }  // namespace
 
+#if defined(ENABLE_EXTENSIONS)
+class ThemeService::ThemeObserver
+    : public extensions::ExtensionRegistryObserver {
+ public:
+  explicit ThemeObserver(ThemeService* service) : theme_service_(service) {
+    extensions::ExtensionRegistry::Get(theme_service_->profile_)
+        ->AddObserver(this);
+  }

[not at google - send to devlin, 2015/03/13 17:01:44]

Could you separate all of these methods with blank lines? Each are sufficiently
complex.

Also preferably make the event handling methods private: as well (i.e. move
"private:" up to line 115).

+  ~ThemeObserver() override {
+    extensions::ExtensionRegistry::Get(theme_service_->profile_)
+        ->RemoveObserver(this);
+  }
+  void OnExtensionWillBeInstalled(content::BrowserContext* browser_context,
+                                  const extensions::Extension* extension,
+                                  bool is_update,
+                                  bool from_ephemeral,
+                                  const std::string& old_name) override {
+    if (extension->is_theme()) {
+      // The theme may be initially disabled. Wait till it is loaded (if ever).
+      theme_service_->installed_pending_load_id_ = extension->id();
+    }
+  }
+  void OnExtensionLoaded(content::BrowserContext* browser_context,
+                         const extensions::Extension* extension) override {
+    if (extension->is_theme() &&
+        theme_service_->installed_pending_load_id_ != kDefaultThemeID &&
+        theme_service_->installed_pending_load_id_ == extension->id()) {
+      theme_service_->SetTheme(extension);
+    }
+    theme_service_->installed_pending_load_id_ = kDefaultThemeID;
+  }
+  void OnExtensionUnloaded(
+      content::BrowserContext* browser_context,
+      const extensions::Extension* extension,
+      extensions::UnloadedExtensionInfo::Reason reason) override {
+    if (reason != extensions::UnloadedExtensionInfo::REASON_UPDATE &&
+        reason != extensions::UnloadedExtensionInfo::REASON_LOCK_ALL &&
+        extension->is_theme() &&
+        extension->id() == theme_service_->GetThemeID()) {
+      theme_service_->UseDefaultTheme();
+    }
+  }
+
+ private:
+  ThemeService* theme_service_;
+};
+#endif  // defined(ENABLE_EXTENSIONS)
+
 ThemeService::ThemeService()
     : ready_(false),
       rb_(ResourceBundle::GetSharedInstance()),
-      profile_(NULL),
+      profile_(nullptr),
       installed_pending_load_id_(kDefaultThemeID),
       number_of_infobars_(0),
       weak_ptr_factory_(this) {
 }
 
 ThemeService::~ThemeService() {
   FreePlatformCaches();
 }
 
 void ThemeService::Init(Profile* profile) {
@@ skipping 26 matching lines @@
   return false;
 }
 
 bool ThemeService::UsingSystemTheme() const {
   return UsingDefaultTheme();
 }
 
 gfx::ImageSkia* ThemeService::GetImageSkiaNamed(int id) const {
   gfx::Image image = GetImageNamed(id);
   if (image.IsEmpty())
-    return NULL;
+    return nullptr;
   // TODO(pkotwicz): Remove this const cast.  The gfx::Image interface returns
   // its images const. GetImageSkiaNamed() also should but has many callsites.
   return const_cast<gfx::ImageSkia*>(image.ToImageSkia());
 }
 
 SkColor ThemeService::GetColor(int id) const {
   DCHECK(CalledOnValidThread());
   SkColor color;
   if (theme_supplier_.get() && theme_supplier_->GetColor(id, &color))
     return color;
@@ skipping 81 matching lines @@
 }
 
 base::RefCountedMemory* ThemeService::GetRawData(
     int id,
     ui::ScaleFactor scale_factor) const {
   // Check to see whether we should substitute some images.
   int ntp_alternate = GetDisplayProperty(Properties::NTP_LOGO_ALTERNATE);
   if (id == IDR_PRODUCT_LOGO && ntp_alternate != 0)
     id = IDR_PRODUCT_LOGO_WHITE;
 
-  base::RefCountedMemory* data = NULL;
+  base::RefCountedMemory* data = nullptr;
   if (theme_supplier_.get())
     data = theme_supplier_->GetRawData(id, scale_factor);
   if (!data)
     data = rb_.LoadDataResourceBytesForScale(id, ui::SCALE_FACTOR_100P);
 
   return data;
 }
 
+void ThemeService::Shutdown() {
+#if defined(ENABLE_EXTENSIONS)
+  theme_observer_.reset();
+#endif
+}
+
 void ThemeService::Observe(int type,
                            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->reason != UnloadedExtensionInfo::REASON_LOCK_ALL &&
-          unloaded_details->extension->is_theme() &&
-          unloaded_details->extension->id() == GetThemeID()) {
-        UseDefaultTheme();
-      }
-      break;
-    }
+    default:
+      NOTREACHED();
   }
 }
 
 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.
@@ skipping 66 matching lines @@
       }
     }
   }
   // TODO: Garbage collect all unused themes. This method misses themes which
   // are installed but not loaded because they are blacklisted by a management
   // policy provider.
 
   for (size_t i = 0; i < remove_list.size(); ++i) {
     service->UninstallExtension(remove_list[i],
                                 extensions::UNINSTALL_REASON_ORPHANED_THEME,
-                                base::Bind(&base::DoNothing),
-                                NULL);
+                                base::Bind(&base::DoNothing), nullptr);
   }
 }
 
 void ThemeService::UseDefaultTheme() {
   if (ready_)
     content::RecordAction(UserMetricsAction("Themes_Reset"));
 #if defined(ENABLE_SUPERVISED_USERS)
   if (IsSupervisedUser()) {
     SetSupervisedUserTheme();
     return;
@@ skipping 24 matching lines @@
   if (theme_supplier_.get() && theme_supplier_->GetTint(id, &hsl))
     return hsl;
 
   return ThemeProperties::GetDefaultTint(id);
 }
 
 void ThemeService::ClearAllThemeData() {
   if (!ready_)
     return;
 
-  SwapThemeSupplier(NULL);
+  SwapThemeSupplier(nullptr);
 
   // Clear our image cache.
   FreePlatformCaches();
 
   profile_->GetPrefs()->ClearPref(prefs::kCurrentThemePackFilename);
   SaveThemeID(kDefaultThemeID);
 
   // There should be no more infobars. This may not be the case because of
   // http://crbug.com/62154
   // RemoveUnusedThemes is called on a task because ClearAllThemeData() may
@@ skipping 24 matching lines @@
     set_ready();
     return;
   }
 
   bool loaded_pack = false;
 
   // If we don't have a file pack, we're updating from an old version.
   base::FilePath path = prefs->GetFilePath(prefs::kCurrentThemePackFilename);
   if (path != base::FilePath()) {
     SwapThemeSupplier(BrowserThemePack::BuildFromDataPack(path, current_id));
-    loaded_pack = theme_supplier_.get() != NULL;
+    loaded_pack = theme_supplier_.get() != nullptr;
   }
 
   if (loaded_pack) {
     content::RecordAction(UserMetricsAction("Themes.Loaded"));
     set_ready();
   }
   // Else: wait for the extension service to be ready so that the theme pack
   // can be recreated from the extension.
 }
 
@@ skipping 29 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_));
+#if defined(ENABLE_EXTENSIONS)
+  theme_observer_.reset(new ThemeObserver(this));
+#endif
+
   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
   // theme is being migrated.
   ExtensionService* service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
-  const Extension* extension = service ?
-      service->GetExtensionById(GetThemeID(), false) : NULL;
+  const Extension* extension =
+      service ? service->GetExtensionById(GetThemeID(), false) : nullptr;
   if (extension) {
     DLOG(ERROR) << "Migrating theme";
     BuildFromExtension(extension);
     content::RecordAction(UserMetricsAction("Themes.Migrated"));
   } else {
     DLOG(ERROR) << "Theme is mysteriously gone.";
     ClearAllThemeData();
     content::RecordAction(UserMetricsAction("Themes.Gone"));
   }
 }
@@ skipping 59 matching lines @@
 void ThemeService::OnInfobarDestroyed() {
   number_of_infobars_--;
 
   if (number_of_infobars_ == 0)
     RemoveUnusedThemes(false);
 }
 
 ThemeSyncableService* ThemeService::GetThemeSyncableService() const {
   return theme_syncable_service_.get();
 }