Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / common / extensions / api / tabs.json

diff --git a/src/chrome/common/extensions/api/tabs.json b/src/chrome/common/extensions/api/tabs.json
index 931a293..6dedde9 100644 (file)
--- a/src/chrome/common/extensions/api/tabs.json
+++ b/src/chrome/common/extensions/api/tabs.json
@@ -31,23 +31,6 @@
         }
       },
       {
-        "id": "InjectDetails",
-        "type": "object",
-        "description": "Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.",
-        "properties": {
-          "code": {"type": "string", "optional": true, "description": "JavaScript or CSS code to inject.<br><br><b>Warning:</b><br>Be careful using the <code>code</code> parameter. Incorrect use of it may open your extension to <a href=\"https://en.wikipedia.org/wiki/Cross-site_scripting\">cross site scripting</a> attacks."},
-          "file": {"type": "string", "optional": true, "description": "JavaScript or CSS file to inject."},
-          "allFrames": {"type": "boolean", "optional": true, "description": "If allFrames is <code>true</code>, implies that the JavaScript or CSS should be injected into all frames of current page. By default, it's <code>false</code> and is only injected into the top frame."},
-          "matchAboutBlank": {"type": "boolean", "optional": true, "description": "If matchAboutBlank is true, then the code is also injected in about:blank and about:srcdoc frames if your extension has access to its parent document. Code cannot be inserted in top-level about:-frames. By default it is <code>false</code>."},
-          "runAt": {
-            "type": "string",
-            "optional": true,
-            "enum": ["document_start", "document_end", "document_idle"],
-            "description": "The soonest that the JavaScript or CSS will be injected into the tab. Defaults to \"document_idle\"."
-          }
-        }
-      },
-      {
         "id": "ZoomSettings",
         "type": "object",
         "description": "Defines how zoom changes in a tab are handled and at what scope.",
@@ -391,9 +374,12 @@
                 "description": "Match page titles against a pattern."
               },
               "url": {
-                "type": "string",
+                "choices": [
+                  {"type": "string"},
+                  {"type": "array", "items": {"type": "string"}}
+                ],
                 "optional": true,
-                "description": "Match tabs against a <a href='match_patterns'>URL pattern</a>. Note that fragment identifiers are not matched."
+                "description": "Match tabs against one or more <a href='match_patterns'>URL patterns</a>. Note that fragment identifiers are not matched."
               },
               "windowId": {
                 "type": "integer",
@@ -654,7 +640,7 @@
             "description": "The target window. Defaults to the <a href='windows#current-window'>current window</a>."
           },
           {
-            "$ref": "types.ImageDetails",
+            "$ref": "extensionTypes.ImageDetails",
             "name": "options",
             "optional": true
           },
@@ -672,7 +658,7 @@
         "parameters": [
           {"type": "integer", "name": "tabId", "minimum": 0, "optional": true, "description": "The ID of the tab in which to run the script; defaults to the active tab of the current window."},
           {
-            "$ref": "tabs.InjectDetails",
+            "$ref": "extensionTypes.InjectDetails",
             "name": "details",
             "description": "Details of the script to run."
           },
@@ -700,7 +686,7 @@
         "parameters": [
           {"type": "integer", "name": "tabId", "minimum": 0, "optional": true, "description": "The ID of the tab in which to insert the CSS; defaults to the active tab of the current window."},
           {
-            "$ref": "tabs.InjectDetails",
+            "$ref": "extensionTypes.InjectDetails",
             "name": "details",
             "description": "Details of the CSS text to insert."
           },