Index: chrome/renderer/extensions/file_system_natives.cc |
=================================================================== |
--- chrome/renderer/extensions/file_system_natives.cc (revision 188767) |
+++ chrome/renderer/extensions/file_system_natives.cc (working copy) |
@@ -13,6 +13,7 @@ |
#include "extensions/common/constants.h" |
#include "grit/renderer_resources.h" |
#include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystem.h" |
+#include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystemType.h" |
#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
#include "webkit/fileapi/file_system_types.h" |
@@ -58,7 +59,11 @@ |
optional_root_name)); |
return webframe->createFileSystem( |
+#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE |
+ WebKit::WebFileSystemTypeIsolated, |
+#else |
WebKit::WebFileSystem::TypeIsolated, |
+#endif |
WebKit::WebString::fromUTF8(name), |
WebKit::WebString::fromUTF8(root)); |
} |
@@ -68,7 +73,11 @@ |
DCHECK(args.Length() == 5); |
DCHECK(args[0]->IsString()); |
std::string type_string = *v8::String::Utf8Value(args[0]->ToString()); |
+#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE |
+ WebKit::WebFileSystemType type; |
+#else |
WebKit::WebFileSystem::Type type; |
+#endif |
bool is_valid_type = fileapi::GetFileSystemPublicType(type_string, &type); |
DCHECK(is_valid_type); |
if (is_valid_type == false) { |