Merge 29556 - Revert "Revert 29457, because this is making ExtensionBrowserTe...

chrome/common/extensions/extension_action.h

Index: chrome/common/extensions/extension_action.h
===================================================================
--- chrome/common/extensions/extension_action.h	(revision 29822)
+++ chrome/common/extensions/extension_action.h	(working copy)
@@ -84,7 +84,8 @@
  public:
   ExtensionActionState(std::string title, int icon_index)
     : hidden_(false), title_(title), icon_index_(icon_index),
-      badge_background_color_(SkColorSetARGB(255, 218, 0, 24)) {
+      badge_background_color_(SkColorSetARGB(255, 218, 0, 24)),
+      badge_text_color_(SK_ColorWHITE) {
   }
 
   const std::string& title() const { return title_; }
@@ -102,6 +103,13 @@
     badge_background_color_ = badge_background_color;
   }
 
+  SkColor badge_text_color() const {
+    return badge_text_color_;
+  }
+  void set_badge_text_color(SkColor badge_text_color) {
+    badge_text_color_ = badge_text_color;
+  }
+
   int icon_index() const { return icon_index_; }
   void set_icon_index(int icon_index) { icon_index_ = icon_index; }
 
@@ -111,7 +119,7 @@
   bool hidden() const { return hidden_; }
   void set_hidden(bool hidden) { hidden_ = hidden; }
 
-  void PaintBadge(gfx::Canvas* canvas, const gfx::Rect& bounds);
+  void PaintBadge(gfx::Canvas* canvas, const gfx::Rect& bounds) const;
 
  private:
   // True if the action is in the hidden state.
@@ -132,6 +140,9 @@
   // The background color for the badge.
   SkColor badge_background_color_;
 
+  // The text color for the badge.
+  SkColor badge_text_color_;
+
   DISALLOW_COPY_AND_ASSIGN(ExtensionActionState);
 };
 
Property changes on: chrome\common\extensions\extension_action.h
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/common/extensions/extension_action.h:r29556