diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-10 11:13:29 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-10 11:13:29 +0000 |
| commit | a72724762650fed4e22a3e4df754a3e0ed6b9ecf (patch) | |
| tree | 1e778133a9eba827c7ba0e3cb85b74beaba5e4b8 /webkit/support | |
| parent | 0909220f66fc4ca6a3a107dfe6f589972e965c7a (diff) | |
| download | chromium_src-a72724762650fed4e22a3e4df754a3e0ed6b9ecf.zip chromium_src-a72724762650fed4e22a3e4df754a3e0ed6b9ecf.tar.gz chromium_src-a72724762650fed4e22a3e4df754a3e0ed6b9ecf.tar.bz2 | |
Make isolated file system works for a device root (e.g. X:\\)
* directory drag-and-drop should work for a USB drive etc
* Media device intent should work on Windows
BUG=134828,135010
TEST=manually tested
TEST=IsolatedContext\*
Review URL: https://chromiumcodereview.appspot.com/10713007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145862 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
| -rw-r--r-- | webkit/support/webkit_support.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index 048ef4e..276541bd 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -778,12 +778,13 @@ void OpenFileSystem(WebFrame* frame, WebFileSystem::Type type, WebKit::WebString RegisterIsolatedFileSystem( const WebKit::WebVector<WebKit::WebString>& filenames) { - std::set<FilePath> files; - for (size_t i = 0; i < filenames.size(); ++i) - files.insert(webkit_glue::WebStringToFilePath(filenames[i])); + fileapi::IsolatedContext::FileInfoSet files; + for (size_t i = 0; i < filenames.size(); ++i) { + FilePath path = webkit_glue::WebStringToFilePath(filenames[i]); + files.AddPath(path); + } std::string filesystemId = - fileapi::IsolatedContext::GetInstance()->RegisterIsolatedFileSystem( - files); + fileapi::IsolatedContext::GetInstance()->RegisterFileSystem(files); return UTF8ToUTF16(filesystemId); } |