Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(485)

Unified Diff: chrome/renderer/extensions/file_system_natives.cc

Issue 10869067: Deliver attach intent to packaged apps (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Allowed file contents to actually be read Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/extensions/file_system_natives.cc
diff --git a/chrome/renderer/extensions/file_system_natives.cc b/chrome/renderer/extensions/file_system_natives.cc
index 88faeba421084326a86f62e7a306678b0a0621a2..7e1f0dbe9b4bfafe3506b86d74cfb2ec9e902457 100644
--- a/chrome/renderer/extensions/file_system_natives.cc
+++ b/chrome/renderer/extensions/file_system_natives.cc
@@ -21,7 +21,7 @@ namespace {
static v8::Handle<v8::Value> GetIsolatedFileSystem(
const v8::Arguments& args) {
- DCHECK(args.Length() == 1);
+ DCHECK(args.Length() == 1 || args.Length() == 2);
DCHECK(args[0]->IsString());
std::string file_system_id(*v8::String::Utf8Value(args[0]));
WebKit::WebFrame* webframe = WebKit::WebFrame::frameForCurrentContext();
@@ -39,10 +39,18 @@ static v8::Handle<v8::Value> GetIsolatedFileSystem(
root.append(file_system_id);
root.append("/");
+ // Optionally create the DOMFileSystem rooted at a subdirectory.
James Hawkins 2012/08/29 22:46:51 Optionally?
thorogood 2012/08/30 01:36:28 I've expanded this comment slightly.
+ if (args.Length() == 2) {
+ DCHECK(args[1]->IsString());
+ name = *v8::String::Utf8Value(args[1]);
+ root.append(name);
+ root.append("/");
+ }
+
return webframe->createFileSystem(
WebKit::WebFileSystem::TypeIsolated,
- WebKit::WebString::fromUTF8(name.c_str()),
- WebKit::WebString::fromUTF8(root.c_str()));
+ WebKit::WebString::fromUTF8(name),
+ WebKit::WebString::fromUTF8(root));
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698