Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1523)

Unified Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 10817006: Add more FS types and introduce type field into IsolatedContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/intents/intent_injector.cc ('k') | webkit/fileapi/file_system_context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a843b4b9e348d3712be8dfbf5473db7fec2e0126..e60da1afb4c06e82896ce063b1c9829e5f427553 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -542,7 +542,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));
@@ -568,7 +569,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);
« no previous file with comments | « content/browser/intents/intent_injector.cc ('k') | webkit/fileapi/file_system_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698