summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authormpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-09 22:08:37 +0000
committermpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-09 22:08:37 +0000
commit883fd6284db5ba9abe08b8433c8efabe18af139f (patch)
tree194fa57f433ccafe5cdb6bd2a91e057f3c2911ed /chrome/test
parenta0810b268b459d6d451882123ad12513dafb11f1 (diff)
downloadchromium_src-883fd6284db5ba9abe08b8433c8efabe18af139f.zip
chromium_src-883fd6284db5ba9abe08b8433c8efabe18af139f.tar.gz
chromium_src-883fd6284db5ba9abe08b8433c8efabe18af139f.tar.bz2
Reverting 11294.
Review URL: http://codereview.chromium.org/40321 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11295 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/data/extensions/good/extension1/1/index.html5
-rw-r--r--chrome/test/data/extensions/good/extension1/1/manifest.json1
-rw-r--r--chrome/test/data/extensions/good/extension1/1/toolstrip.html21
3 files changed, 5 insertions, 22 deletions
diff --git a/chrome/test/data/extensions/good/extension1/1/index.html b/chrome/test/data/extensions/good/extension1/1/index.html
new file mode 100644
index 0000000..2a03e43
--- /dev/null
+++ b/chrome/test/data/extensions/good/extension1/1/index.html
@@ -0,0 +1,5 @@
+<body>
+<script>
+ window.setTimeout('alert(window.extension.getTestString())', 2500);
+</script>
+</body>
diff --git a/chrome/test/data/extensions/good/extension1/1/manifest.json b/chrome/test/data/extensions/good/extension1/1/manifest.json
index 77a4639..32022c4 100644
--- a/chrome/test/data/extensions/good/extension1/1/manifest.json
+++ b/chrome/test/data/extensions/good/extension1/1/manifest.json
@@ -4,7 +4,6 @@
"version": "1.0.0.0",
"name": "My extension 1",
"description": "The first extension that I made.",
- "toolstrip": "toolstrip.html",
"content_scripts": [
{
"matches": ["http://*.google.com/*", "https://*.google.com/*"],
diff --git a/chrome/test/data/extensions/good/extension1/1/toolstrip.html b/chrome/test/data/extensions/good/extension1/1/toolstrip.html
deleted file mode 100644
index 7be7eec..0000000
--- a/chrome/test/data/extensions/good/extension1/1/toolstrip.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<style>
-body {
- overflow: hidden;
- margin: 0 0 0 0;
-}
-
-/* TODO: put the background style into body when
- https://bugs.webkit.org/show_bug.cgi?id=18445 is fixed. */
-.content {
- background: -webkit-gradient(linear, left top, left bottom, from(rgb(222, 234, 248)), to(rgb(237, 244, 252)));
- padding: 1;
-}
-</style>
-<body>
-<div class="content">
-<script>
- window.setTimeout('alert(window.extension.getTestString())', 2500);
-</script>
-<button onclick="alert('clicked')">HTML button</button>
-</div>
-</body>