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..6ce82ed9ce2458aaad17fdf4b01aeb3010010377 100644 |
--- a/chrome/renderer/extensions/media_galleries_custom_bindings.cc |
+++ b/chrome/renderer/extensions/media_galleries_custom_bindings.cc |
@@ -23,21 +23,25 @@ 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])); |
+ if (fs_mount.empty()) { |
+ NOTREACHED(); |
Lei Zhang
2014/03/20 00:46:26
Any reason to do this? In another CL, kalman was s
vandebo (ex-Chrome)
2014/03/20 18:08:53
Hmm, did this part of the change a long time ago a
|
+ return; |
+ } |
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 |