Change tabs + sessions permission warning

chrome/common/extensions/permissions/chrome_permission_message_provider.cc

Index: chrome/common/extensions/permissions/chrome_permission_message_provider.cc
===================================================================
--- chrome/common/extensions/permissions/chrome_permission_message_provider.cc	(revision 274309)
+++ chrome/common/extensions/permissions/chrome_permission_message_provider.cc	(working copy)
@@ -105,6 +105,8 @@
   bool media_galleries_read = false;
   bool media_galleries_copy_to = false;
   bool media_galleries_delete = false;
+  bool tabs = false;
+  bool history = false;
   for (PermissionMessages::const_iterator i = messages.begin();
        i != messages.end(); ++i) {
     switch (i->id()) {
@@ -123,6 +125,12 @@
       case PermissionMessage::kMediaGalleriesAllGalleriesDelete:
         media_galleries_delete = true;
         break;
+      case PermissionMessage::kTabs:
+        tabs = true;
+        break;
+      case PermissionMessage::kBrowsingHistory:
+        history = true;
+        break;
       default:
         break;
     }
@@ -155,6 +163,18 @@
         continue;
       }
     }
+    if (tabs && permissions->HasAPIPermission(APIPermission::kSessions) &&
+        id == PermissionMessage::kTabs) {

[not at google - send to devlin, 2014/06/09 16:57:31]

am I missing something or is this check and the
id==PermissionMessage::kBrowsingHistory check below pointless, because if tabs
is true then that implies PermissionMessage::kTabs and likewise is history is
true then that implies PermissionMessage::kBrowsingHistory?

[wjywbs, 2014/06/09 20:06:28]

You are right. A lot of lines are not necessary. This is in a loop of all
permission messages, and we change the message when the |id| is the kTabs
message.

+      message_strings.push_back(l10n_util::GetStringUTF16(
+          IDS_EXTENSION_PROMPT_WARNING_TABS_AND_SESSIONS));
+      continue;
+    }
+    if (history && permissions->HasAPIPermission(APIPermission::kSessions) &&
+        id == PermissionMessage::kBrowsingHistory) {
+      message_strings.push_back(l10n_util::GetStringUTF16(
+          IDS_EXTENSION_PROMPT_WARNING_BROWSING_HISTORY_AND_SESSIONS));
+      continue;
+    }
 
     message_strings.push_back(i->message());
   }