Implement browserAction.setIcon(ImageData) for extensions.

chrome/common/extensions/extension_action.h

Index: chrome/common/extensions/extension_action.h
diff --git a/chrome/common/extensions/extension_action.h b/chrome/common/extensions/extension_action.h
index 70ea09379959016bdb09e8ebb68a2cb4cd0bfc8a..1ed6854b9406e02297a58e15104076c83b81cb88 100644
--- a/chrome/common/extensions/extension_action.h
+++ b/chrome/common/extensions/extension_action.h
@@ -12,6 +12,7 @@
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 class ExtensionAction {
@@ -109,6 +110,9 @@ class ExtensionActionState {
   int icon_index() const { return icon_index_; }
   void set_icon_index(int icon_index) { icon_index_ = icon_index; }
 
+  SkBitmap* icon() const { return icon_.get(); }
+  void set_icon(SkBitmap* icon) { icon_.reset(icon); }
+
  private:
   // The title to use.
   std::string title_;
@@ -116,7 +120,10 @@ class ExtensionActionState {
   // The icon to use.
   int icon_index_;
 
-  // The badge text.
+  // If non-NULL, overrides icon_index.
+  scoped_ptr<SkBitmap> icon_;
+
+    // The badge text.
   std::string badge_text_;
 
   // The background color for the badge.