Index: content/browser/renderer_host/render_view_host_impl.cc |
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc |
index b984ad658ba2f735cc72569059ad5c41863f98d6..e497665b399f6886f364ea70a353639cd7754971 100644 |
--- a/content/browser/renderer_host/render_view_host_impl.cc |
+++ b/content/browser/renderer_host/render_view_host_impl.cc |
@@ -535,7 +535,8 @@ void RenderViewHostImpl::DragTargetDragEnter( |
// Make sure we have the same display_name as the one we register. |
if (iter->display_name.empty()) { |
- std::string name = files.AddPath(path); |
+ std::string name; |
+ files.AddPath(path, &name); |
iter->display_name = UTF8ToUTF16(name); |
} else { |
files.AddPathWithName(path, UTF16ToUTF8(iter->display_name)); |
@@ -561,7 +562,8 @@ void RenderViewHostImpl::DragTargetDragEnter( |
fileapi::IsolatedContext* isolated_context = |
fileapi::IsolatedContext::GetInstance(); |
DCHECK(isolated_context); |
- std::string filesystem_id = isolated_context->RegisterFileSystem(files); |
+ std::string filesystem_id = isolated_context->RegisterDraggedFileSystem( |
+ files); |
if (!filesystem_id.empty()) { |
// Grant the permission iff the ID is valid. |
policy->GrantReadFileSystem(renderer_id, filesystem_id); |