| Index: chrome/renderer/extensions/media_galleries_custom_bindings.cc
|
| diff --git a/chrome/renderer/extensions/media_galleries_custom_bindings.cc b/chrome/renderer/extensions/media_galleries_custom_bindings.cc
|
| index 1b4a0e1c7fdb2df7cc8e60c95cd61d5348282fab..78a4e276571ab8aefa9b937c6578ff284ffba87c 100644
|
| --- a/chrome/renderer/extensions/media_galleries_custom_bindings.cc
|
| +++ b/chrome/renderer/extensions/media_galleries_custom_bindings.cc
|
| @@ -23,21 +23,22 @@ void GetMediaFileSystemObject(const v8::FunctionCallbackInfo<v8::Value>& args) {
|
| CHECK_EQ(1, args.Length());
|
| CHECK(args[0]->IsString());
|
|
|
| - std::string fsid(*v8::String::Utf8Value(args[0]));
|
| - CHECK(!fsid.empty());
|
| + std::string fs_mount(*v8::String::Utf8Value(args[0]));
|
| + CHECK(!fs_mount.empty());
|
|
|
| blink::WebFrame* webframe = blink::WebFrame::frameForCurrentContext();
|
| const GURL origin = GURL(webframe->document().securityOrigin().toString());
|
| - const std::string fs_name = fileapi::GetIsolatedFileSystemName(origin, fsid);
|
| + std::string fs_name =
|
| + fileapi::GetFileSystemName(origin, fileapi::kFileSystemTypeExternal);
|
| + fs_name.append("_");
|
| + fs_name.append(fs_mount);
|
| const GURL root_url(
|
| - fileapi::GetIsolatedFileSystemRootURIString(
|
| - origin, fsid, extension_misc::kMediaFileSystemPathPart));
|
| + fileapi::GetExternalFileSystemRootURIString(origin, fs_mount));
|
| args.GetReturnValue().Set(
|
| - blink::WebDOMFileSystem::create(
|
| - webframe,
|
| - blink::WebFileSystemTypeIsolated,
|
| - blink::WebString::fromUTF8(fs_name),
|
| - root_url).toV8Value());
|
| + blink::WebDOMFileSystem::create(webframe,
|
| + blink::WebFileSystemTypeExternal,
|
| + blink::WebString::fromUTF8(fs_name),
|
| + root_url).toV8Value());
|
| }
|
|
|
| } // namespace
|
|
|