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/test | |
| 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/test')
| -rw-r--r-- | chrome/test/data/extensions/samples/test_browser_action/background.html | 1 | ||||
| -rw-r--r-- | chrome/test/data/extensions/samples/test_page_action/background.html | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/chrome/test/data/extensions/samples/test_browser_action/background.html b/chrome/test/data/extensions/samples/test_browser_action/background.html index bcf5083..8170e86 100644 --- a/chrome/test/data/extensions/samples/test_browser_action/background.html +++ b/chrome/test/data/extensions/samples/test_browser_action/background.html @@ -5,7 +5,6 @@ var clicks = 0; chrome.browserAction.onClicked.addListener(function() { chrome.browserAction.setIcon({iconIndex:clicks}); - chrome.browserAction.setBadgeText({text:""+i}); clicks++; // We only have 1 icon, but cycle through 3 icons to test the // out-of-bounds index bug. diff --git a/chrome/test/data/extensions/samples/test_page_action/background.html b/chrome/test/data/extensions/samples/test_page_action/background.html index d8d9d78..2c5685d 100644 --- a/chrome/test/data/extensions/samples/test_page_action/background.html +++ b/chrome/test/data/extensions/samples/test_page_action/background.html @@ -14,12 +14,12 @@ chrome.pageAction.show(info.tabId); } else { chrome.pageAction.hide(info.tabId); - setTimeout(function() { chrome.pageAction.show(info.tabId); }, 200); + setTimeout(function() { chrome.pageAction.show(info.tabId); }, 1000); } chrome.pageAction.setTitle({title: "click:" + clicks, tabId: info.tabId}); chrome.pageAction.setBadgeTextColor({ tabId: info.tabId, - color: [255, 255, clicks * 50, 255] + color: [0, 255, clicks * 50, 255] }); chrome.pageAction.setBadgeBackgroundColor({ tabId: info.tabId, @@ -27,7 +27,7 @@ }); chrome.pageAction.setBadgeText({ tabId: info.tabId, - text: i + "" + text: clicks + "" }); // We only have 2 icons, but cycle through 3 icons to test the |