summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-08 22:58:31 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-08 22:58:31 +0000
commit1e8c93fe918da7180751eecca190a2a867c9addf (patch)
tree4579751f5aeb2598fd826959a435745f9c4e7ace /chrome/test
parent67b9363d125be4454015da11e1a233beab667943 (diff)
downloadchromium_src-1e8c93fe918da7180751eecca190a2a867c9addf.zip
chromium_src-1e8c93fe918da7180751eecca190a2a867c9addf.tar.gz
chromium_src-1e8c93fe918da7180751eecca190a2a867c9addf.tar.bz2
Preserve order of extensions when they auto-update.
Also added tests for the ExtensionToolbarModel. BUG=33401 TEST=ExtensionToolbarModelTest (new test). Review URL: http://codereview.chromium.org/587002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38407 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/data/extensions/api_test/browser_action/none/background.html6
-rw-r--r--chrome/test/data/extensions/api_test/browser_action/none/icon.pngbin0 -> 2809 bytes
-rw-r--r--chrome/test/data/extensions/api_test/browser_action/none/manifest.json8
3 files changed, 14 insertions, 0 deletions
diff --git a/chrome/test/data/extensions/api_test/browser_action/none/background.html b/chrome/test/data/extensions/api_test/browser_action/none/background.html
new file mode 100644
index 0000000..430e09a
--- /dev/null
+++ b/chrome/test/data/extensions/api_test/browser_action/none/background.html
@@ -0,0 +1,6 @@
+<html>
+<head>
+<script>
+</script>
+</head>
+</html>
diff --git a/chrome/test/data/extensions/api_test/browser_action/none/icon.png b/chrome/test/data/extensions/api_test/browser_action/none/icon.png
new file mode 100644
index 0000000..9a79a46
--- /dev/null
+++ b/chrome/test/data/extensions/api_test/browser_action/none/icon.png
Binary files differ
diff --git a/chrome/test/data/extensions/api_test/browser_action/none/manifest.json b/chrome/test/data/extensions/api_test/browser_action/none/manifest.json
new file mode 100644
index 0000000..3ce6d75
--- /dev/null
+++ b/chrome/test/data/extensions/api_test/browser_action/none/manifest.json
@@ -0,0 +1,8 @@
+{
+ "name": "An extension with no browser action",
+ "version": "1.0",
+ "background_page": "background.html",
+ "permissions": [
+ "tabs", "http://*/*"
+ ]
+}