diff options
| author | twiz@google.com <twiz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 20:38:01 +0000 |
|---|---|---|
| committer | twiz@google.com <twiz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 20:38:01 +0000 |
| commit | fac63935827a5cdc34bea6e0c72ecde405e703a9 (patch) | |
| tree | 389eeb6bec69b38edb25df9da02e3fcad9ca5723 /chrome/common/extensions | |
| parent | 08be8a78fdca57d62b5b3a942a17e414af091fca (diff) | |
| download | chromium_src-fac63935827a5cdc34bea6e0c72ecde405e703a9.zip chromium_src-fac63935827a5cdc34bea6e0c72ecde405e703a9.tar.gz chromium_src-fac63935827a5cdc34bea6e0c72ecde405e703a9.tar.bz2 | |
Addition of "optional" tag to chrome.exerpimental.popup routines that may return an undefined value.chrome.experimental.extension.getPopupView() may return undefined if no pop-up is currently displayed.chrome.experimental.popup.getParentWindow() may return undefined if called from a non-popup view.BUG=28045TEST=extension_popup_apitest.cc
Review URL: http://codereview.chromium.org/400023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32387 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions')
| -rwxr-xr-x | chrome/common/extensions/api/extension_api.json | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json index 4c83fdd..83a4e39 100755 --- a/chrome/common/extensions/api/extension_api.json +++ b/chrome/common/extensions/api/extension_api.json @@ -210,13 +210,14 @@ { "name": "getPopupView", "type": "function", - "description": "Returns a reference to the window object of the popup view.", + "description": "Returns a reference to the window object of the popup view. Returns undefined if no popup presently shown.", "parameters": [], "returns": { "type": "object", "isInstanceOf": "DOMWindow", "properties": {}, - "additionalProperties": { "type": "any" } + "additionalProperties": { "type": "any" }, + "optional": true } } ], @@ -1678,13 +1679,14 @@ { "name": "getParentWindow", "type": "function", - "description": "Returns a reference to the window object of the extension view that launched the popup.", + "description": "Returns a reference to the window object of the extension view that launched the popup. Returns undefined if called outside of a popup window.", "parameters": [], "returns": { "type": "object", "isInstanceOf": "DOMWindow", "properties": {}, - "additionalProperties": { "type": "any" } + "additionalProperties": { "type": "any" }, + "optional": true } } ], |