| Index: chrome/common/extensions/api/web_navigation.json
|
| diff --git a/chrome/common/extensions/api/web_navigation.json b/chrome/common/extensions/api/web_navigation.json
|
| index e27fb7c74779e6551c12f66cb0f9e170df4afab6..fb79b82f2555129ce461c0b2c6d1147d23b20414 100644
|
| --- a/chrome/common/extensions/api/web_navigation.json
|
| +++ b/chrome/common/extensions/api/web_navigation.json
|
| @@ -6,7 +6,19 @@
|
| {
|
| "namespace": "webNavigation",
|
| "description": "Use the <code>chrome.webNavigation</code> API to receive notifications about the status of navigation requests in-flight.",
|
| - "types": [],
|
| + "types": [
|
| + {
|
| + "id": "TransitionType",
|
| + "type": "string",
|
| + "enum": ["link", "typed", "auto_bookmark", "auto_subframe", "manual_subframe", "generated", "start_page", "form_submit", "reload", "keyword", "keyword_generated"],
|
| + "description": "Cause of the navigation. The same transition types as defined in the history API are used. These are the same transition types as defined in the <a href=\"history#transition_types\">history API</a> except with <code>\"start_page\"</code> in place of <code>\"auto_toplevel\"</code> (for backwards compatibility)."
|
| + },
|
| + {
|
| + "id": "TransitionQualifier",
|
| + "type": "string",
|
| + "enum": ["client_redirect", "server_redirect", "forward_back", "from_address_bar"]
|
| + }
|
| + ],
|
| "functions": [
|
| {
|
| "name": "getFrame",
|
| @@ -149,8 +161,8 @@
|
| "url": {"type": "string"},
|
| "processId": {"type": "integer", "description": "The ID of the process runs the renderer for this tab."},
|
| "frameId": {"type": "integer", "description": "0 indicates the navigation happens in the tab content window; a positive value indicates navigation in a subframe. Frame IDs are unique within a tab."},
|
| - "transitionType": {"type": "string", "enum": ["link", "typed", "auto_bookmark", "auto_subframe", "manual_subframe", "generated", "start_page", "form_submit", "reload", "keyword", "keyword_generated"], "description": "Cause of the navigation. The same transition types as defined in the history API are used. These are the same transition types as defined in the <a href=\"history#transition_types\">history API</a> except with <code>\"start_page\"</code> in place of <code>\"auto_toplevel\"</code> (for backwards compatibility)."},
|
| - "transitionQualifiers": {"type": "array", "description": "A list of transition qualifiers.", "items": {"type": "string", "enum": ["client_redirect", "server_redirect", "forward_back", "from_address_bar"]}},
|
| + "transitionType": {"$ref": "TransitionType", "description": "Cause of the navigation."},
|
| + "transitionQualifiers": {"type": "array", "description": "A list of transition qualifiers.", "items": {"$ref": "TransitionQualifier"}},
|
| "timeStamp": {"type": "number", "description": "The time when the navigation was committed, in milliseconds since the epoch."}
|
| }
|
| }
|
| @@ -283,8 +295,8 @@
|
| "url": {"type": "string"},
|
| "processId": {"type": "integer", "description": "The ID of the process runs the renderer for this tab."},
|
| "frameId": {"type": "integer", "description": "0 indicates the navigation happens in the tab content window; a positive value indicates navigation in a subframe. Frame IDs are unique within a tab."},
|
| - "transitionType": {"type": "string", "enum": ["link", "typed", "auto_bookmark", "auto_subframe", "manual_subframe", "generated", "start_page", "form_submit", "reload", "keyword", "keyword_generated"], "description": "Cause of the navigation. The same transition types as defined in the history API are used. These are the same transition types as defined in the <a href=\"history#transition_types\">history API</a> except with <code>\"start_page\"</code> in place of <code>\"auto_toplevel\"</code> (for backwards compatibility)."},
|
| - "transitionQualifiers": {"type": "array", "description": "A list of transition qualifiers.", "items": {"type": "string", "enum": ["client_redirect", "server_redirect", "forward_back", "from_address_bar"]}},
|
| + "transitionType": {"$ref": "TransitionType", "description": "Cause of the navigation."},
|
| + "transitionQualifiers": {"type": "array", "description": "A list of transition qualifiers.", "items": {"$ref": "TransitionQualifier"}},
|
| "timeStamp": {"type": "number", "description": "The time when the navigation was committed, in milliseconds since the epoch."}
|
| }
|
| }
|
| @@ -327,8 +339,8 @@
|
| "url": {"type": "string"},
|
| "processId": {"type": "integer", "description": "The ID of the process runs the renderer for this tab."},
|
| "frameId": {"type": "integer", "description": "0 indicates the navigation happens in the tab content window; a positive value indicates navigation in a subframe. Frame IDs are unique within a tab."},
|
| - "transitionType": {"type": "string", "enum": ["link", "typed", "auto_bookmark", "auto_subframe", "manual_subframe", "generated", "start_page", "form_submit", "reload", "keyword", "keyword_generated"], "description": "Cause of the navigation. The same transition types as defined in the history API are used. These are the same transition types as defined in the <a href=\"history#transition_types\">history API</a> except with <code>\"start_page\"</code> in place of <code>\"auto_toplevel\"</code> (for backwards compatibility)."},
|
| - "transitionQualifiers": {"type": "array", "description": "A list of transition qualifiers.", "items": {"type": "string", "enum": ["client_redirect", "server_redirect", "forward_back", "from_address_bar"]}},
|
| + "transitionType": {"$ref": "TransitionType", "description": "Cause of the navigation."},
|
| + "transitionQualifiers": {"type": "array", "description": "A list of transition qualifiers.", "items": {"$ref": "TransitionQualifier"}},
|
| "timeStamp": {"type": "number", "description": "The time when the navigation was committed, in milliseconds since the epoch."}
|
| }
|
| }
|
|
|