chrome/test/data/extensions/samples/test_page_action/background.html - Issue 332021: Move page actions over to ExtensionAction2

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/data/extensions/samples/test_page_action/background.html

Issue 332021: Move page actions over to ExtensionAction2 (Closed)

Patch Set: Review feedback Created 11 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/common/extensions/extension_action2.h ('K') | « chrome/common/extensions/extension_unittest.cc ('k') | chrome/test/data/extensions/samples/test_page_action/icon1.png » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/data/extensions/samples/test_page_action/background.html

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 b9de03dc8d8c69aae4a5bda76957655677bc32a6..2b77a66ee1e073cccdd66bc393dae122e613196d 100644

--- a/chrome/test/data/extensions/samples/test_page_action/background.html

+++ b/chrome/test/data/extensions/samples/test_page_action/background.html

@@ -2,15 +2,18 @@

<head>

var lastTabId = 0;

+ var visible = false;

chrome.tabs.onUpdated.addListener(function(tabId, p) {

lastTabId = tabId;

+ chrome.pageAction.show(tabId);

});

- // Called when the user clicks on the browser action.

+ // Called when the user clicks on the page action.

var clicks = 0;

var text = "";

chrome.pageAction.onClicked.addListener(function(_, info) {

- chrome.pageAction.setIcon({iconIndex: clicks, tabId: info.tabId});

+ chrome.pageAction.setIcon({path: "icon" + (clicks + 1) + ".png",

+ tabId: info.tabId});

if (clicks % 2) {

chrome.pageAction.show(info.tabId);

} else {

@@ -18,19 +21,7 @@

setTimeout(function() { chrome.pageAction.show(info.tabId); }, 200);

}

chrome.pageAction.setTitle({title: "click:" + clicks, tabId: info.tabId});

- chrome.pageAction.setBadgeTextColor({

- tabId: info.tabId,

- color: [255, 255, clicks * 50, 255]

- });

- chrome.pageAction.setBadgeBackgroundColor({

- tabId: info.tabId,

- color: [255, clicks * 50, 0, 255]

- });

text += clicks.toString();

- chrome.pageAction.setBadgeText({

- tabId: info.tabId,

- text: text

- });

// We only have 2 icons, but cycle through 3 icons to test the

// out-of-bounds index bug.

@@ -43,6 +34,10 @@

window.setInterval(function() {

// Don't animate while in "click" mode.

if (clicks > 0) return;

+ // Don't do anything if we don't have a tab yet.

+ if (lastTabId == 0) return;

i++;

chrome.pageAction.setIcon({imageData: draw(i*2, i*4), tabId: lastTabId});

}, 50);