diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-20 13:33:41 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-20 13:33:41 +0000 |
| commit | f3e5d10e506cabb24a281d479a9d7709124f1b1d (patch) | |
| tree | b25777d62ce8502e8abb2140fc279641979e6d3c /chrome/common/extensions/extension_action.h | |
| parent | 348485a3172d3c2be639189884b4263a90410a79 (diff) | |
| download | chromium_src-f3e5d10e506cabb24a281d479a9d7709124f1b1d.zip chromium_src-f3e5d10e506cabb24a281d479a9d7709124f1b1d.tar.gz chromium_src-f3e5d10e506cabb24a281d479a9d7709124f1b1d.tar.bz2 | |
Revert 29457, because this is making ExtensionBrowserTest.PageAction crash on Vista
Original description:
Implement badges for page actions. Also add badge text color API.
Also change color APIs from wanting ARGB to RGBA.
BUG=24635
BUG=24644
BUG=25215
Review URL: http://codereview.chromium.org/291003
TBR=mpcomplete@chromium.org
Review URL: http://codereview.chromium.org/306004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29509 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/extension_action.h')
| -rw-r--r-- | chrome/common/extensions/extension_action.h | 15 |
1 files changed, 2 insertions, 13 deletions
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); }; |