summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-25 22:40:23 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-25 22:40:23 +0000
commit4e9a93461499498077313a3dd30d81ef4797cb49 (patch)
tree98bfbe64f4938a043d7baaa51f7e8e269098a116 /chrome/browser/resources
parent20ecf967af4883293aca18d69889d1f85d279446 (diff)
downloadchromium_src-4e9a93461499498077313a3dd30d81ef4797cb49.zip
chromium_src-4e9a93461499498077313a3dd30d81ef4797cb49.tar.gz
chromium_src-4e9a93461499498077313a3dd30d81ef4797cb49.tar.bz2
Restore revision 12329, which I accidentally clobbered when
I moved this file. See: http://codereview.chromium.org/49011 http://codereview.chromium.org/42435 Review URL: http://codereview.chromium.org/42585 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12508 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
-rwxr-xr-xchrome/browser/resources/extensions_ui.html22
1 files changed, 17 insertions, 5 deletions
diff --git a/chrome/browser/resources/extensions_ui.html b/chrome/browser/resources/extensions_ui.html
index e719f91..14c8b9e 100755
--- a/chrome/browser/resources/extensions_ui.html
+++ b/chrome/browser/resources/extensions_ui.html
@@ -17,10 +17,12 @@ var extensionDataFormat = {
"content_scripts": [
{
"js": ["script1_file1.js", "script1_file2.js"],
+ "css": ["script1_file1.css", "script1_file2.css"],
"matches": ["http://*/*", "http://other.com/*"]
},
{
"js": ["script2_file1.js", "script2_file2.js"],
+ "css": ["script2_file1.css", "script2_file2.css"],
"matches": ["http://*/*", "http://other.com/*"]
}
]
@@ -32,10 +34,12 @@ var extensionDataFormat = {
"content_scripts": [
{
"js": ["script1_file1.js", "script1_file2.js"],
+ "css": ["script1_file1.css", "script1_file2.css"],
"matches": ["http://*/*", "http://other.com/*"]
},
{
"js": ["script2_file1.js", "script2_file2.js"],
+ "css": ["script2_file1.css", "script2_file2.css"],
"matches": ["http://*/*", "http://other.com/*"]
}
]
@@ -199,17 +203,25 @@ th.enabled {
</thead>
<tbody>
<tr>
- <td>JavaScript Files</td>
+ <td>URL Match Patterns</td>
<td>
- <span jsselect="js"
+ <span jsselect="matches"
jscontent="(($index > 0) ? ', ' : '') + $this">
</span>
</td>
</tr>
- <tr>
- <td>URL Match Patterns</td>
+ <tr>
+ <td>CSS Files</td>
<td>
- <span jsselect="matches"
+ <span jsselect="css"
+ jscontent="(($index > 0) ? ', ' : '') + $this">
+ </span>
+ </td>
+ </tr>
+ <tr>
+ <td>JavaScript Files</td>
+ <td>
+ <span jsselect="js"
jscontent="(($index > 0) ? ', ' : '') + $this">
</span>
</td>