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/browser/extensions/extension_page_actions_module.cc | |
| 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/browser/extensions/extension_page_actions_module.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_page_actions_module.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/chrome/browser/extensions/extension_page_actions_module.cc b/chrome/browser/extensions/extension_page_actions_module.cc index 743e0a5..60eb86a 100644 --- a/chrome/browser/extensions/extension_page_actions_module.cc +++ b/chrome/browser/extensions/extension_page_actions_module.cc @@ -212,8 +212,8 @@ bool PageActionSetBadgeBackgroundColorFunction::RunImpl() { for (size_t i = 0; i < arraysize(color_array); ++i) EXTENSION_FUNCTION_VALIDATE(color_value->GetInteger(i, &color_array[i])); - SkColor color = SkColorSetARGB(color_array[3], color_array[0], color_array[1], - color_array[2]); + SkColor color = SkColorSetARGB(color_array[0], color_array[1], color_array[2], + color_array[3]); state_->set_badge_background_color(color); contents_->PageActionStateChanged(); return true; @@ -236,10 +236,7 @@ bool PageActionSetBadgeTextColorFunction::RunImpl() { for (size_t i = 0; i < arraysize(color_array); ++i) EXTENSION_FUNCTION_VALIDATE(color_value->GetInteger(i, &color_array[i])); - SkColor color = SkColorSetARGB(color_array[3], color_array[0], color_array[1], - color_array[2]); - state_->set_badge_text_color(color); - contents_->PageActionStateChanged(); + // TODO(mpcomplete): implement text coloring. return true; } |