summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkathyw@chromium.org <kathyw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-30 23:23:30 +0000
committerkathyw@chromium.org <kathyw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-30 23:23:30 +0000
commit50ec720aabb6d8fb917ce1ee71870cb430786042 (patch)
tree6b7d1cdb11b332fbb1a8ac0f86b4f781e5c2c1a4
parent9e86a69e4dd29cad9cfe78e861ed850933b7efe1 (diff)
downloadchromium_src-50ec720aabb6d8fb917ce1ee71870cb430786042.zip
chromium_src-50ec720aabb6d8fb917ce1ee71870cb430786042.tar.gz
chromium_src-50ec720aabb6d8fb917ce1ee71870cb430786042.tar.bz2
Merge 79911 - Remove "permissions" from sample code, so copy-pasters will be less likely to ask for permissions they don't need.
BUG=77440 TEST=No "permissions" string in http://code.google.com/chrome/extensions/apps.html Review URL: http://codereview.chromium.org/6670092 TBR=kathyw@chromium.org Review URL: http://codereview.chromium.org/6783002 git-svn-id: svn://svn.chromium.org/chrome/branches/696/src@79917 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/common/extensions/docs/apps.html12
-rw-r--r--chrome/common/extensions/docs/static/apps.html12
2 files changed, 10 insertions, 14 deletions
diff --git a/chrome/common/extensions/docs/apps.html b/chrome/common/extensions/docs/apps.html
index 8130ad6..e5f48ae 100644
--- a/chrome/common/extensions/docs/apps.html
+++ b/chrome/common/extensions/docs/apps.html
@@ -381,12 +381,14 @@ instead of a hosted app if any of the following are true:
</ul>
<p>
-The following articles can help you understand
+To learn more about
the differences between web apps and websites,
-extensions and packaged apps, and packaged apps and hosted apps:
+extensions and packaged apps, and packaged apps and hosted apps,
+read these:
</p>
<ul>
+ <li> <a href="http://code.google.com/chrome/webstore/docs/choosing.html">Choosing an App Type</a> </li>
<li> <a href="http://code.google.com/chrome/apps/articles/thinking_in_web_apps.html">Thinking in Web Apps</a> </li>
<li> <a href="http://code.google.com/chrome/webstore/articles/apps_vs_extensions.html">Extensions, Packaged Apps, and Hosted Apps in the Chrome Web Store</a> </li>
</ul>
@@ -415,11 +417,7 @@ Here is a typical manifest for a packaged app:
"icons": {
"16": "icon_16.png",
"128": "icon_128.png"
- },
- "permissions": [
- "unlimitedStorage",
- "notifications"
- ]
+ }
}
</pre>
diff --git a/chrome/common/extensions/docs/static/apps.html b/chrome/common/extensions/docs/static/apps.html
index 2cf3944..394dfae 100644
--- a/chrome/common/extensions/docs/static/apps.html
+++ b/chrome/common/extensions/docs/static/apps.html
@@ -53,12 +53,14 @@ instead of a hosted app if any of the following are true:
</ul>
<p>
-The following articles can help you understand
+To learn more about
the differences between web apps and websites,
-extensions and packaged apps, and packaged apps and hosted apps:
+extensions and packaged apps, and packaged apps and hosted apps,
+read these:
</p>
<ul>
+ <li> <a href="http://code.google.com/chrome/webstore/docs/choosing.html">Choosing an App Type</a> </li>
<li> <a href="http://code.google.com/chrome/apps/articles/thinking_in_web_apps.html">Thinking in Web Apps</a> </li>
<li> <a href="http://code.google.com/chrome/webstore/articles/apps_vs_extensions.html">Extensions, Packaged Apps, and Hosted Apps in the Chrome Web Store</a> </li>
</ul>
@@ -88,11 +90,7 @@ Here is a typical manifest for a packaged app:
"icons": {
"16": "icon_16.png",
"128": "icon_128.png"
- },
- "permissions": [
- "unlimitedStorage",
- "notifications"
- ]
+ }
}
</pre>