When read and modify permissions for "accessibility" are requested or read and write permissions fo…

chrome/common/extensions/permissions/chrome_permission_message_provider.cc

Index: chrome/common/extensions/permissions/chrome_permission_message_provider.cc
diff --git a/chrome/common/extensions/permissions/chrome_permission_message_provider.cc b/chrome/common/extensions/permissions/chrome_permission_message_provider.cc
index 6fa8e5b9c0e14fbaf31c5074cdf31ba242b6a184..4c7ad2f086f8a1ef17ae99d2a134e763c88e173a 100644
--- a/chrome/common/extensions/permissions/chrome_permission_message_provider.cc
+++ b/chrome/common/extensions/permissions/chrome_permission_message_provider.cc
@@ -111,6 +111,10 @@ std::vector<base::string16> ChromePermissionMessageProvider::GetWarningMessages(
   bool media_galleries_read = false;
   bool media_galleries_copy_to = false;
   bool media_galleries_delete = false;
+  bool accessibility_read = false;
+  bool accessibility_write = false;
+  bool file_system_read = false;
+  bool file_system_write = false;
   for (PermissionMessages::const_iterator i = messages.begin();
        i != messages.end(); ++i) {
     switch (i->id()) {
@@ -129,6 +133,18 @@ std::vector<base::string16> ChromePermissionMessageProvider::GetWarningMessages(
       case PermissionMessage::kMediaGalleriesAllGalleriesDelete:
         media_galleries_delete = true;
         break;
+      case PermissionMessage::kAccessibilityFeaturesRead:
+        accessibility_read = true;
+        break;
+      case PermissionMessage::kAccessibilityFeaturesModify:
+        accessibility_write = true;
+        break;
+      case PermissionMessage::kFileSystemDirectory:

[meacer, 2014/06/18 02:19:57]

fileSystem.write already suppresses fileSystem:
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/common/exte...

+        file_system_read = true;
+        break;
+      case PermissionMessage::kFileSystemWriteDirectory:
+        file_system_write = true;
+        break;
       default:
         break;
     }
@@ -147,6 +163,26 @@ std::vector<base::string16> ChromePermissionMessageProvider::GetWarningMessages(
         continue;
       }
     }
+    if (accessibility_read && accessibility_write) {
+      if (id == PermissionMessage::kAccessibilityFeaturesRead) {
+        message_strings.push_back(l10n_util::GetStringUTF16(
+            IDS_EXTENSION_PROMPT_WARNING_ACCESSIBILITY_FEATURES_READ_AND_MODIFY));
+        continue;
+      } else if (id == PermissionMessage::kAccessibilityFeaturesModify) {
+        // The combined message will be pushed above.
+        continue;
+      }
+    }
+    if (file_system_read && file_system_write) {
+      if (id == PermissionMessage::kFileSystemDirectory) {
+        message_strings.push_back(l10n_util::GetStringUTF16(
+            IDS_EXTENSION_PROMPT_WARNING_FILE_SYSTEM_READ_AND_WRITE_DIRECTORY));
+        continue;
+      } else if (id == PermissionMessage::kFileSystemWriteDirectory) {
+        // The combined message will be pushed above.
+        continue;
+      }
+    }
     if (media_galleries_read &&
         (media_galleries_copy_to || media_galleries_delete)) {
       if (id == PermissionMessage::kMediaGalleriesAllGalleriesRead) {