Make isolated file system works for a device root (e.g. X:\\)

content/browser/renderer_host/render_view_host_impl.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/render_view_host_impl.h"
 
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 500 matching lines @@
   ChildProcessSecurityPolicyImpl* policy =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
   // The URL could have been cobbled together from any highlighted text string,
   // and can't be interpreted as a capability.
   WebDropData filtered_data(drop_data);
   FilterURL(policy, renderer_id, true, &filtered_data.url);
 
   // The filenames vector, on the other hand, does represent a capability to
   // access the given files.
   std::set<FilePath> filesets;

[tzik, 2012/06/29 02:56:35]

can be removed?

[kinuko, 2012/06/29 08:31:22]

Done.

-  for (std::vector<WebDropData::FileInfo>::const_iterator iter(
+  std::vector<fileapi::IsolatedContext::FileInfo> files;
+  for (std::vector<WebDropData::FileInfo>::iterator iter(
            filtered_data.filenames.begin());
        iter != filtered_data.filenames.end(); ++iter) {
     // A dragged file may wind up as the value of an input element, or it
     // may be used as the target of a navigation instead.  We don't know
     // which will happen at this point, so generously grant both access
     // and request permissions to the specific file to cover both cases.
     // We do not give it the permission to request all file:// URLs.
     FilePath path = FilePath::FromUTF8Unsafe(UTF16ToUTF8(iter->path));
+
+    // Make sure we have non-empty display name.
+    std::string name = UTF16ToUTF8(iter->display_name);
+    if (name.empty()) {
+      name = fileapi::IsolatedContext::GetNameForPath(path);
+      iter->display_name = UTF8ToUTF16(name);
+    }
+
     policy->GrantRequestSpecificFileURL(renderer_id,
                                         net::FilePathToFileURL(path));
 
     // If the renderer already has permission to read these paths, we don't need
     // to re-grant them. This prevents problems with DnD for files in the CrOS
     // file manager--the file manager already had read/write access to those
     // directories, but dragging a file would cause the read/write access to be
     // overwritten with read-only access, making them impossible to delete or
     // rename until the renderer was killed.
     if (!policy->CanReadFile(renderer_id, path)) {
       policy->GrantReadFile(renderer_id, path);
       // Allow dragged directories to be enumerated by the child process.
       // Note that we can't tell a file from a directory at this point.
       policy->GrantReadDirectory(renderer_id, path);
     }
 
-    filesets.insert(path);
+    files.push_back(fileapi::IsolatedContext::FileInfo(name, path));
   }
 
   fileapi::IsolatedContext* isolated_context =
       fileapi::IsolatedContext::GetInstance();
   DCHECK(isolated_context);
-  std::string filesystem_id = isolated_context->RegisterIsolatedFileSystem(
-      filesets);
+  std::string filesystem_id = isolated_context->RegisterFileSystem(files);
   if (!filesystem_id.empty()) {
     // Grant the permission iff the ID is valid.
     policy->GrantReadFileSystem(renderer_id, filesystem_id);
   }
   filtered_data.filesystem_id = UTF8ToUTF16(filesystem_id);
 
   Send(new DragMsg_TargetDragEnter(GetRoutingID(), filtered_data, client_pt,
                                    screen_pt, operations_allowed,
                                    key_modifiers));
 }
@@ skipping 1281 matching lines @@
   // can cause navigations to be ignored in OnMsgNavigate.
   is_waiting_for_beforeunload_ack_ = false;
   is_waiting_for_unload_ack_ = false;
 }
 
 void RenderViewHostImpl::ClearPowerSaveBlockers() {
   STLDeleteValues(&power_save_blockers_);
 }
 
 }  // namespace content