Change warning for tabs permission to be more accurate

BUG=62566
TEST=unit_tests and browser_tests, installed extensions from chrome.google.com/extensions
TBR=tessamac@chromium.org
Patch from Tessa MacDuff <tessamac@chromium.org>.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72315 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 40 insertions, 21 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 77974ee..c318e56 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3535,6 +3535,9 @@ each locale. -->
       <message name="IDS_EXTENSION_PROMPT_WARNING_MANAGEMENT" desc="Permisson string for access to extension management.">
         Your list of installed apps, extensions, and themes
       </message>
+      <message name="IDS_EXTENSION_PROMPT_WARNING_TABS" desc="Permission string for access to tabs.">
+        Your tabs and browsing activity
+      </message>
 
       <!-- Extension/App error messages -->
       <message name="IDS_EXTENSION_DIRECTORY_NO_EXISTS" desc="Warning displayed in pack dialog when the extension directory does not exist.">
diff --git a/chrome/common/extensions/docs/permission_warnings.html b/chrome/common/extensions/docs/permission_warnings.html
index eb062e3..f4ea995 100644
--- a/chrome/common/extensions/docs/permission_warnings.html
+++ b/chrome/common/extensions/docs/permission_warnings.html
@@ -423,7 +423,7 @@ brings up the following warning:
 <p>
 It can be surprising when adding a permission such as "tabs"
 results in the seemingly unrelated warning
-that the extension can access your browsing history.
+that the extension can access your browsing activity.
 The reason for the warning is that
 although the <code>chrome.tabs</code> API
 might be used only to open new tabs,
@@ -488,22 +488,30 @@ that trigger them.
   </td>
   <td>
     <!-- HasEffectiveBrowsingHistoryPermission -->
-     "history" or "tabs" permission
+     "history" permission
   </td>
   <td>
     <p>
-      The "tabs" permission is required by the
-      <a href="tabs.html"><code>chrome.tabs</code></a> and 
-      <a href="windows.html"><code>chrome.windows</code></a> modules.
-    </p>
-    <p>
       The "history" permission is required by
       <a href="history.html"><code>chrome.history</code></a>.
     </p>
+  </td>
+</tr>
+
+<tr>
+  <td style="font-weight:bold">
+    <!-- IDS_EXTENSION_PROMPT_WARNING_TABS -->
+    Your tabs and browsing activity
+  </td>
+  <td>
+    <!-- HasEffectiveBrowsingHistoryPermission -->
+     "tabs" permission
+  </td>
+  <td>
     <p>
-      Adding "tabs" to an existing extension
-      that already has "history", or vice versa,
-      doesn't cause a warning when the extension is autoupdated.
+      The "tabs" permission is required by the
+      <a href="tabs.html"><code>chrome.tabs</code></a> and 
+      <a href="windows.html"><code>chrome.windows</code></a> modules.
     </p>
   </td>
 </tr>
diff --git a/chrome/common/extensions/docs/static/permission_warnings.html b/chrome/common/extensions/docs/static/permission_warnings.html
index 4671f58..b70280f 100644
--- a/chrome/common/extensions/docs/static/permission_warnings.html
+++ b/chrome/common/extensions/docs/static/permission_warnings.html
@@ -109,7 +109,7 @@ brings up the following warning:
 <p>
 It can be surprising when adding a permission such as "tabs"
 results in the seemingly unrelated warning
-that the extension can access your browsing history.
+that the extension can access your browsing activity.
 The reason for the warning is that
 although the <code>chrome.tabs</code> API
 might be used only to open new tabs,
@@ -174,22 +174,30 @@ that trigger them.
   </td>
   <td>
     <!-- HasEffectiveBrowsingHistoryPermission -->
-     "history" or "tabs" permission
+     "history" permission
   </td>
   <td>
     <p>
-      The "tabs" permission is required by the
-      <a href="tabs.html"><code>chrome.tabs</code></a> and 
-      <a href="windows.html"><code>chrome.windows</code></a> modules.
-    </p>
-    <p>
       The "history" permission is required by
       <a href="history.html"><code>chrome.history</code></a>.
     </p>
+  </td>
+</tr>
+
+<tr>
+  <td style="font-weight:bold">
+    <!-- IDS_EXTENSION_PROMPT_WARNING_TABS -->
+    Your tabs and browsing activity
+  </td>
+  <td>
+    <!-- HasEffectiveBrowsingHistoryPermission -->
+     "tabs" permission
+  </td>
+  <td>
     <p>
-      Adding "tabs" to an existing extension
-      that already has "history", or vice versa,
-      doesn't cause a warning when the extension is autoupdated.
+      The "tabs" permission is required by the
+      <a href="tabs.html"><code>chrome.tabs</code></a> and 
+      <a href="windows.html"><code>chrome.windows</code></a> modules.
     </p>
   </td>
 </tr>
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 44641bf..2ce4d59 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -230,7 +230,7 @@ const Extension::Permission Extension::kPermissions[] = {
   { kManagementPermission, IDS_EXTENSION_PROMPT_WARNING_MANAGEMENT },
   { kNotificationPermission, 0 },
   { kProxyPermission, 0 },
-  { kTabPermission, IDS_EXTENSION_PROMPT_WARNING_BROWSING_HISTORY },
+  { kTabPermission, IDS_EXTENSION_PROMPT_WARNING_TABS },
   { kUnlimitedStoragePermission, 0 },
   { kWebstorePrivatePermission, 0 },
 };