summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/extensions/api/bookmarks.json4
-rw-r--r--chrome/common/extensions/api/browserAction.json4
-rw-r--r--chrome/common/extensions/api/browsingData.json4
-rw-r--r--chrome/common/extensions/api/chromeAuthPrivate.json4
-rw-r--r--chrome/common/extensions/api/chromePrivate.json4
-rw-r--r--chrome/common/extensions/api/chromeosInfoPrivate.json4
-rw-r--r--chrome/common/extensions/api/contentSettings.json4
-rw-r--r--chrome/common/extensions/api/contextMenus.json4
-rw-r--r--chrome/common/extensions/api/cookies.json4
-rw-r--r--chrome/common/extensions/api/debugger.json4
-rw-r--r--chrome/common/extensions/api/devtools.json4
-rw-r--r--chrome/common/extensions/api/devtools_api.json4
-rw-r--r--chrome/common/extensions/api/experimental.accessibility.json4
-rw-r--r--chrome/common/extensions/api/experimental.app.json4
-rw-r--r--chrome/common/extensions/api/experimental.bookmarkManager.json4
-rw-r--r--chrome/common/extensions/api/experimental.declarative.json4
-rw-r--r--chrome/common/extensions/api/experimental.dns.json4
-rw-r--r--chrome/common/extensions/api/experimental.downloads.json4
-rw-r--r--chrome/common/extensions/api/experimental.extension.json4
-rw-r--r--chrome/common/extensions/api/experimental.fonts.json4
-rw-r--r--chrome/common/extensions/api/experimental.infobars.json4
-rw-r--r--chrome/common/extensions/api/experimental.input.ui.json4
-rw-r--r--chrome/common/extensions/api/experimental.input.virtualKeyboard.json4
-rw-r--r--chrome/common/extensions/api/experimental.keybinding.json4
-rw-r--r--chrome/common/extensions/api/experimental.processes.json4
-rw-r--r--chrome/common/extensions/api/experimental.rlz.json4
-rw-r--r--chrome/common/extensions/api/experimental.serial.json4
-rw-r--r--chrome/common/extensions/api/experimental.socket.json4
-rw-r--r--chrome/common/extensions/api/experimental.speechInput.json4
-rw-r--r--chrome/common/extensions/api/experimental.topSites.json4
-rw-r--r--chrome/common/extensions/api/extension.json4
-rw-r--r--chrome/common/extensions/api/fileBrowserHandler.json4
-rw-r--r--chrome/common/extensions/api/fileBrowserPrivate.json4
-rw-r--r--chrome/common/extensions/api/history.json4
-rw-r--r--chrome/common/extensions/api/i18n.json4
-rw-r--r--chrome/common/extensions/api/idle.json4
-rw-r--r--chrome/common/extensions/api/input.ime.json4
-rw-r--r--chrome/common/extensions/api/inputMethodPrivate.json4
-rw-r--r--chrome/common/extensions/api/management.json4
-rw-r--r--chrome/common/extensions/api/mediaPlayerPrivate.json4
-rw-r--r--chrome/common/extensions/api/metricsPrivate.json4
-rw-r--r--chrome/common/extensions/api/omnibox.json4
-rw-r--r--chrome/common/extensions/api/pageAction.json4
-rw-r--r--chrome/common/extensions/api/pageActions.json4
-rw-r--r--chrome/common/extensions/api/pageCapture.json4
-rw-r--r--chrome/common/extensions/api/permissions.json4
-rw-r--r--chrome/common/extensions/api/privacy.json4
-rw-r--r--chrome/common/extensions/api/proxy.json4
-rw-r--r--chrome/common/extensions/api/storage.json4
-rw-r--r--chrome/common/extensions/api/systemPrivate.json4
-rw-r--r--chrome/common/extensions/api/tabs.json4
-rw-r--r--chrome/common/extensions/api/terminalPrivate.json4
-rw-r--r--chrome/common/extensions/api/test.json4
-rw-r--r--chrome/common/extensions/api/tts.json4
-rw-r--r--chrome/common/extensions/api/ttsEngine.json4
-rw-r--r--chrome/common/extensions/api/types.json4
-rw-r--r--chrome/common/extensions/api/webNavigation.json4
-rw-r--r--chrome/common/extensions/api/webRequest.json4
-rw-r--r--chrome/common/extensions/api/webSocketProxyPrivate.json4
-rw-r--r--chrome/common/extensions/api/webstorePrivate.json4
-rw-r--r--chrome/common/extensions/api/windows.json4
-rw-r--r--chrome/common/extensions/docs/build/directory.py4
-rw-r--r--chrome/common/extensions/docs/js/api_page_generator.js4
-rw-r--r--chrome/common/extensions/docs/template/page_shell.html3
64 files changed, 3 insertions, 252 deletions
diff --git a/chrome/common/extensions/api/bookmarks.json b/chrome/common/extensions/api/bookmarks.json
index c507aad..8d115f4 100644
--- a/chrome/common/extensions/api/bookmarks.json
+++ b/chrome/common/extensions/api/bookmarks.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "bookmarks",
diff --git a/chrome/common/extensions/api/browserAction.json b/chrome/common/extensions/api/browserAction.json
index c6f2d6e..b051608 100644
--- a/chrome/common/extensions/api/browserAction.json
+++ b/chrome/common/extensions/api/browserAction.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "browserAction",
diff --git a/chrome/common/extensions/api/browsingData.json b/chrome/common/extensions/api/browsingData.json
index 8848f6e..d077277 100644
--- a/chrome/common/extensions/api/browsingData.json
+++ b/chrome/common/extensions/api/browsingData.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "browsingData",
diff --git a/chrome/common/extensions/api/chromeAuthPrivate.json b/chrome/common/extensions/api/chromeAuthPrivate.json
index 9f29fe7..92b3550 100644
--- a/chrome/common/extensions/api/chromeAuthPrivate.json
+++ b/chrome/common/extensions/api/chromeAuthPrivate.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "chromeAuthPrivate",
diff --git a/chrome/common/extensions/api/chromePrivate.json b/chrome/common/extensions/api/chromePrivate.json
index d5b4168..0cb05ac 100644
--- a/chrome/common/extensions/api/chromePrivate.json
+++ b/chrome/common/extensions/api/chromePrivate.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "chromePrivate",
diff --git a/chrome/common/extensions/api/chromeosInfoPrivate.json b/chrome/common/extensions/api/chromeosInfoPrivate.json
index e2cd008..0779ef72 100644
--- a/chrome/common/extensions/api/chromeosInfoPrivate.json
+++ b/chrome/common/extensions/api/chromeosInfoPrivate.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "chromeosInfoPrivate",
diff --git a/chrome/common/extensions/api/contentSettings.json b/chrome/common/extensions/api/contentSettings.json
index 2d6e803..74396bf 100644
--- a/chrome/common/extensions/api/contentSettings.json
+++ b/chrome/common/extensions/api/contentSettings.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "contentSettings",
diff --git a/chrome/common/extensions/api/contextMenus.json b/chrome/common/extensions/api/contextMenus.json
index aa38a6f..aa60918 100644
--- a/chrome/common/extensions/api/contextMenus.json
+++ b/chrome/common/extensions/api/contextMenus.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "contextMenus",
diff --git a/chrome/common/extensions/api/cookies.json b/chrome/common/extensions/api/cookies.json
index fd3a633..d70afa8 100644
--- a/chrome/common/extensions/api/cookies.json
+++ b/chrome/common/extensions/api/cookies.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "cookies",
diff --git a/chrome/common/extensions/api/debugger.json b/chrome/common/extensions/api/debugger.json
index c34e41c..5642b14 100644
--- a/chrome/common/extensions/api/debugger.json
+++ b/chrome/common/extensions/api/debugger.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "debugger",
diff --git a/chrome/common/extensions/api/devtools.json b/chrome/common/extensions/api/devtools.json
index 4a6d9df..a37576c 100644
--- a/chrome/common/extensions/api/devtools.json
+++ b/chrome/common/extensions/api/devtools.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "devtools",
diff --git a/chrome/common/extensions/api/devtools_api.json b/chrome/common/extensions/api/devtools_api.json
index 4d21eed..591cdfb 100644
--- a/chrome/common/extensions/api/devtools_api.json
+++ b/chrome/common/extensions/api/devtools_api.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "devtools.inspectedWindow",
diff --git a/chrome/common/extensions/api/experimental.accessibility.json b/chrome/common/extensions/api/experimental.accessibility.json
index 23b785a..5cc2ae6 100644
--- a/chrome/common/extensions/api/experimental.accessibility.json
+++ b/chrome/common/extensions/api/experimental.accessibility.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "experimental.accessibility",
diff --git a/chrome/common/extensions/api/experimental.app.json b/chrome/common/extensions/api/experimental.app.json
index a8cdc07..e410d97 100644
--- a/chrome/common/extensions/api/experimental.app.json
+++ b/chrome/common/extensions/api/experimental.app.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace":"experimental.app",
diff --git a/chrome/common/extensions/api/experimental.bookmarkManager.json b/chrome/common/extensions/api/experimental.bookmarkManager.json
index 9d130c8..48dae6e 100644
--- a/chrome/common/extensions/api/experimental.bookmarkManager.json
+++ b/chrome/common/extensions/api/experimental.bookmarkManager.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "experimental.bookmarkManager",
diff --git a/chrome/common/extensions/api/experimental.declarative.json b/chrome/common/extensions/api/experimental.declarative.json
index f75421e..aebed718 100644
--- a/chrome/common/extensions/api/experimental.declarative.json
+++ b/chrome/common/extensions/api/experimental.declarative.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "experimental.declarative",
diff --git a/chrome/common/extensions/api/experimental.dns.json b/chrome/common/extensions/api/experimental.dns.json
index 2e99d68..ea819cf 100644
--- a/chrome/common/extensions/api/experimental.dns.json
+++ b/chrome/common/extensions/api/experimental.dns.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "experimental.dns",
diff --git a/chrome/common/extensions/api/experimental.downloads.json b/chrome/common/extensions/api/experimental.downloads.json
index 7e2c8c4..0df9c35 100644
--- a/chrome/common/extensions/api/experimental.downloads.json
+++ b/chrome/common/extensions/api/experimental.downloads.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "experimental.downloads",
diff --git a/chrome/common/extensions/api/experimental.extension.json b/chrome/common/extensions/api/experimental.extension.json
index 5eae7bf..907f5ff 100644
--- a/chrome/common/extensions/api/experimental.extension.json
+++ b/chrome/common/extensions/api/experimental.extension.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "experimental.extension",
diff --git a/chrome/common/extensions/api/experimental.fonts.json b/chrome/common/extensions/api/experimental.fonts.json
index 98ce2eb..13c3ff0 100644
--- a/chrome/common/extensions/api/experimental.fonts.json
+++ b/chrome/common/extensions/api/experimental.fonts.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "experimental.fontSettings",
diff --git a/chrome/common/extensions/api/experimental.infobars.json b/chrome/common/extensions/api/experimental.infobars.json
index f7d797d..7bffdc3 100644
--- a/chrome/common/extensions/api/experimental.infobars.json
+++ b/chrome/common/extensions/api/experimental.infobars.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "experimental.infobars",
diff --git a/chrome/common/extensions/api/experimental.input.ui.json b/chrome/common/extensions/api/experimental.input.ui.json
index 303d947..95db905 100644
--- a/chrome/common/extensions/api/experimental.input.ui.json
+++ b/chrome/common/extensions/api/experimental.input.ui.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "experimental.input.ui",
diff --git a/chrome/common/extensions/api/experimental.input.virtualKeyboard.json b/chrome/common/extensions/api/experimental.input.virtualKeyboard.json
index 6845d8f..0812017 100644
--- a/chrome/common/extensions/api/experimental.input.virtualKeyboard.json
+++ b/chrome/common/extensions/api/experimental.input.virtualKeyboard.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "experimental.input.virtualKeyboard",
diff --git a/chrome/common/extensions/api/experimental.keybinding.json b/chrome/common/extensions/api/experimental.keybinding.json
index 3816cbb..93a314e 100644
--- a/chrome/common/extensions/api/experimental.keybinding.json
+++ b/chrome/common/extensions/api/experimental.keybinding.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "experimental.keybinding",
diff --git a/chrome/common/extensions/api/experimental.processes.json b/chrome/common/extensions/api/experimental.processes.json
index be7cf52..b2f36f3 100644
--- a/chrome/common/extensions/api/experimental.processes.json
+++ b/chrome/common/extensions/api/experimental.processes.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "experimental.processes",
diff --git a/chrome/common/extensions/api/experimental.rlz.json b/chrome/common/extensions/api/experimental.rlz.json
index b954a4e..56f1f1c 100644
--- a/chrome/common/extensions/api/experimental.rlz.json
+++ b/chrome/common/extensions/api/experimental.rlz.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "experimental.rlz",
diff --git a/chrome/common/extensions/api/experimental.serial.json b/chrome/common/extensions/api/experimental.serial.json
index 579fa18f..f5a225d 100644
--- a/chrome/common/extensions/api/experimental.serial.json
+++ b/chrome/common/extensions/api/experimental.serial.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "experimental.serial",
diff --git a/chrome/common/extensions/api/experimental.socket.json b/chrome/common/extensions/api/experimental.socket.json
index 0a66f2f..2cbd770 100644
--- a/chrome/common/extensions/api/experimental.socket.json
+++ b/chrome/common/extensions/api/experimental.socket.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "experimental.socket",
diff --git a/chrome/common/extensions/api/experimental.speechInput.json b/chrome/common/extensions/api/experimental.speechInput.json
index 280eb9d..1c7f610 100644
--- a/chrome/common/extensions/api/experimental.speechInput.json
+++ b/chrome/common/extensions/api/experimental.speechInput.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "experimental.speechInput",
diff --git a/chrome/common/extensions/api/experimental.topSites.json b/chrome/common/extensions/api/experimental.topSites.json
index 6f247e7..2ff669b 100644
--- a/chrome/common/extensions/api/experimental.topSites.json
+++ b/chrome/common/extensions/api/experimental.topSites.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "experimental.topSites",
diff --git a/chrome/common/extensions/api/extension.json b/chrome/common/extensions/api/extension.json
index 79fd472..0ac4a34 100644
--- a/chrome/common/extensions/api/extension.json
+++ b/chrome/common/extensions/api/extension.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "extension",
diff --git a/chrome/common/extensions/api/fileBrowserHandler.json b/chrome/common/extensions/api/fileBrowserHandler.json
index 32d54d7..4dce39e 100644
--- a/chrome/common/extensions/api/fileBrowserHandler.json
+++ b/chrome/common/extensions/api/fileBrowserHandler.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace":"fileBrowserHandler",
diff --git a/chrome/common/extensions/api/fileBrowserPrivate.json b/chrome/common/extensions/api/fileBrowserPrivate.json
index a9055db..e2bfe2d 100644
--- a/chrome/common/extensions/api/fileBrowserPrivate.json
+++ b/chrome/common/extensions/api/fileBrowserPrivate.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace":"fileBrowserPrivate",
diff --git a/chrome/common/extensions/api/history.json b/chrome/common/extensions/api/history.json
index c2c0e62..0009891 100644
--- a/chrome/common/extensions/api/history.json
+++ b/chrome/common/extensions/api/history.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "history",
diff --git a/chrome/common/extensions/api/i18n.json b/chrome/common/extensions/api/i18n.json
index ca3b81a..6b0a522 100644
--- a/chrome/common/extensions/api/i18n.json
+++ b/chrome/common/extensions/api/i18n.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "i18n",
diff --git a/chrome/common/extensions/api/idle.json b/chrome/common/extensions/api/idle.json
index 03ad9af4..ccce790b 100644
--- a/chrome/common/extensions/api/idle.json
+++ b/chrome/common/extensions/api/idle.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "idle",
diff --git a/chrome/common/extensions/api/input.ime.json b/chrome/common/extensions/api/input.ime.json
index 9ddcea8..8227c02 100644
--- a/chrome/common/extensions/api/input.ime.json
+++ b/chrome/common/extensions/api/input.ime.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "input.ime",
diff --git a/chrome/common/extensions/api/inputMethodPrivate.json b/chrome/common/extensions/api/inputMethodPrivate.json
index 6c44192..8e8a826 100644
--- a/chrome/common/extensions/api/inputMethodPrivate.json
+++ b/chrome/common/extensions/api/inputMethodPrivate.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "inputMethodPrivate",
diff --git a/chrome/common/extensions/api/management.json b/chrome/common/extensions/api/management.json
index 6661c85..59408df 100644
--- a/chrome/common/extensions/api/management.json
+++ b/chrome/common/extensions/api/management.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace":"management",
diff --git a/chrome/common/extensions/api/mediaPlayerPrivate.json b/chrome/common/extensions/api/mediaPlayerPrivate.json
index fef30a0..d7b4ea0 100644
--- a/chrome/common/extensions/api/mediaPlayerPrivate.json
+++ b/chrome/common/extensions/api/mediaPlayerPrivate.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "mediaPlayerPrivate",
diff --git a/chrome/common/extensions/api/metricsPrivate.json b/chrome/common/extensions/api/metricsPrivate.json
index 0113563..6de64f2 100644
--- a/chrome/common/extensions/api/metricsPrivate.json
+++ b/chrome/common/extensions/api/metricsPrivate.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "metricsPrivate",
diff --git a/chrome/common/extensions/api/omnibox.json b/chrome/common/extensions/api/omnibox.json
index bcad742..9b4f66f 100644
--- a/chrome/common/extensions/api/omnibox.json
+++ b/chrome/common/extensions/api/omnibox.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "omnibox",
diff --git a/chrome/common/extensions/api/pageAction.json b/chrome/common/extensions/api/pageAction.json
index 9446006..e07f029 100644
--- a/chrome/common/extensions/api/pageAction.json
+++ b/chrome/common/extensions/api/pageAction.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "pageAction",
diff --git a/chrome/common/extensions/api/pageActions.json b/chrome/common/extensions/api/pageActions.json
index 7283439..69e5078 100644
--- a/chrome/common/extensions/api/pageActions.json
+++ b/chrome/common/extensions/api/pageActions.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "pageActions",
diff --git a/chrome/common/extensions/api/pageCapture.json b/chrome/common/extensions/api/pageCapture.json
index 5b8fe85..13a531e 100644
--- a/chrome/common/extensions/api/pageCapture.json
+++ b/chrome/common/extensions/api/pageCapture.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "pageCapture",
diff --git a/chrome/common/extensions/api/permissions.json b/chrome/common/extensions/api/permissions.json
index 4f4b362..377a43f 100644
--- a/chrome/common/extensions/api/permissions.json
+++ b/chrome/common/extensions/api/permissions.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "permissions",
diff --git a/chrome/common/extensions/api/privacy.json b/chrome/common/extensions/api/privacy.json
index ea0f9aa..00e8b46 100644
--- a/chrome/common/extensions/api/privacy.json
+++ b/chrome/common/extensions/api/privacy.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "privacy",
diff --git a/chrome/common/extensions/api/proxy.json b/chrome/common/extensions/api/proxy.json
index ef8d38a..1b6065a 100644
--- a/chrome/common/extensions/api/proxy.json
+++ b/chrome/common/extensions/api/proxy.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "proxy",
diff --git a/chrome/common/extensions/api/storage.json b/chrome/common/extensions/api/storage.json
index b3a7e98..7165941 100644
--- a/chrome/common/extensions/api/storage.json
+++ b/chrome/common/extensions/api/storage.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "storage",
diff --git a/chrome/common/extensions/api/systemPrivate.json b/chrome/common/extensions/api/systemPrivate.json
index ec6cc53..7214419 100644
--- a/chrome/common/extensions/api/systemPrivate.json
+++ b/chrome/common/extensions/api/systemPrivate.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "systemPrivate",
diff --git a/chrome/common/extensions/api/tabs.json b/chrome/common/extensions/api/tabs.json
index de8ed67..35bffac 100644
--- a/chrome/common/extensions/api/tabs.json
+++ b/chrome/common/extensions/api/tabs.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "tabs",
diff --git a/chrome/common/extensions/api/terminalPrivate.json b/chrome/common/extensions/api/terminalPrivate.json
index 7b8802b..74d8cb6 100644
--- a/chrome/common/extensions/api/terminalPrivate.json
+++ b/chrome/common/extensions/api/terminalPrivate.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "terminalPrivate",
diff --git a/chrome/common/extensions/api/test.json b/chrome/common/extensions/api/test.json
index 929a53e..7092bb5 100644
--- a/chrome/common/extensions/api/test.json
+++ b/chrome/common/extensions/api/test.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "test",
diff --git a/chrome/common/extensions/api/tts.json b/chrome/common/extensions/api/tts.json
index 31e79a1..e54844d 100644
--- a/chrome/common/extensions/api/tts.json
+++ b/chrome/common/extensions/api/tts.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "tts",
diff --git a/chrome/common/extensions/api/ttsEngine.json b/chrome/common/extensions/api/ttsEngine.json
index 0fbabb9..1272beb 100644
--- a/chrome/common/extensions/api/ttsEngine.json
+++ b/chrome/common/extensions/api/ttsEngine.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "ttsEngine",
diff --git a/chrome/common/extensions/api/types.json b/chrome/common/extensions/api/types.json
index cb52d54..ea272bc 100644
--- a/chrome/common/extensions/api/types.json
+++ b/chrome/common/extensions/api/types.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "types",
diff --git a/chrome/common/extensions/api/webNavigation.json b/chrome/common/extensions/api/webNavigation.json
index cbfc720..35d5d50 100644
--- a/chrome/common/extensions/api/webNavigation.json
+++ b/chrome/common/extensions/api/webNavigation.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "webNavigation",
diff --git a/chrome/common/extensions/api/webRequest.json b/chrome/common/extensions/api/webRequest.json
index efa378c..d7f90ce 100644
--- a/chrome/common/extensions/api/webRequest.json
+++ b/chrome/common/extensions/api/webRequest.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "webRequest",
diff --git a/chrome/common/extensions/api/webSocketProxyPrivate.json b/chrome/common/extensions/api/webSocketProxyPrivate.json
index 4afa792..8dfbc30 100644
--- a/chrome/common/extensions/api/webSocketProxyPrivate.json
+++ b/chrome/common/extensions/api/webSocketProxyPrivate.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "webSocketProxyPrivate",
diff --git a/chrome/common/extensions/api/webstorePrivate.json b/chrome/common/extensions/api/webstorePrivate.json
index 64db63c..94a0697 100644
--- a/chrome/common/extensions/api/webstorePrivate.json
+++ b/chrome/common/extensions/api/webstorePrivate.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace":"webstorePrivate",
diff --git a/chrome/common/extensions/api/windows.json b/chrome/common/extensions/api/windows.json
index 8f520f1..2bec764 100644
--- a/chrome/common/extensions/api/windows.json
+++ b/chrome/common/extensions/api/windows.json
@@ -1,7 +1,3 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
[
{
"namespace": "windows",
diff --git a/chrome/common/extensions/docs/build/directory.py b/chrome/common/extensions/docs/build/directory.py
index 6f49bcf..316e0d6 100644
--- a/chrome/common/extensions/docs/build/directory.py
+++ b/chrome/common/extensions/docs/build/directory.py
@@ -12,7 +12,6 @@ import re
import hashlib
import zipfile
import simplejson as json
-import json_minify as minify
# Make sure we get consistent string sorting behavior by explicitly using the
# default C locale.
@@ -49,8 +48,7 @@ def parse_json_file(path, encoding="utf-8"):
raise Exception("Failed to read the file at %s: %s" % (path, msg))
try:
- json_str = json_file.read()
- json_obj = json.loads(minify.json_minify(json_str), encoding)
+ json_obj = json.load(json_file, encoding)
except ValueError, msg:
raise Exception("Failed to parse JSON out of file %s: %s" % (path, msg))
finally:
diff --git a/chrome/common/extensions/docs/js/api_page_generator.js b/chrome/common/extensions/docs/js/api_page_generator.js
index 944a54b..202854e 100644
--- a/chrome/common/extensions/docs/js/api_page_generator.js
+++ b/chrome/common/extensions/docs/js/api_page_generator.js
@@ -183,7 +183,7 @@ function fetchSchema() {
schema = [];
function onSchemaContent(content) {
- schema = schema.concat(JSON.parse(JSON.minify(content)));
+ schema = schema.concat(JSON.parse(content));
if (++schemas_retrieved < schemas_to_retrieve.length)
return;
if (pageName.toLowerCase() == 'samples') {
@@ -204,7 +204,7 @@ function fetchSchema() {
function fetchSamples() {
// If we're rendering the samples directory, fetch the samples manifest.
fetchContent(SAMPLES, function(sampleManifest) {
- var data = JSON.parse(JSON.minify(sampleManifest));
+ var data = JSON.parse(sampleManifest);
samples = data.samples;
apiMapping = data.api;
renderTemplate();
diff --git a/chrome/common/extensions/docs/template/page_shell.html b/chrome/common/extensions/docs/template/page_shell.html
index 2aaf387..fdca7c6 100644
--- a/chrome/common/extensions/docs/template/page_shell.html
+++ b/chrome/common/extensions/docs/template/page_shell.html
@@ -17,9 +17,6 @@
<script type="text/javascript"
src="../../../third_party/jstemplate/jstemplate_compiled.js">
</script>
- <script type="text/javascript"
- src="../../../../third_party/json_minify/minify-sans-regexp.js">
- </script>
<script type="text/javascript" src="js/api_page_generator.js"></script>
<script type="text/javascript" src="js/bootstrap.js"></script>
<script type="text/javascript" src="js/sidebar.js"></script>