Change browser/page action default icon defined in manifest to support hidpi.

chrome/common/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_COMMON_EXTENSIONS_EXTENSION_ACTION_H_
 #define CHROME_COMMON_EXTENSIONS_EXTENSION_ACTION_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
+#include "chrome/common/extensions/extension_icon_set.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/animation/linear_animation.h"
 
 class GURL;
 class SkBitmap;
 class SkDevice;
 
 namespace gfx {
 class Canvas;
 class Image;
@@ skipping 22 matching lines @@
   enum Appearance {
     // The action icon is hidden.
     INVISIBLE,
     // The action is trying to get the user's attention but isn't yet
     // running on the page.  Currently only used for script badges.
     WANTS_ATTENTION,
     // The action icon is visible with its normal appearance.
     ACTIVE,
   };
 
+  // Since ExtensionAction, living in common/, can't interact with the browser
+  // to load images, the UI code will have to load the images for each path for
+  // us by implementing this interface and pass it to |GetIcon| method.
+  // Whenever icon to return is defined by its path (stored in ExtensionIconSet)
+  // We will call Icon::Factory::GetIcon to get actual icon.
+  class IconFactory {
+   public:
+    virtual ~IconFactory() {}
+
+    virtual gfx::ImageSkia GetIcon(const ExtensionIconSet* paths,
+                                   Type action_type) = 0;
+  };
+
   // A fade-in animation.
   class IconAnimation : public ui::LinearAnimation,
                         public base::SupportsWeakPtr<IconAnimation> {
    public:
     // Observes changes to icon animation state.
     class Observer {
      public:
       virtual void OnIconChanged(const IconAnimation& animation) = 0;
 
      protected:
@@ skipping 54 matching lines @@
   // extension id
   const std::string& extension_id() const { return extension_id_; }
 
   // What kind of action is this?
   Type action_type() const { return action_type_; }
 
   // action id -- only used with legacy page actions API
   std::string id() const { return id_; }
   void set_id(const std::string& id) { id_ = id; }
 
-  // static icon paths from manifest -- only used with legacy page actions API.
-  std::vector<std::string>* icon_paths() { return &icon_paths_; }
-  const std::vector<std::string>* icon_paths() const { return &icon_paths_; }
+  const std::vector<const ExtensionIconSet*>& page_action_icons() const {
+    return page_action_icons_.get();
+  }
+
+  // Adds an IconSet for a new page action icon.
+  void AddPageActionIcon(const ExtensionIconSet* icon_set);
+
+  // Checks if specified icon index is valid.
+  bool IsValidIconIndex(int index) const;
 
   bool has_changed() const { return has_changed_; }
   void set_has_changed(bool value) { has_changed_ = value; }
 
   // Set the url which the popup will load when the user clicks this action's
   // icon.  Setting an empty URL will disable the popup for a given tab.
   void SetPopupUrl(int tab_id, const GURL& url);
 
   // Use HasPopup() to see if a popup should be displayed.
   bool HasPopup(int tab_id) const;
 
   // Get the URL to display in a popup.
   GURL GetPopupUrl(int tab_id) const;
 
   // Set this action's title on a specific tab.
   void SetTitle(int tab_id, const std::string& title) {
     SetValue(&title_, tab_id, title);
   }
 
   // If tab |tab_id| has a set title, return it.  Otherwise, return
   // the default title.
   std::string GetTitle(int tab_id) const { return GetValue(&title_, tab_id); }
 
   // Icons are a bit different because the default value can be set to either a
   // bitmap or a path. However, conceptually, there is only one default icon.
   // Setting the default icon using a path clears the bitmap and vice-versa.
 
-  // Since ExtensionAction, living in common/, can't interact with the browser
-  // to load images, the UI code needs to load the images for each path.  For
-  // each path in default_icon_path() and icon_paths(), load the image there
-  // using an ImageLoadingTracker and call CacheIcon(path, image) with the
-  // result.
-  //
-  // If an image is cached redundantly, the first load will be used.
-  void CacheIcon(const std::string& path, const gfx::Image& icon);
-
   // Set this action's icon bitmap on a specific tab.
   void SetIcon(int tab_id, const gfx::Image& image);
 
-  // Get the icon for a tab, or the default if no icon was set for this tab,
-  // retrieving icons that have been specified by path from the previous
-  // arguments to CacheIcon().  If the default icon isn't found in the cache,
-  // returns the puzzle piece icon.
-  gfx::Image GetIcon(int tab_id) const;
+  // Get the icon for a tab. If icon to return is defined by its path,
+  // |icon_factory| will be used to get the actual icon.
+  // If no icon is specified for the tab, returns the puzzle piece icon.
+  gfx::Image GetIcon(int tab_id, IconFactory* icon_factory) const;
 
   // Set this action's icon index for a specific tab.  For use with
   // icon_paths(), only used in page actions.
   void SetIconIndex(int tab_id, int index);
 
   // Get this action's icon index for a tab, or the default if no icon index
   // was set.
   int GetIconIndex(int tab_id) const {
     return GetValue(&icon_index_, tab_id);
   }
 
   // Non-tab-specific icon path. This is used to support the default_icon key of
   // page and browser actions.
-  void set_default_icon_path(const std::string& path) {
-    default_icon_path_ = path;
+  void set_default_icon(const ExtensionIconSet* icon_set) {
+     default_icon_.reset(icon_set);
   }
-  const std::string& default_icon_path() const {
-    return default_icon_path_;
+
+  const ExtensionIconSet* default_icon() const {
+    return default_icon_.get();
   }
 
   // Set this action's badge text on a specific tab.
   void SetBadgeText(int tab_id, const std::string& text) {
     SetValue(&badge_text_, tab_id, text);
   }
   // Get the badge text for a tab, or the default if no badge text was set.
   std::string GetBadgeText(int tab_id) const {
     return GetValue(&badge_text_, tab_id);
   }
@@ skipping 109 matching lines @@
   std::map<int, Appearance> appearance_;
 
   // IconAnimationWrappers own themselves so that even if the Extension and
   // ExtensionAction are destroyed on a non-UI thread, the animation will still
   // only be touched from the UI thread.  When an animation finishes, it deletes
   // itself, which causes the WeakPtr in this map to become NULL.
   // GetIconAnimationWrapper() removes NULLs to prevent the map from growing
   // without bound.
   mutable std::map<int, base::WeakPtr<IconAnimationWrapper> > icon_animation_;
 
-  std::string default_icon_path_;
+  // ExtensionIconSet with icon image representations for default icon.
+  scoped_ptr<const ExtensionIconSet> default_icon_;
+
+  // ExtensionIconSets with icon image representations for deprecated page
+  // action icons.
+  ScopedVector<const ExtensionIconSet> page_action_icons_;
 
   // 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_;
 
-  // A list of paths to icons this action might show. This is needed to support
-  // the legacy setIcon({iconIndex:...} method of the page actions API.
-  std::vector<std::string> icon_paths_;
-
-  // Saves the arguments from CacheIcon() calls.
-  std::map<std::string, gfx::ImageSkia> path_to_icon_cache_;
-
   // True if the ExtensionAction's settings have changed from what was
   // specified in the manifest.
   bool has_changed_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionAction);
 };
 
 template<>
 struct ExtensionAction::ValueTraits<int> {
   static int CreateEmpty() {
     return -1;
   }
 };
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_ACTION_H_