[Extensions] Make extension actions use gfx::Image over gfx::ImageSkia.

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 <string>
 #include <vector>
@@ skipping 86 matching lines @@
 
   // Set this action's icon bitmap on a specific tab.
   void SetIcon(int tab_id, const gfx::Image& image);
 
   // Tries to parse |*icon| from a dictionary {"19": imageData19, "38":
   // imageData38}, returning false if a value is corrupt.
   static bool ParseIconFromCanvasDictionary(const base::DictionaryValue& dict,
                                             gfx::ImageSkia* icon);
 
   // Gets the icon that has been set using |SetIcon| for the tab.
-  gfx::ImageSkia GetExplicitlySetIcon(int tab_id) const;
+  gfx::Image GetExplicitlySetIcon(int tab_id) const;
 
   // Sets the icon for a tab, in a way that can't be read by the extension's
   // javascript.  Multiple icons can be set at the same time; some icon with the
   // highest priority will be used.
   void DeclarativeSetIcon(int tab_id, int priority, const gfx::Image& icon);
   void UndoDeclarativeSetIcon(int tab_id, int priority, const gfx::Image& icon);
 
   const ExtensionIconSet* default_icon() const {
     return default_icon_.get();
   }
@@ skipping 27 matching lines @@
     return GetValue(&badge_background_color_, tab_id);
   }
 
   // Set this action's badge visibility on a specific tab.  Returns true if
   // the visibility has changed.
   bool SetIsVisible(int tab_id, bool value);
   // The declarative appearance overrides a default appearance but is overridden
   // by an appearance set directly on the tab.
   void DeclarativeShow(int tab_id);
   void UndoDeclarativeShow(int tab_id);
-  const gfx::ImageSkia GetDeclarativeIcon(int tab_id) const;
+  const gfx::Image GetDeclarativeIcon(int tab_id) const;
 
   // Get the badge visibility for a tab, or the default badge visibility
   // if none was set.
   // Gets the visibility of |tab_id|.  Returns the first of: a specific
   // visibility set on the tab; a declarative visibility set on the tab; the
   // default visibility set for all tabs; or |false|.  Don't return this
   // result to an extension's background page because the declarative state can
   // leak information about hosts the extension doesn't have permission to
   // access.
   bool GetIsVisible(int tab_id) const {
@@ skipping 22 matching lines @@
                                   const gfx::Size& spacing) const;
 
   // 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);
 
   // Returns the image to use as the default icon for the action. Can only be
   // called after LoadDefaultIconImage().
-  gfx::ImageSkia GetDefaultIconImage() const;
+  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;
@@ skipping 47 matching lines @@
   // The id for the extension this action belongs to (as defined in the
   // extension manifest).
   const std::string extension_id_;
 
   const extensions::ActionInfo::Type action_type_;
 
   // Each of these data items can have both a global state (stored with the key
   // kDefaultTabId), or tab-specific state (stored with the tab_id as the key).
   std::map<int, GURL> popup_url_;
   std::map<int, std::string> title_;
-  std::map<int, gfx::ImageSkia> icon_;
+  std::map<int, gfx::Image> icon_;
   std::map<int, std::string> badge_text_;
   std::map<int, SkColor> badge_background_color_;
   std::map<int, SkColor> badge_text_color_;
   std::map<int, bool> is_visible_;
 
   // Declarative state exists for two reasons: First, we need to hide it from
   // the extension's background/event page to avoid leaking data from hosts the
   // extension doesn't have permission to access.  Second, the action's state
   // gets both reset and given its declarative values in response to a
   // WebContentsObserver::DidNavigateMainFrame event, and there's no way to set
@@ skipping 23 matching lines @@
 };
 
 template<>
 struct ExtensionAction::ValueTraits<int> {
   static int CreateEmpty() {
     return -1;
   }
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_H_