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

chrome/browser/extensions/extension_action.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/extensions/extension_action.h"
 
 #include <algorithm>
 
 #include "base/base64.h"
 #include "base/logging.h"
@@ skipping 114 matching lines @@
 
 bool ExtensionAction::HasPopup(int tab_id) const {
   return !GetPopupUrl(tab_id).is_empty();
 }
 
 GURL ExtensionAction::GetPopupUrl(int tab_id) const {
   return GetValue(&popup_url_, tab_id);
 }
 
 void ExtensionAction::SetIcon(int tab_id, const gfx::Image& image) {
-  SetValue(&icon_, tab_id, image.AsImageSkia());
+  SetValue(&icon_, tab_id, image);
 }
 
 bool ExtensionAction::ParseIconFromCanvasDictionary(
     const base::DictionaryValue& dict,
     gfx::ImageSkia* icon) {
   // Try to extract an icon for each known scale.
   for (size_t i = 0; i < arraysize(kIconSizes); i++) {
     const base::BinaryValue* image_data;
     std::string binary_string64;
     IPC::Message pickle;
@@ skipping 11 matching lines @@
     SkBitmap bitmap;
     if (!IPC::ReadParam(&pickle, &iter, &bitmap))
       return false;
     CHECK(!bitmap.isNull());
     float scale = ui::GetScaleForScaleFactor(kIconSizes[i].scale);
     icon->AddRepresentation(gfx::ImageSkiaRep(bitmap, scale));
   }
   return true;
 }
 
-gfx::ImageSkia ExtensionAction::GetExplicitlySetIcon(int tab_id) const {
+gfx::Image ExtensionAction::GetExplicitlySetIcon(int tab_id) const {
   return GetValue(&icon_, tab_id);
 }
 
 bool ExtensionAction::SetIsVisible(int tab_id, bool new_visibility) {
   const bool old_visibility = GetValue(&is_visible_, tab_id);
 
   if (old_visibility == new_visibility)
     return false;
 
   SetValue(&is_visible_, tab_id, new_visibility);
@@ skipping 26 matching lines @@
   std::vector<gfx::Image>& icons = declarative_icon_[tab_id][priority];
   for (std::vector<gfx::Image>::iterator it = icons.begin(); it != icons.end();
        ++it) {
     if (it->AsImageSkia().BackedBySameObjectAs(icon.AsImageSkia())) {
       icons.erase(it);
       return;
     }
   }
 }
 
-const gfx::ImageSkia ExtensionAction::GetDeclarativeIcon(int tab_id) const {
+const gfx::Image ExtensionAction::GetDeclarativeIcon(int tab_id) const {
   if (declarative_icon_.find(tab_id) != declarative_icon_.end() &&
       !declarative_icon_.find(tab_id)->second.rbegin()->second.empty()) {
-    return declarative_icon_.find(tab_id)->second.rbegin()
-        ->second.back().AsImageSkia();
+    return declarative_icon_.find(tab_id)->second.rbegin()->second.back();
   }
-  return gfx::ImageSkia();
+  return gfx::Image();
 }
 
 void ExtensionAction::ClearAllValuesForTab(int tab_id) {
   popup_url_.erase(tab_id);
   title_.erase(tab_id);
   icon_.erase(tab_id);
   badge_text_.erase(tab_id);
   badge_text_color_.erase(tab_id);
   badge_background_color_.erase(tab_id);
   is_visible_.erase(tab_id);
@@ skipping 42 matching lines @@
         browser_context,
         &extension,
         *default_icon(),
         GetIconSizeForType(action_type_),
         *GetDefaultIcon().ToImageSkia(),
         nullptr));
   }
   return default_icon_image_.get();
 }
 
-gfx::ImageSkia ExtensionAction::GetDefaultIconImage() const {
+gfx::Image ExtensionAction::GetDefaultIconImage() const {
   // If we have a default icon, it should be loaded before trying to use it.
   DCHECK(!default_icon_image_ == !default_icon_);
-  return default_icon_image_ ? default_icon_image_->image_skia() :
-      *GetDefaultIcon().ToImageSkia();
+  return default_icon_image_ ? default_icon_image_->image() : GetDefaultIcon();
 }
 
 bool ExtensionAction::HasPopupUrl(int tab_id) const {
   return HasValue(popup_url_, tab_id);
 }
 
 bool ExtensionAction::HasTitle(int tab_id) const {
   return HasValue(title_, tab_id);
 }
 
@@ skipping 33 matching lines @@
   set_id(manifest_data.id);
 
   // Initialize the specified icon set.
   if (!manifest_data.default_icon.empty())
     default_icon_.reset(new ExtensionIconSet(manifest_data.default_icon));
 
   const ExtensionIconSet& extension_icons =
       extensions::IconsInfo::GetIcons(&extension);
   // Look for any other icons.
   std::string largest_icon = extension_icons.Get(
-      extension_misc::EXTENSION_ICON_GIGANTOR,
-      ExtensionIconSet::MATCH_SMALLER);
+      extension_misc::EXTENSION_ICON_GIGANTOR, ExtensionIconSet::MATCH_SMALLER);
 
   if (!largest_icon.empty()) {
     // We found an icon to use, so create an icon set if one doesn't exist.
     if (!default_icon_)
       default_icon_.reset(new ExtensionIconSet());
     int largest_icon_size = extension_icons.GetIconSizeFromPath(largest_icon);
     // Replace any missing extension action icons with the largest icon
     // retrieved from |extension|'s manifest so long as the largest icon is
     // larger than the current key.
-    for (int i = extension_misc::kNumExtensionActionIconSizes - 1;
-         i >= 0; --i) {
+    for (int i = extension_misc::kNumExtensionActionIconSizes - 1; i >= 0;
+         --i) {
       int size = extension_misc::kExtensionActionIconSizes[i].size;
-      if (default_icon_->Get(size, ExtensionIconSet::MATCH_BIGGER).empty()
-          && largest_icon_size > size) {
+      if (default_icon_->Get(size, ExtensionIconSet::MATCH_BIGGER).empty() &&
+          largest_icon_size > size) {
         default_icon_->Add(size, largest_icon);
         break;
       }
     }
   }
 }
 
 // Determines which icon would be returned by |GetIcon|, and returns its width.
 int ExtensionAction::GetIconWidth(int tab_id) const {
   // If icon has been set, return its width.
-  gfx::ImageSkia icon = GetValue(&icon_, tab_id);
-  if (!icon.isNull())
-    return icon.width();
+  gfx::Image icon = GetValue(&icon_, tab_id);
+  if (!icon.IsEmpty())
+    return icon.Width();
   // If there is a default icon, the icon width will be set depending on our
   // action type.
   if (default_icon_)
     return GetIconSizeForType(action_type());
 
   // If no icon has been set and there is no default icon, we need favicon
   // width.
   return ui::ResourceBundle::GetSharedInstance().GetImageNamed(
           IDR_EXTENSIONS_FAVICON).Width();
 }