diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-19 21:04:48 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-19 21:04:48 +0000 |
| commit | 26571791f60a08657ba061d062ac60cf6fc7bc16 (patch) | |
| tree | d70b00465a0d89180ba52141c34c3004f0b07885 /chrome/test/data/extensions | |
| parent | 8f1ccdacbcfb47fa2eeb6c7e748f55c7ae4bafec (diff) | |
| download | chromium_src-26571791f60a08657ba061d062ac60cf6fc7bc16.zip chromium_src-26571791f60a08657ba061d062ac60cf6fc7bc16.tar.gz chromium_src-26571791f60a08657ba061d062ac60cf6fc7bc16.tar.bz2 | |
Fix browser crash when refreshing extensions.
If you have two extensions with page actions, you can get into
a state where it crashes if you refresh Extension A, then
Extension B and Extension A again.
BUG=http://crbug.com/44415
TEST=Covered by new test ExtensionBrowserTest.PageActionRefreshCrash
Review URL: http://codereview.chromium.org/2134008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/data/extensions')
8 files changed, 46 insertions, 0 deletions
diff --git a/chrome/test/data/extensions/browsertest/crash_44415/ExtA/background.html b/chrome/test/data/extensions/browsertest/crash_44415/ExtA/background.html new file mode 100644 index 0000000..0e1064e --- /dev/null +++ b/chrome/test/data/extensions/browsertest/crash_44415/ExtA/background.html @@ -0,0 +1,9 @@ +<html>
+<head>
+<script>
+ chrome.tabs.getSelected(null, function(tab) {
+ chrome.pageAction.show(tab.id);
+ });
+</script>
+</head>
+</html>
diff --git a/chrome/test/data/extensions/browsertest/crash_44415/ExtA/icon.png b/chrome/test/data/extensions/browsertest/crash_44415/ExtA/icon.png Binary files differnew file mode 100644 index 0000000..ff14cab --- /dev/null +++ b/chrome/test/data/extensions/browsertest/crash_44415/ExtA/icon.png diff --git a/chrome/test/data/extensions/browsertest/crash_44415/ExtA/manifest.json b/chrome/test/data/extensions/browsertest/crash_44415/ExtA/manifest.json new file mode 100644 index 0000000..e1b9d98 --- /dev/null +++ b/chrome/test/data/extensions/browsertest/crash_44415/ExtA/manifest.json @@ -0,0 +1,10 @@ +{ + "name": "Popup Test", + "version": "1.0", + "page_action": { + "default_icon": "icon.png", + "popup": "popup.html" + }, + "background_page": "background.html", + "permissions": [ "tabs", "http://*/*" ] +} diff --git a/chrome/test/data/extensions/browsertest/crash_44415/ExtA/popup.html b/chrome/test/data/extensions/browsertest/crash_44415/ExtA/popup.html new file mode 100644 index 0000000..77aacfc --- /dev/null +++ b/chrome/test/data/extensions/browsertest/crash_44415/ExtA/popup.html @@ -0,0 +1,4 @@ +<select>
+ <option>One</option>
+ <option>Two</option>
+</select>
diff --git a/chrome/test/data/extensions/browsertest/crash_44415/ExtB/background.html b/chrome/test/data/extensions/browsertest/crash_44415/ExtB/background.html new file mode 100644 index 0000000..0e1064e --- /dev/null +++ b/chrome/test/data/extensions/browsertest/crash_44415/ExtB/background.html @@ -0,0 +1,9 @@ +<html>
+<head>
+<script>
+ chrome.tabs.getSelected(null, function(tab) {
+ chrome.pageAction.show(tab.id);
+ });
+</script>
+</head>
+</html>
diff --git a/chrome/test/data/extensions/browsertest/crash_44415/ExtB/icon.png b/chrome/test/data/extensions/browsertest/crash_44415/ExtB/icon.png Binary files differnew file mode 100644 index 0000000..ff14cab --- /dev/null +++ b/chrome/test/data/extensions/browsertest/crash_44415/ExtB/icon.png diff --git a/chrome/test/data/extensions/browsertest/crash_44415/ExtB/manifest.json b/chrome/test/data/extensions/browsertest/crash_44415/ExtB/manifest.json new file mode 100644 index 0000000..bb060e5 --- /dev/null +++ b/chrome/test/data/extensions/browsertest/crash_44415/ExtB/manifest.json @@ -0,0 +1,10 @@ +{ + "name": "Popup Test2", + "version": "1.0", + "page_action": { + "default_icon": "icon.png", + "popup": "popup.html" + }, + "background_page": "background.html", + "permissions": [ "tabs", "http://*/*" ] +} diff --git a/chrome/test/data/extensions/browsertest/crash_44415/ExtB/popup.html b/chrome/test/data/extensions/browsertest/crash_44415/ExtB/popup.html new file mode 100644 index 0000000..77aacfc --- /dev/null +++ b/chrome/test/data/extensions/browsertest/crash_44415/ExtB/popup.html @@ -0,0 +1,4 @@ +<select>
+ <option>One</option>
+ <option>Two</option>
+</select>
|
