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

Unified Diff: webkit/fileapi/file_system_util.cc

Issue 10823273: Integrate external mount points to IsolatedContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cros test fix 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: webkit/fileapi/file_system_util.cc
diff --git a/webkit/fileapi/file_system_util.cc b/webkit/fileapi/file_system_util.cc
index d77d7f39de233d2953d8506fb2d838d592480830..32263d2b21d2375282b9518f50e71f61549e23b7 100644
--- a/webkit/fileapi/file_system_util.cc
+++ b/webkit/fileapi/file_system_util.cc
@@ -155,10 +155,13 @@ GURL GetFileSystemRootURI(const GURL& origin_url, FileSystemType type) {
case kFileSystemTypeTest:
url += (kTestDir + 1); // We don't want the leading slash.
return GURL(url + "/");
- case kFileSystemTypeUnknown:
+ // Internal types are always pointed via isolated or external URLs.
+ case kFileSystemTypeDeviceMedia:
case kFileSystemTypeDragged:
+ case kFileSystemTypeGData:
satorux1 2012/08/20 03:30:23 could you rename this to kFileSystemTypeDrive? we'
kinuko 2012/08/20 08:54:35 Done.
+ case kFileSystemTypeNativeLocal:
case kFileSystemTypeNativeMedia:
- case kFileSystemTypeDeviceMedia:
+ case kFileSystemTypeUnknown:
NOTREACHED();
}
NOTREACHED();
@@ -317,4 +320,11 @@ bool CrackIsolatedFileSystemName(const std::string& filesystem_name,
return true;
}
+#if defined(OS_CHROMEOS)
+bool IsCrosManagedFileSystemType(FileSystemType type) {
+ return type == fileapi::kFileSystemTypeNativeLocal ||
+ type == fileapi::kFileSystemTypeGData;
+}
+#endif
+
} // namespace fileapi

Powered by Google App Engine
This is Rietveld 408576698