Require confirmation for writable directory access.

chrome/common/extensions/permissions/permission_set.cc

 // Copyright (c) 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/permission_set.h"
 
 #include <algorithm>
 #include <iterator>
 #include <string>
 
@@ skipping 464 matching lines @@
 std::set<PermissionMessage> PermissionSet::GetAPIPermissionMessages() const {
   std::set<PermissionMessage> messages;
   for (APIPermissionSet::const_iterator permission_it = apis_.begin();
        permission_it != apis_.end(); ++permission_it) {
     if (permission_it->HasMessages()) {
       PermissionMessages new_messages = permission_it->GetMessages();
       messages.insert(new_messages.begin(), new_messages.end());
     }
   }
 
-  // A special hack: If both kFileSystemDirectory and and kFileSystemWrite
-  // would be displayed, instead show kFileSystemWriteDirectory.
-  // TODO(sammc): Remove this when http://crbug.com/282118 is fixed.
-  std::set<PermissionMessage>::iterator read_directory_message = messages.find(
-      PermissionMessage(PermissionMessage::kFileSystemDirectory, string16()));
-  std::set<PermissionMessage>::iterator write_message = messages.find(
-      PermissionMessage(PermissionMessage::kFileSystemWrite, string16()));
-  if (read_directory_message != messages.end() &&
-      write_message != messages.end()) {
-    messages.erase(read_directory_message);
-    messages.erase(write_message);
-    messages.insert(PermissionMessage(
-        PermissionMessage::kFileSystemWriteDirectory,
-        l10n_util::GetStringUTF16(
-            IDS_EXTENSION_PROMPT_WARNING_FILE_SYSTEM_WRITE_DIRECTORY)));
+  // A special hack: If kFileSystemWriteDirectory would be displayed, hide
+  // kFileSystemDirectory and and kFileSystemWrite as the write directory
+  // message implies the other two.
+  // TODO(sammc): Remove this. See http://crbug.com/284849.
+  std::set<PermissionMessage>::iterator write_directory_message =
+      messages.find(PermissionMessage(
+          PermissionMessage::kFileSystemWriteDirectory, string16()));
+  if (write_directory_message != messages.end()) {
+    messages.erase(
+        PermissionMessage(PermissionMessage::kFileSystemWrite, string16()));
+    messages.erase(
+        PermissionMessage(PermissionMessage::kFileSystemDirectory, string16()));
   }
   return messages;
 }
 
 std::set<PermissionMessage> PermissionSet::GetHostPermissionMessages(
     Manifest::Type extension_type) const {
   // Since platform apps always use isolated storage, they can't (silently)
   // access user data on other domains, so there's no need to prompt.
   // Note: this must remain consistent with HasLessHostPrivilegesThan.
   // See crbug.com/255229.
@@ skipping 32 matching lines @@
   // A special hack: the DWR permission is weaker than all hosts permission.
   if (delta_warnings.size() == 1u &&
       delta_warnings.begin()->id() ==
           PermissionMessage::kDeclarativeWebRequest &&
       HasEffectiveAccessToAllHosts()) {
     return false;
   }
 
   // A special hack: kFileSystemWriteDirectory implies kFileSystemDirectory and
   // kFileSystemWrite.
-  // TODO(sammc): Remove this when http://crbug.com/282118 is fixed.
+  // TODO(sammc): Remove this. See http://crbug.com/284849.
   if (current_warnings.find(PermissionMessage(
           PermissionMessage::kFileSystemWriteDirectory, string16())) !=
       current_warnings.end()) {
     delta_warnings.erase(
         PermissionMessage(PermissionMessage::kFileSystemDirectory, string16()));
     delta_warnings.erase(
         PermissionMessage(PermissionMessage::kFileSystemWrite, string16()));
   }
 
   // We have less privileges if there are additional warnings present.
@@ skipping 26 matching lines @@
   std::set<std::string> new_hosts_set(GetDistinctHosts(new_list, false, false));
   std::set<std::string> old_hosts_set(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