From 071ccffae5d23314b92ed62965a2d52b38403c93 Mon Sep 17 00:00:00 2001
From: "kathyw@chromium.org"
 <kathyw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 28 Feb 2011 23:08:38 +0000
Subject: Revert 76279 - Merge 76274 - Add info about "background" permission
 (new for M10).

Shouldn't be documented in beta docs (yet).

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/6574028

TBR=kathyw@chromium.org
Review URL: http://codereview.chromium.org/6594057

TBR=kathyw@chromium.org
Review URL: http://codereview.chromium.org/6598054

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@76299 0039d316-1c4b-4281-b951-d872f2087c98
---
 .../common/extensions/docs/background_pages.html   |  8 ------
 chrome/common/extensions/docs/manifest.html        | 33 +---------------------
 .../extensions/docs/static/background_pages.html   |  8 ------
 chrome/common/extensions/docs/static/manifest.html | 33 +---------------------
 4 files changed, 2 insertions(+), 80 deletions(-)

diff --git a/chrome/common/extensions/docs/background_pages.html b/chrome/common/extensions/docs/background_pages.html
index 21f5dfa..85d9b99 100644
--- a/chrome/common/extensions/docs/background_pages.html
+++ b/chrome/common/extensions/docs/background_pages.html
@@ -359,14 +359,6 @@ like this:
   ...
 }</pre>
 
-<p>
-If you need the browser to start up early—so
-you can display notifications, for example—then
-you might also want to specify the
-<a href="manifest.html#permissions">"background" permission</a>.
-</p>
-
-
 <a name="H2-1"></a><h2>Details</h2>
 
 <p>
diff --git a/chrome/common/extensions/docs/manifest.html b/chrome/common/extensions/docs/manifest.html
index 5e6b15c..7f477f9 100644
--- a/chrome/common/extensions/docs/manifest.html
+++ b/chrome/common/extensions/docs/manifest.html
@@ -625,7 +625,7 @@ or packaged app can use.
 <p class="note">
 <strong>Note:</strong>
 Hosted apps can use the
-"background", "geolocation", "notifications", and "unlimitedStorage" permissions,
+"geolocation", "notifications", and "unlimitedStorage" permissions,
 but not any other permissions listed in this table.
 </p>
 
@@ -647,37 +647,6 @@ but not any other permissions listed in this table.
   </td>
 </tr>
 <tr>
-  <td> "background" </td>
-  <td> <p>
-       Makes Chrome start up early and and shut down late,
-       so that apps and extensions can have a longer life.
-       </p>
-
-       <p>
-       When any installed hosted app, packaged app, or extension
-       has "background" permission, Chrome runs (invisibly)
-       as soon as the user logs into their computer—before
-       the user launches Chrome.
-       The "background" permission also makes Chrome continue running
-       (even after its last window is closed)
-       until the user explicitly quits Chrome.
-       </p>
-
-       <p class="note">
-       <b>Note:</b>
-       Disabled apps and extensions
-       are treated as if they aren't installed.
-       </p>
-
-       <p>
-       You typically use the "background" permission with a
-       <a href="background_pages.html">background page</a>
-       or (for hosted apps) a
-       <a href="http://code.google.com/chrome/apps/docs/background.html">background window</a>.
-       </p>
-       </td>
-</tr>
-<tr>
   <td> "bookmarks" </td>
   <td> Required if the extension uses the
        <a href="bookmarks.html">chrome.bookmarks</a> module. </td>
diff --git a/chrome/common/extensions/docs/static/background_pages.html b/chrome/common/extensions/docs/static/background_pages.html
index f4689be..2fd8a837 100644
--- a/chrome/common/extensions/docs/static/background_pages.html
+++ b/chrome/common/extensions/docs/static/background_pages.html
@@ -41,14 +41,6 @@ like this:
   ...
 }</pre>
 
-<p>
-If you need the browser to start up early&mdash;so
-you can display notifications, for example&mdash;then
-you might also want to specify the
-<a href="manifest.html#permissions">"background" permission</a>.
-</p>
-
-
 <h2>Details</h2>
 
 <p>
diff --git a/chrome/common/extensions/docs/static/manifest.html b/chrome/common/extensions/docs/static/manifest.html
index cb2cf6b..aed4953 100644
--- a/chrome/common/extensions/docs/static/manifest.html
+++ b/chrome/common/extensions/docs/static/manifest.html
@@ -297,7 +297,7 @@ or packaged app can use.
 <p class="note">
 <strong>Note:</strong>
 Hosted apps can use the
-"background", "geolocation", "notifications", and "unlimitedStorage" permissions,
+"geolocation", "notifications", and "unlimitedStorage" permissions,
 but not any other permissions listed in this table.
 </p>
 
@@ -319,37 +319,6 @@ but not any other permissions listed in this table.
   </td>
 </tr>
 <tr>
-  <td> "background" </td>
-  <td> <p>
-       Makes Chrome start up early and and shut down late,
-       so that apps and extensions can have a longer life.
-       </p>
-
-       <p>
-       When any installed hosted app, packaged app, or extension
-       has "background" permission, Chrome runs (invisibly)
-       as soon as the user logs into their computer&mdash;before
-       the user launches Chrome.
-       The "background" permission also makes Chrome continue running
-       (even after its last window is closed)
-       until the user explicitly quits Chrome.
-       </p>
-
-       <p class="note">
-       <b>Note:</b>
-       Disabled apps and extensions
-       are treated as if they aren't installed.
-       </p>
-
-       <p>
-       You typically use the "background" permission with a
-       <a href="background_pages.html">background page</a>
-       or (for hosted apps) a
-       <a href="http://code.google.com/chrome/apps/docs/background.html">background window</a>.
-       </p>
-       </td>
-</tr>
-<tr>
   <td> "bookmarks" </td>
   <td> Required if the extension uses the
        <a href="bookmarks.html">chrome.bookmarks</a> module. </td>
-- 
cgit v1.1