Move the "extension" namespace from extension_api.json into extension_api_extension.json.

Move the "extension" namespace from extension_api.json into extension_api_extension.json.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=113873

[koz (OOO until 15th September), 2011-12-07 23:05:00]

The interesting part of this change is buried in a sea of replacing the word
extension_api.json with api/.

The interesting files that changed are
extension_api.json
extension_api_extension.json
extenstion_api.cc

[koz (OOO until 15th September), 2011-12-07 23:05:47]

Also note that I haven't run the python script to update the documentation
because I am having trouble getting a build working on my computer back in
Sydney.

[not at google - send to devlin, 2011-12-07 23:26:00]

(My trivial little 2c, will let Aaron actually review it.)

There will be a lot of these JSON files and the "extension_api" part of "json"
is a bit redundant given these files are in extensions/api/...  I wonder if it
might be cleaner to put everything under a new directory like
extensions/api/schema/... so you'd get

chrome/common/extensions/api/schema/extension.json
chrome/common/extensions/api/schema/experimental.storage.json
chrome/common/extensions/api/schema/tabs.json

etc

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/api/ex...
File chrome/common/extensions/api/extension_api.cc (right):

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/api/ex...
chrome/common/extensions/api/extension_api.cc:25: static Value* LoadValue(int
resource_id) {
LoadSchema or something might be more descriptive.
Also, we can avoid a lot of static_casting below by returning a ListValue* here.

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/api/ex...
chrome/common/extensions/api/extension_api.cc:42:
value_->Append(LoadValue(IDR_EXTENSION_API_EXTENSION_JSON));
It sounds awkward, but names like IDR_EXTENSION_STORAGE_API_JSON will read
better than IDR_EXTENSION_API_EXTENSION_STORAGE_JSON so I'd call this
IDR_EXTENSION_EXTENSION_API_JSON.

[Aaron Boodman, 2011-12-07 23:30:35]

Cool, only nits.

No need to wait for another review from me.

LGTM

http://codereview.chromium.org/8869003/diff/1/chrome/browser/extensions/exten...
File chrome/browser/extensions/extension_clear_api.h (left):

http://codereview.chromium.org/8869003/diff/1/chrome/browser/extensions/exten...
chrome/browser/extensions/extension_clear_api.h:8: //
chrome/common/extensions/api/extension_api.json.
In these cases, I think it would be more clear to use the expression "the
extension API JSON".

http://codereview.chromium.org/8869003/diff/1/chrome/common/common_resources.grd
File chrome/common/common_resources.grd (right):

http://codereview.chromium.org/8869003/diff/1/chrome/common/common_resources....
chrome/common/common_resources.grd:13: <include
name="IDR_EXTENSION_API_EXTENSION_JSON"
file="extensions\api\extension_api_extension.json" type="BINDATA" />
Maybe slightly more clear as
"IDR_EXTENSION_API_JSON_<BOOKMARKS|TABS|EXTENSION|PANTS>"

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/api/ex...
File chrome/common/extensions/api/extension_api.cc (right):

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/api/ex...
chrome/common/extensions/api/extension_api.cc:42:
value_->Append(LoadValue(IDR_EXTENSION_API_EXTENSION_JSON));
cute.

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/api/ex...
File chrome/common/extensions/api/extension_api.h (right):

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/api/ex...
chrome/common/extensions/api/extension_api.h:22: // C++ Wrapper for the JSON API
definitions in api/.
Here, please use chrome/common/extensions/api/

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/api/ex...
File chrome/common/extensions/api/extension_api.json (left):

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/api/ex...
chrome/common/extensions/api/extension_api.json:3: "namespace": "extension",
woo

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/api/ex...
File chrome/common/extensions/api/extension_api_extension.json (right):

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/api/ex...
chrome/common/extensions/api/extension_api_extension.json:1: {
How about just calling this file "extension.json" (we'll later have tabs.json,
bookmarks.json, pants.json, etc).

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/docs/b...
File chrome/common/extensions/docs/build/build.py (right):

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/docs/b...
chrome/common/extensions/docs/build/build.py:28: _extension_api_extension_json =
If this is only used in the one place below, maybe not worth creating a variable
for it.

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/docs/b...
chrome/common/extensions/docs/build/build.py:192: _devtools_api_json])
That was lucky.

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/docs/e...
File
chrome/common/extensions/docs/examples/api/omnibox/extension-docs/background.js
(right):

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/docs/e...
chrome/common/extensions/docs/examples/api/omnibox/extension-docs/background.js:152:
// migrated out of extension_api.json.
I think that you should fix this before landing.

http://codereview.chromium.org/8869003/diff/1/chrome/renderer/extensions/chro...
File chrome/renderer/extensions/chrome_v8_context.cc (right):

http://codereview.chromium.org/8869003/diff/1/chrome/renderer/extensions/chro...
chrome/renderer/extensions/chrome_v8_context.cc:58: // against their schema
definitions in api/.
can just remove " in api/"

http://codereview.chromium.org/8869003/diff/1/chrome/renderer/extensions/exte...
File chrome/renderer/extensions/extension_dispatcher.h (right):

