summaryrefslogtreecommitdiffstats
path: root/chrome/common/extensions/api
diff options
context:
space:
mode:
authorfeldstein@chromium.org <feldstein@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-26 21:40:55 +0000
committerfeldstein@chromium.org <feldstein@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-26 21:40:55 +0000
commitdc0412127385b73df3647ebfb313b61e51ef1496 (patch)
treef1a6db934166721bf81c80909d87fd6a15565dd3 /chrome/common/extensions/api
parent31db0071f84abe836f54218bd9240adb847d3211 (diff)
downloadchromium_src-dc0412127385b73df3647ebfb313b61e51ef1496.zip
chromium_src-dc0412127385b73df3647ebfb313b61e51ef1496.tar.gz
chromium_src-dc0412127385b73df3647ebfb313b61e51ef1496.tar.bz2
Move onImportBegan/Ended to the regular bookmarks api
It used to live in the experimental.bookmarkManager namespace. BUG=35320 TEST=none Review URL: http://codereview.chromium.org/1353004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42825 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/api')
-rwxr-xr-xchrome/common/extensions/api/extension_api.json60
1 files changed, 30 insertions, 30 deletions
diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json
index ea80713..1adf289 100755
--- a/chrome/common/extensions/api/extension_api.json
+++ b/chrome/common/extensions/api/extension_api.json
@@ -1625,6 +1625,24 @@
{"type": "string", "name": "id"},
{"type": "function", "name": "callback", "optional": true, "parameters": []}
]
+ },
+ {
+ "name": "import",
+ "type": "function",
+ "description": "Imports bookmarks from a chrome html bookmark file",
+ "nodoc": "true",
+ "parameters": [
+ {"type": "function", "name": "callback", "optional": true, "parameters": []}
+ ]
+ },
+ {
+ "name": "export",
+ "type": "function",
+ "description": "Exports bookmarks to a chrome html bookmark file",
+ "nodoc": "true",
+ "parameters": [
+ {"type": "function", "name": "callback", "optional": true, "parameters": []}
+ ]
}
],
"events": [
@@ -1704,6 +1722,18 @@
}
}
]
+ },
+ {
+ "name": "onImportBegan",
+ "type": "function",
+ "description": "Fired when a bookmark import session is begun. Expensive observers should ignore handleCreated updates until onImportEnded is fired. Observers should still handle other notifications immediately.",
+ "parameters": []
+ },
+ {
+ "name": "onImportEnded",
+ "type": "function",
+ "description": "Fired when a bookmark import session is ended.",
+ "parameters": []
}
]
},
@@ -2166,24 +2196,6 @@
]
},
{
- "name": "import",
- "type": "function",
- "description": "Imports bookmarks from a chrome html bookmark file",
- "nodoc": "true",
- "parameters": [
- {"type": "function", "name": "callback", "optional": true, "parameters": []}
- ]
- },
- {
- "name": "export",
- "type": "function",
- "description": "Exports bookmarks to a chrome html bookmark file",
- "nodoc": "true",
- "parameters": [
- {"type": "function", "name": "callback", "optional": true, "parameters": []}
- ]
- },
- {
"name": "sortChildren",
"type": "function",
"description": "Sorts the children of a given folder",
@@ -2249,18 +2261,6 @@
],
"events": [
{
- "name": "onImportBegan",
- "type": "function",
- "description": "Fired when a bookmark import session is begun. Expensive observers should ignore handleCreated updates until onImportEnded is fired. Observers should still handle other notifications immediately.",
- "parameters": []
- },
- {
- "name": "onImportEnded",
- "type": "function",
- "description": "Fired when a bookmark import session is ended.",
- "parameters": []
- },
- {
"name": "onDragEnter",
"type": "function",
"description": "Fired when dragging bookmarks over the document",