diff options
author | tangjie@chromium.org <tangjie@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-20 18:27:20 +0000 |
---|---|---|
committer | tangjie@chromium.org <tangjie@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-20 18:27:20 +0000 |
commit | 20ad269e71dc2a920bb2dc6a71591066aa4192cf (patch) | |
tree | 162984e2e7d9fc8d95065f510e9d3aa4d8b03104 /chrome/common/extensions/api | |
parent | ee607b3e208cca332328f219f58e133a08f998d9 (diff) | |
download | chromium_src-20ad269e71dc2a920bb2dc6a71591066aa4192cf.zip chromium_src-20ad269e71dc2a920bb2dc6a71591066aa4192cf.tar.gz chromium_src-20ad269e71dc2a920bb2dc6a71591066aa4192cf.tar.bz2 |
Make executeScript and insertCSS inject code into all frames.
Patched from 401007(see http://codereview.chromium.org/401007/) to commit. Reviewed by aa and darin.
R=aa,darin
Review URL: http://codereview.chromium.org/421005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32634 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/api')
-rwxr-xr-x | chrome/common/extensions/api/extension_api.json | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json index 9a29dae..8797153 100755 --- a/chrome/common/extensions/api/extension_api.json +++ b/chrome/common/extensions/api/extension_api.json @@ -718,11 +718,12 @@ {"type": "integer", "name": "tabId", "optional": true, "description": "The id of tab which run the script, default to selected tab of current window."}, { "type": "object", - "name": "scriptDef", - "description": "Note:scripts are injected in the following definition order.", + "name": "details", + "description": "Details of the script to run. Either the code or file property must be set, but both may not be set at the same time.", "properties": { "code": {"type": "string", "optional": true, "description": "JavaScript code to execute."}, - "file": {"type": "string", "optional": true, "description": "JavaScript file to execute."} + "file": {"type": "string", "optional": true, "description": "JavaScript file to execute."}, + "allFrames": {"type": "boolean", "optional": true, "description": "If allFrames is true, this function injects script into all frames of current page. By default, it's false and only inject script into top main frame."} }, "optional": true }, @@ -743,11 +744,12 @@ {"type": "integer", "name": "tabId", "optional": true, "description": "The id of tab which run the script, default to selected tab of current window."}, { "type": "object", - "name": "scriptDef", - "description": "Note:css are injected in the following definition order.", + "name": "details", + "description": "Details of the css text to insert. Either the code or file property must be set, but both may not be set at the same time.", "properties": { "code": {"type": "string", "optional": true, "description": "CSS code to be injected."}, - "file": {"type": "string", "optional": true, "description": "CSS file to be injected."} + "file": {"type": "string", "optional": true, "description": "CSS file to be injected."}, + "allFrames": {"type": "boolean", "optional": true, "description": "If allFrames is true, this function injects css text into all frames of current page. By default, it's false and only inject css text into top main frame."} }, "optional": true }, |