Refactor implementation of BrowserActions, and add support for

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 b819edbc26ed62275afd83f598a2b9985b744fde..6eb66c1ac7dd931d5d4f98edd58b72099fc31d8b 100644
--- a/chrome/common/extensions/extension_action.h
+++ b/chrome/common/extensions/extension_action.h
@@ -82,6 +82,10 @@ typedef std::map<std::string, ExtensionAction*> ExtensionActionMap;
 // values of the ExtensionAction.
 class ExtensionActionState {
  public:
+  static void PaintBadge(gfx::Canvas* canvas, const gfx::Rect& bounds,
+                         const std::string& text, SkColor text_color,
+                         SkColor background_color);
+
   ExtensionActionState(std::string title, int icon_index)
     : hidden_(false), title_(title), icon_index_(icon_index),
       badge_background_color_(SkColorSetARGB(255, 218, 0, 24)),
@@ -119,8 +123,6 @@ class ExtensionActionState {
   bool hidden() const { return hidden_; }
   void set_hidden(bool hidden) { hidden_ = hidden; }
 
-  void PaintBadge(gfx::Canvas* canvas, const gfx::Rect& bounds) const;
-
  private:
   // True if the action is in the hidden state.
   bool hidden_;