diff options
| author | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-01 15:49:37 +0000 |
|---|---|---|
| committer | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-01 15:49:37 +0000 |
| commit | ea7c4fb4adfef2d9d0d5ebc394b8428b8804dd9f (patch) | |
| tree | 4e82bb4eb089b5ff8fc05b21ce4710ac192c4cc4 /chrome/common | |
| parent | 6a644bd074bd8c035a8b40e8e66c75122e16e66d (diff) | |
| download | chromium_src-ea7c4fb4adfef2d9d0d5ebc394b8428b8804dd9f.zip chromium_src-ea7c4fb4adfef2d9d0d5ebc394b8428b8804dd9f.tar.gz chromium_src-ea7c4fb4adfef2d9d0d5ebc394b8428b8804dd9f.tar.bz2 | |
more bookmark tests, plus fix a couple of API bugs
BUG=19099,17288
TEST=browser_tests.exe --gtest_filter=ExtensionApiTest.Bookmarks
Review URL: http://codereview.chromium.org/183020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25036 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/common_resources.grd | 2 | ||||
| -rwxr-xr-x | chrome/common/extensions/api/extension_api.json | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/chrome/common/common_resources.grd b/chrome/common/common_resources.grd index 9f422c7..6c07b07 100644 --- a/chrome/common/common_resources.grd +++ b/chrome/common/common_resources.grd @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- This comment is only here because changes to resources are not picked up -without changes to the corresponding grd file. as1 --> +without changes to the corresponding grd file. ek --> <grit latest_public_release="0" current_release="1"> <outputs> <output filename="grit/common_resources.h" type="rc_header"> diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json index 33170c1..aca961d 100755 --- a/chrome/common/extensions/api/extension_api.json +++ b/chrome/common/extensions/api/extension_api.json @@ -831,7 +831,14 @@ "index": {"type": "integer", "minimum": 0, "optional": true} } }, - {"type": "function", "name": "callback", "optional": true, "parameters": []} + { + "type": "function", + "name": "callback", + "optional": true, + "parameters": [ + {"name": "result", "$ref": "BookmarkTreeNode" } + ] + } ] }, { |