diff options
Diffstat (limited to 'chrome/test/data')
5 files changed, 42 insertions, 32 deletions
diff --git a/chrome/test/data/extensions/samples/gmail_browser_action/background.html b/chrome/test/data/extensions/samples/gmail_browser_action/background.html index 7a5dd93..0c8b504 100644 --- a/chrome/test/data/extensions/samples/gmail_browser_action/background.html +++ b/chrome/test/data/extensions/samples/gmail_browser_action/background.html @@ -8,8 +8,8 @@ var browserActionHeight = 23; var canvasContext; var gmail = "http://mail.google.com/"; var gmailAtomRef = "http://mail.google.com/mail/feed/atom"; -var gmailIconName = 'gmail_logged_in.png'; -var gmailImage; +var loggedInImage; +var loggedOutImage; var pollInterval = 1000 * 10; // 10 seconds var requestTimeout = 1000 * 2; // 5 seconds var rotation = 0; @@ -26,16 +26,11 @@ chrome.tabs.onUpdated.addListener(function(tabId, changeInfo) { }); function init() { - chrome.browserAction.setBadgeBackgroundColor([230, 190, 190, 190]); - chrome.browserAction.setBadgeText("?"); - - var canvas = document.getElementById('canvas'); + var canvas = document.getElementById('canvas'); + loggedInImage = document.getElementById('logged_in'); + loggedOutImage = document.getElementById('logged_out'); canvasContext = canvas.getContext('2d'); - gmailImage = new Image(); - gmailImage.onload = function() { - window.setTimeout(startRequest, 0); - } - gmailImage.src = gmailIconName; + startRequest(); } function scheduleRequest() { @@ -50,6 +45,7 @@ function startRequest() { scheduleRequest(); }, function() { + showLoggedOut(); scheduleRequest(); } ); @@ -142,23 +138,37 @@ function animateFlip() { } else { rotation = 0; drawIconAtRotation(); - chrome.browserAction.setBadgeText(unreadCount); - chrome.browserAction.setBadgeBackgroundColor([255, 208, 0, 24]); - chrome.browserAction.setName(unreadCount + " unread emails"); + chrome.browserAction.setBadgeText({text:unreadCount}); + chrome.browserAction.setBadgeBackgroundColor({color:[255, 208, 0, 24]}); + chrome.browserAction.setTitle({title:unreadCount + " unread emails"}); } } +function showLoggedOut() { + canvasContext.save(); + canvasContext.clearRect(0, 0, browserActionWidth, browserActionHeight); + canvasContext.translate(browserActionWidth/2, browserActionHeight/2); + canvasContext.drawImage(loggedOutImage, + -loggedOutImage.width/2 - 1, -loggedOutImage.height/2); + canvasContext.restore(); + + chrome.browserAction.setIcon({imageData:canvasContext.getImageData(0, 0, + browserActionWidth,browserActionHeight)}); + chrome.browserAction.setBadgeBackgroundColor({color:[230, 190, 190, 190]}); + chrome.browserAction.setBadgeText({text:"?"}); +} + function drawIconAtRotation() { canvasContext.save(); canvasContext.clearRect(0, 0, browserActionWidth, browserActionHeight); canvasContext.translate(browserActionWidth/2, browserActionHeight/2); canvasContext.rotate(2*Math.PI*ease(rotation)); - canvasContext.drawImage(gmailImage, -gmailImage.width/2, - -gmailImage.height/2); + canvasContext.drawImage(loggedInImage, + -loggedInImage.width/2 - 1, -loggedInImage.height/2); canvasContext.restore(); - chrome.browserAction.setIcon(canvasContext.getImageData(0, 0, - browserActionWidth,browserActionHeight)); + chrome.browserAction.setIcon({imageData:canvasContext.getImageData(0, 0, + browserActionWidth,browserActionHeight)}); } function goToInbox() { @@ -166,13 +176,15 @@ function goToInbox() { } // Called when the user clicks on the browser action. -chrome.browserAction.onClicked.addListener(function(windowId) { +chrome.browserAction.onClicked.addListener(function(tab) { goToInbox(); }); </script> </head> <body onload="init()"> +<img id="logged_in" src="gmail_logged_in.png"> +<img id="logged_out" src="gmail_not_logged_in.png"> <canvas id="canvas" width="27" height="23"> </body> </html> diff --git a/chrome/test/data/extensions/samples/make_page_red/background.html b/chrome/test/data/extensions/samples/make_page_red/background.html index 30631d2..5e348e7 100755 --- a/chrome/test/data/extensions/samples/make_page_red/background.html +++ b/chrome/test/data/extensions/samples/make_page_red/background.html @@ -2,15 +2,15 @@ <head> <script> // Called when the user clicks on the browser action. - chrome.browserAction.onClicked.addListener(function(windowId) { + chrome.browserAction.onClicked.addListener(function(tab) { chrome.tabs.executeScript(null, {code:"document.body.bgColor='red'"}); }); - chrome.browserAction.setBadgeBackgroundColor([100, 0, 200, 0]); + chrome.browserAction.setBadgeBackgroundColor({color:[100, 0, 200, 0]}); var i = 0; window.setInterval(function() { - chrome.browserAction.setBadgeText(String(i)); + chrome.browserAction.setBadgeText({text:String(i)}); i++; }, 10); </script> diff --git a/chrome/test/data/extensions/samples/print_browser_action/background.html b/chrome/test/data/extensions/samples/print_browser_action/background.html index 75501ea..5b3f930 100644 --- a/chrome/test/data/extensions/samples/print_browser_action/background.html +++ b/chrome/test/data/extensions/samples/print_browser_action/background.html @@ -2,11 +2,9 @@ <head> <script> // Called when the user clicks on the browser action. - chrome.browserAction.onClicked.addListener(function(windowId) { - chrome.tabs.getSelected(windowId, function(tab) { - var action_url = "javascript:window.print();"; - chrome.tabs.update(tab.id, {url: action_url}); - }); + chrome.browserAction.onClicked.addListener(function(tab) { + var action_url = "javascript:window.print();"; + chrome.tabs.update(tab.id, {url: action_url}); }); </script> </head> 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 d15d283..8170e86 100644 --- a/chrome/test/data/extensions/samples/test_browser_action/background.html +++ b/chrome/test/data/extensions/samples/test_browser_action/background.html @@ -4,11 +4,11 @@ // Called when the user clicks on the browser action. var clicks = 0; chrome.browserAction.onClicked.addListener(function() { - chrome.browserAction.setIcon(clicks); + chrome.browserAction.setIcon({iconIndex:clicks}); clicks++; - // We only have 2 icons, but cycle through 3 icons to test the + // We only have 1 icon, but cycle through 3 icons to test the // out-of-bounds index bug. - if (clicks > 3) + if (clicks > 2) clicks = 0; }); var i = 0; @@ -17,7 +17,7 @@ // Don't animate while in "click" mode. if (clicks > 0) return; i++; - chrome.browserAction.setIcon(draw(i*2, i*4)); + chrome.browserAction.setIcon({imageData:draw(i*2, i*4)}); }, 50); function draw(starty, startx) { diff --git a/chrome/test/data/extensions/samples/test_browser_action/manifest.json b/chrome/test/data/extensions/samples/test_browser_action/manifest.json index 146668799..1134f3c 100644 --- a/chrome/test/data/extensions/samples/test_browser_action/manifest.json +++ b/chrome/test/data/extensions/samples/test_browser_action/manifest.json @@ -5,6 +5,6 @@ "background_page": "background.html", "browser_action": { "name": "First icon", - "icons": ["badicon.png", "print_16x16.png"] + "icons": ["print_16x16.png"] } } |