Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5293)

Unified Diff: chrome/common/extensions/api/webview.json

Issue 11953121: Fix up how the JSON Schema compiler decides whether to include or forward (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/extensions/api/webview.json
diff --git a/chrome/common/extensions/api/webview.json b/chrome/common/extensions/api/webview.json
index c6539ab4d5f01b330aa88f97b96663e3423ed56e..3d3346169fbafd9596eff21590dc6aa2bf154afc 100644
--- a/chrome/common/extensions/api/webview.json
+++ b/chrome/common/extensions/api/webview.json
@@ -7,27 +7,6 @@
"namespace": "webview",
"nodoc": true,
"dependencies": [ "extension", "tabs" ],
- "types": [
- // TODO(fsamuel): We should be usng tabs.InjectDetails. However, due to a
- // bug in the JSON compiler, we are currently copying-and-pasting this
- // type: https://crbug.com/171726.
- {
- "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."},
- "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 will only be injected into the top frame."},
- "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\"."
- }
- }
- }
- ],
"functions": [
{
"name": "executeScript",
@@ -45,7 +24,7 @@
"description": "The route ID of the guest <webview> renderer."
},
{
- "$ref": "webview.InjectDetails",
+ "$ref": "tabs.InjectDetails",
"name": "details",
"description": "Details of the script to run."
},

Powered by Google App Engine
This is Rietveld 408576698