Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / renderer / extensions / media_galleries_custom_bindings.cc

diff --git a/src/chrome/renderer/extensions/media_galleries_custom_bindings.cc b/src/chrome/renderer/extensions/media_galleries_custom_bindings.cc
index 1b4a0e1..f8e3712 100644 (file)
--- a/src/chrome/renderer/extensions/media_galleries_custom_bindings.cc
+++ b/src/chrome/renderer/extensions/media_galleries_custom_bindings.cc
@@ -6,10 +6,10 @@
 
 #include <string>
 
-#include "chrome/common/extensions/extension_constants.h"
+#include "extensions/renderer/script_context.h"
 #include "third_party/WebKit/public/web/WebDOMFileSystem.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
-#include "third_party/WebKit/public/web/WebFrame.h"
+#include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "v8/include/v8.h"
 #include "webkit/common/fileapi/file_system_util.h"
 
@@ -23,28 +23,30 @@ 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();
+  blink::WebLocalFrame* webframe =
+      blink::WebLocalFrame::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
 
 MediaGalleriesCustomBindings::MediaGalleriesCustomBindings(
-    Dispatcher* dispatcher, ChromeV8Context* context)
-    : ChromeV8Extension(dispatcher, context) {
+    ScriptContext* context)
+    : ObjectBackedNativeHandler(context) {
   RouteFunction("GetMediaFileSystemObject",
                 base::Bind(&GetMediaFileSystemObject));
 }