http://codereview.chromium.org/8869003/diff/1/chrome/renderer/extensions/exte...
chrome/renderer/extensions/extension_dispatcher.h:155: // All declared function
names from api/.
Can remove " from api/"

http://codereview.chromium.org/8869003/diff/1/chrome/renderer/extensions/sche...
File chrome/renderer/extensions/schema_generated_bindings.cc (right):

http://codereview.chromium.org/8869003/diff/1/chrome/renderer/extensions/sche...
chrome/renderer/extensions/schema_generated_bindings.cc:632: // Cached JS Array
representation of the extensions API defined in api/. We
of the extensions API JSON.

http://codereview.chromium.org/8869003/diff/1/chrome/renderer/extensions/sche...
File chrome/renderer/extensions/schema_generated_bindings.h (right):

http://codereview.chromium.org/8869003/diff/1/chrome/renderer/extensions/sche...
chrome/renderer/extensions/schema_generated_bindings.h:21: // in api/.
from the JSON declarations in chrome/common/extensions/api/

[not at google - send to devlin, 2011-12-08 00:13:48]

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/docs/j...
File chrome/common/extensions/docs/js/api_page_generator.js (right):

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/docs/j...
chrome/common/extensions/docs/js/api_page_generator.js:23: var SCHEMA_EXTENSION
= '../api/extension_api_extension.json';
might want to make this a list up here so that we don't need to change two
places in the future

[not at google - send to devlin, 2011-12-08 00:32:48]

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/docs/b...
File chrome/common/extensions/docs/build/build.py (right):

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/docs/b...
chrome/common/extensions/docs/build/build.py:29: _extension_api_dir +
"/extension_api_extension.json"
would be nice to do an ls *.json on here so that when we add more files, and
other people add files once this refactor is finished, they don't have to worry
about touching python

[not at google - send to devlin, 2011-12-08 00:37:05]

We will also need to update chrome/common/extensions/PRESUBMIT.py at some point.

[koz (OOO until 15th September), 2011-12-09 19:24:17]

http://codereview.chromium.org/8869003/diff/1/chrome/browser/extensions/exten...
File chrome/browser/extensions/extension_clear_api.h (left):

http://codereview.chromium.org/8869003/diff/1/chrome/browser/extensions/exten...
chrome/browser/extensions/extension_clear_api.h:8: //
chrome/common/extensions/api/extension_api.json.
On 2011/12/07 23:30:35, Aaron Boodman wrote:
> In these cases, I think it would be more clear to use the expression "the
> extension API JSON".

Done.

http://codereview.chromium.org/8869003/diff/1/chrome/common/common_resources.grd
File chrome/common/common_resources.grd (right):

http://codereview.chromium.org/8869003/diff/1/chrome/common/common_resources....
chrome/common/common_resources.grd:13: <include
name="IDR_EXTENSION_API_EXTENSION_JSON"
file="extensions\api\extension_api_extension.json" type="BINDATA" />
On 2011/12/07 23:30:35, Aaron Boodman wrote:
> Maybe slightly more clear as
> "IDR_EXTENSION_API_JSON_<BOOKMARKS|TABS|EXTENSION|PANTS>"

Done.

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/api/ex...
File chrome/common/extensions/api/extension_api.cc (right):

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/api/ex...
chrome/common/extensions/api/extension_api.cc:25: static Value* LoadValue(int
resource_id) {
On 2011/12/07 23:26:00, kalman wrote:
> LoadSchema or something might be more descriptive.
> Also, we can avoid a lot of static_casting below by returning a ListValue*
here.

I've changed this to be a pair of functions LoadSchemaList() and
AppendSchemaList().

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/api/ex...
chrome/common/extensions/api/extension_api.cc:42:
value_->Append(LoadValue(IDR_EXTENSION_API_EXTENSION_JSON));
On 2011/12/07 23:26:00, kalman wrote:
> It sounds awkward, but names like IDR_EXTENSION_STORAGE_API_JSON will read
> better than IDR_EXTENSION_API_EXTENSION_STORAGE_JSON so I'd call this
> IDR_EXTENSION_EXTENSION_API_JSON.

I've gone with aa's suggestion of IDR_EXTENSION_API_JSON_EXTENSION.

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/api/ex...
File chrome/common/extensions/api/extension_api.h (right):

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/api/ex...
chrome/common/extensions/api/extension_api.h:22: // C++ Wrapper for the JSON API
definitions in api/.
On 2011/12/07 23:30:35, Aaron Boodman wrote:
> Here, please use chrome/common/extensions/api/

Done.

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/api/ex...
File chrome/common/extensions/api/extension_api_extension.json (right):

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/api/ex...
chrome/common/extensions/api/extension_api_extension.json:1: {
On 2011/12/07 23:30:35, Aaron Boodman wrote:
> How about just calling this file "extension.json" (we'll later have tabs.json,
> bookmarks.json, pants.json, etc).

Done.

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/docs/b...
File chrome/common/extensions/docs/build/build.py (right):

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/docs/b...
chrome/common/extensions/docs/build/build.py:28: _extension_api_extension_json =
On 2011/12/07 23:30:35, Aaron Boodman wrote:
> If this is only used in the one place below, maybe not worth creating a
variable
> for it.

As per kalman's comment, I've rolled all of these into one variable.

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/docs/b...
chrome/common/extensions/docs/build/build.py:29: _extension_api_dir +
"/extension_api_extension.json"
On 2011/12/08 00:32:49, kalman wrote:
> would be nice to do an ls *.json on here so that when we add more files, and
> other people add files once this refactor is finished, they don't have to
worry
> about touching python

Done.

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/docs/b...
chrome/common/extensions/docs/build/build.py:192: _devtools_api_json])
On 2011/12/07 23:30:35, Aaron Boodman wrote:
> That was lucky.

