diff options
| author | sergeygs@chromium.org <sergeygs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-20 02:00:49 +0000 |
|---|---|---|
| committer | sergeygs@chromium.org <sergeygs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-20 02:00:49 +0000 |
| commit | 783b7d156fc041def17acca2863f7c7f8b3e6afc (patch) | |
| tree | 8ad1360d63eb0379394022c138c49e02053169c0 | |
| parent | e6a376536b68c7601e2f6b814808582f5562a4e7 (diff) | |
| download | chromium_src-783b7d156fc041def17acca2863f7c7f8b3e6afc.zip chromium_src-783b7d156fc041def17acca2863f7c7f8b3e6afc.tar.gz chromium_src-783b7d156fc041def17acca2863f7c7f8b3e6afc.tar.bz2 | |
Fixed docs: behavior of chrome.contextMenus diverged for apps and extensions.
Docs preview here:
https://chrome-apps-doc.appspot.com/_patch/65063002/apps/contextMenus.html
https://chrome-apps-doc.appspot.com/_patch/65063002/extensions/contextMenus.html
BUG=316294
Review URL: https://codereview.chromium.org/65063002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236096 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/common/extensions/docs/templates/intros/contextMenus.html | 9 | ||||
| -rw-r--r-- | chrome/common/extensions/docs/templates/private/standard_extensions_api.html | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/chrome/common/extensions/docs/templates/intros/contextMenus.html b/chrome/common/extensions/docs/templates/intros/contextMenus.html index f8b88b8..f460cf1 100644 --- a/chrome/common/extensions/docs/templates/intros/contextMenus.html +++ b/chrome/common/extensions/docs/templates/intros/contextMenus.html @@ -18,10 +18,13 @@ into a single parent menu. </p> <h2 id="manifest">Manifest</h2> -<p>You must declare the "contextMenus" permission -in your extension's manifest to use the API. +<p> +You must declare the "contextMenus" permission +in your {{platform}}'s manifest to use the API. +{{^is_apps}} Also, you should specify a 16x16-pixel icon for display next to your menu item. +{{/is_apps}} For example: </p> @@ -32,11 +35,13 @@ For example: "permissions": [ <b>"contextMenus"</b> ], +{{^is_apps}} "icons": { <b>"16": "icon-bitty.png",</b> "48": "icon-small.png", "128": "icon-large.png" }, +{{/is_apps}} ... } </pre> diff --git a/chrome/common/extensions/docs/templates/private/standard_extensions_api.html b/chrome/common/extensions/docs/templates/private/standard_extensions_api.html index 3fa38f1..a73b78b 100644 --- a/chrome/common/extensions/docs/templates/private/standard_extensions_api.html +++ b/chrome/common/extensions/docs/templates/private/standard_extensions_api.html @@ -26,7 +26,7 @@ {{/intro}} {{+partials.intro_table api:api/}} {{- This is unindented because it contains <pre> tags -}} -{{?intro +intro platform:strings.app is_apps:false/}} +{{?intro +intro platform:strings.extension is_apps:false/}} {{+partials.api_reference samples_list:api.samples.extensions title:strings.extensions_title api:api/}} |