From 115a1bb2de64c46f2915a93e8bed5f426ad25eb2 Mon Sep 17 00:00:00 2001
From: "kathyw@chromium.org"
 <kathyw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 30 Mar 2011 23:18:22 +0000
Subject: 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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79911 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/common/extensions/docs/apps.html        | 12 +++++-------
 chrome/common/extensions/docs/static/apps.html | 12 +++++-------
 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>
 
-- 
cgit v1.1