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

chrome/common/extensions/permissions/chrome_permission_message_provider.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/permissions/chrome_permission_message_provider.h"
 
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "extensions/common/extensions_client.h"
 #include "extensions/common/permissions/permission_message.h"
@@ skipping 93 matching lines @@
     Manifest::Type extension_type) const {
   std::vector<base::string16> message_strings;
   PermissionMessages messages =
       GetPermissionMessages(permissions, extension_type);
 
   bool audio_capture = false;
   bool video_capture = false;
   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()) {
       case PermissionMessage::kAudioCapture:
         audio_capture = true;
         break;
       case PermissionMessage::kVideoCapture:
         video_capture = true;
         break;
       case PermissionMessage::kMediaGalleriesAllGalleriesRead:
         media_galleries_read = true;
         break;
       case PermissionMessage::kMediaGalleriesAllGalleriesCopyTo:
         media_galleries_copy_to = true;
         break;
       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;
     }
   }
 
   for (PermissionMessages::const_iterator i = messages.begin();
        i != messages.end(); ++i) {
     int id = i->id();
     if (audio_capture && video_capture) {
       if (id == PermissionMessage::kAudioCapture) {
         message_strings.push_back(l10n_util::GetStringUTF16(
             IDS_EXTENSION_PROMPT_WARNING_AUDIO_AND_VIDEO_CAPTURE));
         continue;
       } else if (id == PermissionMessage::kVideoCapture) {
         // The combined message will be pushed above.
         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) {
         int m_id = media_galleries_copy_to ?
             IDS_EXTENSION_PROMPT_WARNING_MEDIA_GALLERIES_READ_WRITE :
             IDS_EXTENSION_PROMPT_WARNING_MEDIA_GALLERIES_READ_DELETE;
         message_strings.push_back(l10n_util::GetStringUTF16(m_id));
         continue;
       } else if (id == PermissionMessage::kMediaGalleriesAllGalleriesCopyTo ||
                  id == PermissionMessage::kMediaGalleriesAllGalleriesDelete) {
@@ skipping 207 matching lines @@
   std::set<std::string> old_hosts_set(
       permission_message_util::GetDistinctHosts(old_list, false, false));
   std::set<std::string> new_hosts_only =
       base::STLSetDifference<std::set<std::string> >(new_hosts_set,
                                                      old_hosts_set);
 
   return !new_hosts_only.empty();
 }
 
 }  // namespace extensions