chrome/test/data/extensions/samples/test_browser_action/background.html - Issue 324006: Merge 29509 - Revert 29457, because this is making ExtensionBrowserTest.PageA...

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_browser_action/background.html

Issue 324006: Merge 29509 - Revert 29457, because this is making ExtensionBrowserTest.PageA... (Closed) Base URL: svn://chrome-svn/chrome/branches/223/src/

Patch Set: 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

« no previous file with comments | « chrome/common/extensions/extension_action.cc ('k') | chrome/test/data/extensions/samples/test_page_action/background.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

===================================================================

--- chrome/test/data/extensions/samples/test_browser_action/background.html (revision 29821)

+++ chrome/test/data/extensions/samples/test_browser_action/background.html (working copy)

@@ -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.

Property changes on: chrome\test\data\extensions\samples\test_browser_action\background.html

___________________________________________________________________

Added: svn:mergeinfo

Merged /trunk/src/chrome/test/data/extensions/samples/test_browser_action/background.html:r29509

Merged /branches/chrome_webkit_merge_branch/chrome/test/data/extensions/samples/test_browser_action/background.html:r69-2775