[Extensions] Cache extension action icons

extensions/browser/extension_icon_image.cc

 // Copyright 2014 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 "extensions/browser/extension_icon_image.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 116 matching lines @@
     content::BrowserContext* context,
     const Extension* extension,
     const ExtensionIconSet& icon_set,
     int resource_size_in_dip,
     const gfx::ImageSkia& default_icon,
     Observer* observer)
     : browser_context_(context),
       extension_(extension),
       icon_set_(icon_set),
       resource_size_in_dip_(resource_size_in_dip),
-      observer_(observer),
       source_(NULL),
       default_icon_(gfx::ImageSkiaOperations::CreateResizedImage(
           default_icon,
           skia::ImageOperations::RESIZE_BEST,
           gfx::Size(resource_size_in_dip, resource_size_in_dip))),
       weak_ptr_factory_(this) {
+  if (observer)
+    AddObserver(observer);
   gfx::Size resource_size(resource_size_in_dip, resource_size_in_dip);
   source_ = new Source(this, resource_size);
   image_skia_ = gfx::ImageSkia(source_, resource_size);
 
   registrar_.Add(this,
                  extensions::NOTIFICATION_EXTENSION_REMOVED,
                  content::NotificationService::AllSources());
 }
 
+void IconImage::AddObserver(Observer* observer) {
+  observers_.AddObserver(observer);
+}
+
+void IconImage::RemoveObserver(Observer* observer) {
+  observers_.RemoveObserver(observer);
+}
+
 IconImage::~IconImage() {
+  FOR_EACH_OBSERVER(Observer, observers_, OnExtensionIconImageDestroyed(this));
   source_->ResetHost();
 }
 
 gfx::ImageSkiaRep IconImage::LoadImageForScaleFactor(
     ui::ScaleFactor scale_factor) {
   // Do nothing if extension is unloaded.
   if (!extension_)
     return gfx::ImageSkiaRep();
 
   const float scale = ui::GetScaleForScaleFactor(scale_factor);
@@ skipping 45 matching lines @@
     return;
 
   gfx::ImageSkiaRep rep = image->GetRepresentation(scale);
   DCHECK(!rep.is_null());
   DCHECK_EQ(scale, rep.scale());
 
   // Remove old representation if there is one.
   image_skia_.RemoveRepresentation(scale);
   image_skia_.AddRepresentation(rep);
 
-  if (observer_)
-    observer_->OnExtensionIconImageChanged(this);
+  FOR_EACH_OBSERVER(Observer, observers_, OnExtensionIconImageChanged(this));
 }
 
 void IconImage::Observe(int type,
                         const content::NotificationSource& source,
                         const content::NotificationDetails& details) {
   DCHECK_EQ(type, extensions::NOTIFICATION_EXTENSION_REMOVED);
 
   const Extension* extension = content::Details<const Extension>(details).ptr();
 
   if (extension_ == extension)
     extension_ = NULL;
 }
 
 }  // namespace extensions