summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-06 10:56:31 +0000
committerdpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-06 10:56:31 +0000
commit8fcc8920e127e7de06c1924a4a24d4426bc28cdc (patch)
treea35251da314f6a7f03b872f1e31ce2a8f47e22b3
parent32693a93eac25c04aa72b25f2a1e5f199c20e3ad (diff)
downloadchromium_src-8fcc8920e127e7de06c1924a4a24d4426bc28cdc.zip
chromium_src-8fcc8920e127e7de06c1924a4a24d4426bc28cdc.tar.gz
chromium_src-8fcc8920e127e7de06c1924a4a24d4426bc28cdc.tar.bz2
Merge 87973 - Update HelpApp to version 2.3
BUG=chromium-os:16076,chromuim-os:16078 TEST=none Review URL: http://codereview.chromium.org/7024014 TBR=dpolukhin@chromium.org Review URL: http://codereview.chromium.org/7111031 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@87975 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/help_app/manifest.json11
1 files changed, 9 insertions, 2 deletions
diff --git a/chrome/browser/resources/help_app/manifest.json b/chrome/browser/resources/help_app/manifest.json
index d8a68bf..40e5901 100644
--- a/chrome/browser/resources/help_app/manifest.json
+++ b/chrome/browser/resources/help_app/manifest.json
@@ -1,7 +1,7 @@
{
"key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqtHjbcvWT9Kbcapi0SaG28I66eRQHQvOqngCizm87qMb9RTgrftaUAGwPmxFLy4gBwO572N5ACpxsR6m2fRg9PSjeqaEojiFd28KY/b4VPoq/ukNOy97Ns7lPv4gmtNB8txuFIFuNw3s1k8nEJVAp659d7SnMsL4O1uXkW1huGQIDAQAB",
"name": "Help",
- "version": "1.5",
+ "version": "2.3",
"icons": {"16": "images/Help_16.png",
"24": "images/Help_24.png",
"48": "images/Help_48.png",
@@ -12,7 +12,14 @@
"permissions": [
"chromeosInfoPrivate",
"tabs",
- "http://www.google.com/support/chromeos/*/*",
"https://www.google.com/support/chromeos/*/*"
+ ],
+ "content_scripts": [
+ {
+ "matches": ["https://www.google.com/support/chromeos/*", "http://www.google.com/support/chromeos/*"],
+ "js": ["/javascript/contentscript.js"],
+ "run_at": "document_end",
+ "all_frames": true
+ }
]
}