Convert extension action icons code to use ImageSkia instead of SkBitmap

chrome/browser/ui/cocoa/extensions/browser_action_button.mm

Index: chrome/browser/ui/cocoa/extensions/browser_action_button.mm
diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
index a2d31c39a4acf592091d48d5701ac242876f58e6..5344dc34e8a5cfd13518bbb5a34bf8e37c7add98 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
+++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
@@ -25,6 +25,8 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_util_mac.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 #include "ui/gfx/size.h"
@@ -72,7 +74,8 @@ class ExtensionImageTrackerBridge : public content::NotificationObserver,
   void OnImageLoaded(const gfx::Image& image,
                      const std::string& extension_id,
                      int index) OVERRIDE {
-    browser_action_->CacheIcon(browser_action_->default_icon_path(), image);
+    browser_action_->CacheIcon(browser_action_->default_icon_path(),
+                               *image.ToImageSkia());
     [owner_ updateState];
   }
 
@@ -249,9 +252,9 @@ class ExtensionImageTrackerBridge : public content::NotificationObserver,
     [self setToolTip:base::SysUTF8ToNSString(tooltip)];
   }
 
-  gfx::Image image = extension_->browser_action()->GetIcon(tabId_);
-  if (!image.IsEmpty())
-    [self setImage:image.ToNSImage()];
+  gfx::ImageSkia image = extension_->browser_action()->GetIcon(tabId_);
+  if (!image.empty())
+    [self setImage:gfx::NSImageFromImageSkia(image)];

[Robert Sesek, 2012/08/07 21:44:24]

Shouldn't this use gfx::Image because it's painting in the native format? You
should be able to stuff the ImageSkia from the extension into the Image and then
let it take care of the conversion.

[tbarzic, 2012/08/07 22:29:52]

wouldn't that do basically the same thing (convert image from ImageSkia
(encapsulated in gfx::Image) to NSImage; since browser_action()->GetIcon() will
always contains ImageSkia).

(I'm not completely sure I got this right :))

[Robert Sesek, 2012/08/08 16:02:06]

Yes, that's what it would do. We've standardized on gfx::Image as the way to
plumb an image that will be converted in the view layer to the platform type.
ImageSkia is really just a multi-resolution SkBitmap, which I think this should
stay gfx::Image.

[tbarzic, 2012/08/08 18:53:51]

OK then.. Done.

 
   [[self cell] setTabId:tabId_];