diff options
Diffstat (limited to 'chrome/common')
-rw-r--r-- | chrome/common/extensions/extension_action.cc | 4 | ||||
-rw-r--r-- | chrome/common/extensions/extension_action.h | 15 |
2 files changed, 4 insertions, 15 deletions
diff --git a/chrome/common/extensions/extension_action.cc b/chrome/common/extensions/extension_action.cc index de15f17..13ee202 100644 --- a/chrome/common/extensions/extension_action.cc +++ b/chrome/common/extensions/extension_action.cc @@ -20,7 +20,7 @@ ExtensionAction::~ExtensionAction() { } void ExtensionActionState::PaintBadge(gfx::Canvas* canvas, - const gfx::Rect& bounds) const { + const gfx::Rect& bounds) { const std::string& text = badge_text(); if (text.empty()) return; @@ -49,7 +49,7 @@ void ExtensionActionState::PaintBadge(gfx::Canvas* canvas, SkTypeface* typeface = SkTypeface::CreateFromName("Arial", SkTypeface::kBold); SkPaint text_paint; text_paint.setAntiAlias(true); - text_paint.setColor(badge_text_color()); + text_paint.setColor(SK_ColorWHITE); text_paint.setFakeBoldText(true); text_paint.setTextAlign(SkPaint::kLeft_Align); text_paint.setTextSize(SkIntToScalar(kTextSize)); diff --git a/chrome/common/extensions/extension_action.h b/chrome/common/extensions/extension_action.h index b819edb..6decdd4 100644 --- a/chrome/common/extensions/extension_action.h +++ b/chrome/common/extensions/extension_action.h @@ -84,8 +84,7 @@ 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_text_color_(SK_ColorWHITE) { + badge_background_color_(SkColorSetARGB(255, 218, 0, 24)) { } const std::string& title() const { return title_; } @@ -103,13 +102,6 @@ class ExtensionActionState { 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; } @@ -119,7 +111,7 @@ class ExtensionActionState { bool hidden() const { return hidden_; } void set_hidden(bool hidden) { hidden_ = hidden; } - void PaintBadge(gfx::Canvas* canvas, const gfx::Rect& bounds) const; + void PaintBadge(gfx::Canvas* canvas, const gfx::Rect& bounds); private: // True if the action is in the hidden state. @@ -140,9 +132,6 @@ class ExtensionActionState { // 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); }; |