OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/renderer/extensions/media_galleries_custom_bindings.h" | 5 #include "chrome/renderer/extensions/media_galleries_custom_bindings.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "extensions/renderer/script_context.h" | 9 #include "extensions/renderer/script_context.h" |
10 #include "storage/common/fileapi/file_system_util.h" | 10 #include "storage/common/fileapi/file_system_util.h" |
(...skipping 19 matching lines...) Expand all Loading... |
30 void MediaGalleriesCustomBindings::GetMediaFileSystemObject( | 30 void MediaGalleriesCustomBindings::GetMediaFileSystemObject( |
31 const v8::FunctionCallbackInfo<v8::Value>& args) { | 31 const v8::FunctionCallbackInfo<v8::Value>& args) { |
32 CHECK_EQ(1, args.Length()); | 32 CHECK_EQ(1, args.Length()); |
33 CHECK(args[0]->IsString()); | 33 CHECK(args[0]->IsString()); |
34 | 34 |
35 std::string fs_mount(*v8::String::Utf8Value(args[0])); | 35 std::string fs_mount(*v8::String::Utf8Value(args[0])); |
36 CHECK(!fs_mount.empty()); | 36 CHECK(!fs_mount.empty()); |
37 | 37 |
38 blink::WebLocalFrame* webframe = | 38 blink::WebLocalFrame* webframe = |
39 blink::WebLocalFrame::frameForCurrentContext(); | 39 blink::WebLocalFrame::frameForCurrentContext(); |
40 const GURL origin = | 40 const GURL origin = blink::WebStringToGURL( |
41 blink::WebStringToGURL(webframe->document().securityOrigin().toString()); | 41 webframe->document().getSecurityOrigin().toString()); |
42 std::string fs_name = | 42 std::string fs_name = |
43 storage::GetFileSystemName(origin, storage::kFileSystemTypeExternal); | 43 storage::GetFileSystemName(origin, storage::kFileSystemTypeExternal); |
44 fs_name.append("_"); | 44 fs_name.append("_"); |
45 fs_name.append(fs_mount); | 45 fs_name.append(fs_mount); |
46 const GURL root_url( | 46 const GURL root_url( |
47 storage::GetExternalFileSystemRootURIString(origin, fs_mount)); | 47 storage::GetExternalFileSystemRootURIString(origin, fs_mount)); |
48 args.GetReturnValue().Set( | 48 args.GetReturnValue().Set( |
49 blink::WebDOMFileSystem::create(webframe, | 49 blink::WebDOMFileSystem::create(webframe, |
50 blink::WebFileSystemTypeExternal, | 50 blink::WebFileSystemTypeExternal, |
51 blink::WebString::fromUTF8(fs_name), | 51 blink::WebString::fromUTF8(fs_name), |
52 root_url) | 52 root_url) |
53 .toV8Value(context()->v8_context()->Global(), args.GetIsolate())); | 53 .toV8Value(context()->v8_context()->Global(), args.GetIsolate())); |
54 } | 54 } |
55 | 55 |
56 } // namespace extensions | 56 } // namespace extensions |
OLD | NEW |