Merge 86101 - Reflect new restriction on tab.captureVisibleTab().

TEST=none
BUG=72523
Review URL: http://codereview.chromium.org/7004038

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

git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86117 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 32 insertions, 5 deletions

diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json
index bdd8247..8e7af76 100644
--- a/chrome/common/extensions/api/extension_api.json
+++ b/chrome/common/extensions/api/extension_api.json
@@ -1241,7 +1241,7 @@
       {
         "name": "captureVisibleTab",
         "type": "function",
-        "description": "Captures the visible area of the currently selected tab in the specified window.",
+        "description": "Captures the visible area of the currently selected tab in the specified window. You must have <a href='manifest.html#permissions'>host permission</a> for the URL displayed by the tab; for maximum coverage, request <code>&lt;all_urls></code> permission.",
         "parameters": [
           {
             "type": "integer",
@@ -1254,7 +1254,6 @@
             "type": "object",
             "name": "options",
             "optional": true,
-            "min_version": "5.0.372.0",
             "description": "Set parameters of image capture, such as the format of the resulting image.",
             "properties": {
               "format": {
diff --git a/chrome/common/extensions/docs/static/whats_new.html b/chrome/common/extensions/docs/static/whats_new.html
index 9a2dba4..437e9cd 100644
--- a/chrome/common/extensions/docs/static/whats_new.html
+++ b/chrome/common/extensions/docs/static/whats_new.html
@@ -18,6 +18,20 @@ made in recent releases.
 
 <h2 id="11"> Google Chrome 11 </h2>
 
+<h4> Changes to existing APIs </h4>
+  <ul>
+    <li>
+      For security reasons, you can no longer call
+      <a href="tabs.html#method-captureVisibleTab">chrome.tab.captureVisibleTab()</a>
+      on just any tab.
+      Instead, you now must have
+      <a href="manifest.html#permissions">host permission</a>
+      for the URL displayed by that tab.
+      To get the previous behavior,
+      specify <code>&lt;all_urls></code> for the host permission.
+    </li>
+  </ul>
+
 <h4> Additions to existing APIs </h4>
   <ul>
     <li>
diff --git a/chrome/common/extensions/docs/tabs.html b/chrome/common/extensions/docs/tabs.html
index 1708562..a50cb0e 100644
--- a/chrome/common/extensions/docs/tabs.html
+++ b/chrome/common/extensions/docs/tabs.html
@@ -448,7 +448,7 @@ For other examples and for help in viewing the source code, see
 
               <div class="description">
                 <p class="todo" style="display: none; ">Undocumented.</p>
-                <p>Captures the visible area of the currently selected tab in the specified window.</p>
+                <p>Captures the visible area of the currently selected tab in the specified window. You must have <a href="manifest.html#permissions">host permission</a> for the URL displayed by the tab; for maximum coverage, request <code>&lt;all_urls&gt;</code> permission.</p>
 
                 <!-- PARAMETERS -->
                 <h4>Parameters</h4>
@@ -553,9 +553,9 @@ For other examples and for help in viewing the source code, see
             Undocumented.
           </dd>
           <dd>Set parameters of image capture, such as the format of the resulting image.</dd>
-          <dd>
+          <dd style="display: none; ">
             This parameter was added in version
-            <b><span>5.0.372.0</span></b>.
+            <b><span></span></b>.
             You must omit this parameter in earlier versions,
             and you may omit it in any version.  If you require this
             parameter, the manifest key
diff --git a/chrome/common/extensions/docs/whats_new.html b/chrome/common/extensions/docs/whats_new.html
index f4265b6..6e45782 100644
--- a/chrome/common/extensions/docs/whats_new.html
+++ b/chrome/common/extensions/docs/whats_new.html
@@ -332,6 +332,20 @@ made in recent releases.
 
 <h2 id="11"> Google Chrome 11 </h2>
 
+<h4> Changes to existing APIs </h4>
+  <ul>
+    <li>
+      For security reasons, you can no longer call
+      <a href="tabs.html#method-captureVisibleTab">chrome.tab.captureVisibleTab()</a>
+      on just any tab.
+      Instead, you now must have
+      <a href="manifest.html#permissions">host permission</a>
+      for the URL displayed by that tab.
+      To get the previous behavior,
+      specify <code>&lt;all_urls&gt;</code> for the host permission.
+    </li>
+  </ul>
+
 <h4> Additions to existing APIs </h4>
   <ul>
     <li>