Merge 32634 - Make executeScript and insertCSS inject code into all frames....

chrome/common/extensions/api/extension_api.json

Index: chrome/common/extensions/api/extension_api.json
===================================================================
--- chrome/common/extensions/api/extension_api.json	(revision 35240)
+++ chrome/common/extensions/api/extension_api.json	(working copy)
@@ -717,11 +717,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
           },
@@ -742,11 +743,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
           },