[Extensions] Fix lifetime bug in ExtensionAction/IconImage

chrome/browser/extensions/extension_action.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_H_
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "extensions/common/constants.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/image/image.h"
 
 class GURL;
 
-namespace content {
-class BrowserContext;
-}
-
 namespace extensions {
 class Extension;
 class IconImage;
 }
 
 namespace gfx {
 class Canvas;
 class Image;
 class ImageSkia;
 class Rect;
 class Size;
 }
 
 // ExtensionAction encapsulates the state of a browser action or page action.
 // Instances can have both global and per-tab state. If a property does not have
 // a per-tab value, the global value is used instead.
 class ExtensionAction {
  public:
   // The action that the UI should take after the ExtensionAction is clicked.
   enum ShowAction {
     ACTION_NONE,
     ACTION_SHOW_POPUP,
     // We don't need a SHOW_CONTEXT_MENU because that's handled separately in
     // the UI.
   };
 
   static extension_misc::ExtensionIcons ActionIconSize();
 
+  // Returns the default icon to use when no other is available (the puzzle
+  // piece).
+  static gfx::Image FallbackIcon();
+
   // Use this ID to indicate the default state for properties that take a tab_id
   // parameter.
   static const int kDefaultTabId;
 
   ExtensionAction(const extensions::Extension& extension,
                   extensions::ActionInfo::Type action_type,
                   const extensions::ActionInfo& manifest_data);
   ~ExtensionAction();
 
   // extension id
@@ skipping 110 matching lines @@
     if (const bool* default_is_visible =
         FindOrNull(&is_visible_, kDefaultTabId))
       return *default_is_visible;
 
     return false;
   }
 
   // Remove all tab-specific state.
   void ClearAllValuesForTab(int tab_id);
 
-  // Lazily loads and returns the default icon image, if one exists for the
-  // action.
-  extensions::IconImage* LoadDefaultIconImage(
-      const extensions::Extension& extension,
-      content::BrowserContext* browser_context);
+  // Sets the default IconImage for this action.
+  void SetDefaultIconImage(std::unique_ptr<extensions::IconImage> icon_image);
 
   // Returns the image to use as the default icon for the action. Can only be
-  // called after LoadDefaultIconImage().
+  // called after SetDefaultIconImage().
   gfx::Image GetDefaultIconImage() const;
 
   // Determine whether or not the ExtensionAction has a value set for the given
   // |tab_id| for each property.
   bool HasPopupUrl(int tab_id) const;
   bool HasTitle(int tab_id) const;
   bool HasBadgeText(int tab_id) const;
   bool HasBadgeBackgroundColor(int tab_id) const;
   bool HasBadgeTextColor(int tab_id) const;
   bool HasIsVisible(int tab_id) const;
   bool HasIcon(int tab_id) const;
 
+  extensions::IconImage* default_icon_image() {
+    return default_icon_image_.get();
+  }
+
   void SetDefaultIconForTest(std::unique_ptr<ExtensionIconSet> default_icon);
 
  private:
   // Populates the action from the |extension| and |manifest_data|, filling in
   // any missing values (like title or icons) as possible.
   void Populate(const extensions::Extension& extension,
                 const extensions::ActionInfo& manifest_data);
 
   // Returns width of the current icon for tab_id.
   // TODO(tbarzic): The icon selection is done in ExtensionActionIconFactory.
@@ skipping 64 matching lines @@
   std::map<int, int> declarative_show_count_;
 
   // declarative_icon_[tab_id][declarative_rule_priority] is a vector of icon
   // images that are currently in effect
   std::map<int, std::map<int, std::vector<gfx::Image> > > declarative_icon_;
 
   // ExtensionIconSet containing paths to bitmaps from which default icon's
   // image representations will be selected.
   std::unique_ptr<ExtensionIconSet> default_icon_;
 
-  // The default icon image, if |default_icon_| exists.
-  // Lazily initialized via LoadDefaultIconImage().
+  // The default icon image, if |default_icon_| exists. Set via
+  // SetDefaultIconImage(). Since IconImages depend upon BrowserContexts, we
+  // don't have the ExtensionAction load it directly to keep this class's
+  // knowledge limited.
   std::unique_ptr<extensions::IconImage> default_icon_image_;
 
   // The lazily-initialized image for a placeholder icon, in the event that the
   // extension doesn't have its own icon. (Mutable to allow lazy init in
   // GetDefaultIconImage().)
   mutable gfx::Image placeholder_icon_image_;
 
   // The id for the ExtensionAction, for example: "RssPageAction". This is
   // needed for compat with an older version of the page actions API.
   std::string id_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionAction);
 };
 
 template<>
 struct ExtensionAction::ValueTraits<int> {
   static int CreateEmpty() {
     return -1;
   }
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_H_