Yes :-)

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/docs/e...
File
chrome/common/extensions/docs/examples/api/omnibox/extension-docs/background.js
(right):

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/docs/e...
chrome/common/extensions/docs/examples/api/omnibox/extension-docs/background.js:152:
// migrated out of extension_api.json.
On 2011/12/07 23:30:35, Aaron Boodman wrote:
> I think that you should fix this before landing.

Okay.

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/docs/j...
File chrome/common/extensions/docs/js/api_page_generator.js (right):

http://codereview.chromium.org/8869003/diff/1/chrome/common/extensions/docs/j...
chrome/common/extensions/docs/js/api_page_generator.js:23: var SCHEMA_EXTENSION
= '../api/extension_api_extension.json';
On 2011/12/08 00:13:48, kalman wrote:
> might want to make this a list up here so that we don't need to change two
> places in the future

Done.

http://codereview.chromium.org/8869003/diff/1/chrome/renderer/extensions/chro...
File chrome/renderer/extensions/chrome_v8_context.cc (right):

http://codereview.chromium.org/8869003/diff/1/chrome/renderer/extensions/chro...
chrome/renderer/extensions/chrome_v8_context.cc:58: // against their schema
definitions in api/.
On 2011/12/07 23:30:35, Aaron Boodman wrote:
> can just remove " in api/"

Done.

http://codereview.chromium.org/8869003/diff/1/chrome/renderer/extensions/exte...
File chrome/renderer/extensions/extension_dispatcher.h (right):

http://codereview.chromium.org/8869003/diff/1/chrome/renderer/extensions/exte...
chrome/renderer/extensions/extension_dispatcher.h:155: // All declared function
names from api/.
On 2011/12/07 23:30:35, Aaron Boodman wrote:
> Can remove " from api/"

Done.

http://codereview.chromium.org/8869003/diff/1/chrome/renderer/extensions/sche...
File chrome/renderer/extensions/schema_generated_bindings.cc (right):

http://codereview.chromium.org/8869003/diff/1/chrome/renderer/extensions/sche...
chrome/renderer/extensions/schema_generated_bindings.cc:632: // Cached JS Array
representation of the extensions API defined in api/. We
On 2011/12/07 23:30:35, Aaron Boodman wrote:
> of the extensions API JSON.

Done.

http://codereview.chromium.org/8869003/diff/1/chrome/renderer/extensions/sche...
File chrome/renderer/extensions/schema_generated_bindings.h (right):

http://codereview.chromium.org/8869003/diff/1/chrome/renderer/extensions/sche...
chrome/renderer/extensions/schema_generated_bindings.h:21: // in api/.
On 2011/12/07 23:30:35, Aaron Boodman wrote:
> from the JSON declarations in chrome/common/extensions/api/

Done.

[commit-bot: I haz the power, 2011-12-09 19:25:46]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/koz@chromium.org/8869003/16001

[commit-bot: I haz the power, 2011-12-09 19:26:28]

Can't apply patch for file chrome/common/extensions/docs/samples.json.
While running patch -p1 --forward --force;
patching file chrome/common/extensions/docs/samples.json
Hunk #1 FAILED at 67.
Hunk #2 succeeded at 862 (offset -4 lines).
1 out of 2 hunks FAILED -- saving rejects to file
chrome/common/extensions/docs/samples.json.rej

[commit-bot: I haz the power, 2011-12-09 19:51:58]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/koz@chromium.org/8869003/21031

[commit-bot: I haz the power, 2011-12-09 19:52:08]

Can't apply patch for file chrome/common/extensions/docs/samples.json.
While running patch -p1 --forward --force;
patching file chrome/common/extensions/docs/samples.json
Hunk #1 FAILED at 67.
Hunk #2 succeeded at 862 (offset -4 lines).
1 out of 2 hunks FAILED -- saving rejects to file
chrome/common/extensions/docs/samples.json.rej

[commit-bot: I haz the power, 2011-12-09 20:21:53]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/koz@chromium.org/8869003/20002

[commit-bot: I haz the power, 2011-12-09 20:24:38]

Try job failure for 8869003-20002 on linux_clang for step "update".
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_clan...

Step "update" is always a major failure.
Look at the try server FAQ for more details.