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

chrome/common/extensions/extension_action.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_ACTION_H_
 #define CHROME_COMMON_EXTENSIONS_EXTENSION_ACTION_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 66 matching lines @@
 };
 
 typedef std::map<std::string, ExtensionAction*> ExtensionActionMap;
 
 // This class keeps track of what values each tab uses to override the default
 // values of the ExtensionAction.
 class ExtensionActionState {
  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_; }
   void set_title(const std::string& title) { title_ = title; }
 
   const std::string& badge_text() const { return badge_text_; }
   void set_badge_text(const std::string& badge_text) {
     badge_text_ = badge_text;
   }
 
   SkColor badge_background_color() const {
     return badge_background_color_;
   }
   void set_badge_background_color(SkColor badge_background_color) {
     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; }
 
   SkBitmap* icon() const { return icon_.get(); }
   void set_icon(SkBitmap* icon) { icon_.reset(icon); }
 
   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.
   bool hidden_;
 
   // The title text to use for tooltips and labels.
   std::string title_;
 
   // The icon to use.
   int icon_index_;
 
   // If non-NULL, overrides icon_index.
   scoped_ptr<SkBitmap> icon_;
 
     // The badge text.
   std::string badge_text_;
 
   // 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);
 };
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_ACTION_H_